From a5123bfab06f7fd8884b9b4f12f579dceec43aa1 Mon Sep 17 00:00:00 2001 From: yo mama Date: Wed, 11 Mar 2015 02:51:58 -0700 Subject: finished OOP rewrite --- Pb_Api/Param/NumberRange.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Pb_Api/Param/NumberRange.py') diff --git a/Pb_Api/Param/NumberRange.py b/Pb_Api/Param/NumberRange.py index fa11a29..fe1ece6 100644 --- a/Pb_Api/Param/NumberRange.py +++ b/Pb_Api/Param/NumberRange.py @@ -1,3 +1,4 @@ +import sys from Pb_Api.Param.MultiSelect import Pb_Api_Param_MultiSelect import random class Pb_Api_Param_NumberRange(Pb_Api_Param_MultiSelect): @@ -6,7 +7,7 @@ class Pb_Api_Param_NumberRange(Pb_Api_Param_MultiSelect): self.range_min = kwargs['min'] self.range_max = kwargs['max'] def randomize(self): - weights_total = sum(map(lambda x: x["weight"], self.options()) + self.range_max - self.range_min + weights_total = sum(map(lambda x: x["weight"], self.options())) + self.range_max - self.range_min choice = random.randint(0, weights_total) position = 0 for elem in self.options(): @@ -14,4 +15,13 @@ class Pb_Api_Param_NumberRange(Pb_Api_Param_MultiSelect): if position >= choice: self.value = elem["value"] return - self.value = random.randint(ANGLE_MIN,ANGLE_MAX), + self.value = random.randint(self.range_min,self.range_max) + @property + def value(self): + return super(Pb_Api_Param_MultiSelect, self).get_value() + @value.setter + def value(self, value): + self._value = value + if not self._value is None: + self.is_ready = 1 + self.set_by_user = 1 -- cgit v1.2.3-70-g09d2