diff options
| -rw-r--r-- | ricky/param/color.py | 8 | ||||
| -rw-r--r-- | ricky/param/constrainednumber.py | 3 | ||||
| -rw-r--r-- | ricky/params.py | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ricky/param/color.py b/ricky/param/color.py index 4d88b90..2654914 100644 --- a/ricky/param/color.py +++ b/ricky/param/color.py @@ -10,14 +10,6 @@ class Color(Param): def from_rgb(cls, r, g, b): return cls(value="rgb({},{},{})".format(r, g, b)) - @property - def value(self): - return super(Color, self).value_get() - - @value.setter - def value(self, value): - self._value = value - def randomize(self): self.value = "rgb(%s,%s,%s)" % ( random.randint(0, 255), diff --git a/ricky/param/constrainednumber.py b/ricky/param/constrainednumber.py index d94b6ee..30c7a45 100644 --- a/ricky/param/constrainednumber.py +++ b/ricky/param/constrainednumber.py @@ -12,6 +12,7 @@ class ConstrainedNumber(Param): self.forbidden_range_min = kwargs.get('forbidden_range_min') self.forbidden_range_max = kwargs.get('forbidden_range_max') self.enforce_int = kwargs.get('enforce_int') + self.prec = kwargs.get('prec') if "default" not in kwargs: self.randomize() kwargs["default"] = self._value @@ -69,6 +70,8 @@ class ConstrainedNumber(Param): def _generate_random(self): value = random.uniform(self.range_min, self.range_max) + if self.prec: + value = round(value, self.prec) if self.enforce_int: value = int(value) self.value = value diff --git a/ricky/params.py b/ricky/params.py index f0479bb..3d5677b 100644 --- a/ricky/params.py +++ b/ricky/params.py @@ -38,8 +38,13 @@ class Params(object): return self.api.call(self) def as_dict(self): - """displays the params names and values in dictionary form""" - return [param.as_dict() for param in self._params] + """displays the params names and values in dictionary form + used by the api call + """ + result = {} + for param in self._params: + result[param.name] = param.value + return result def from_dict(self, params_dict): """set param values manually from a dictionary""" |