1 files changed, 75 insertions, 41 deletions

diff --git a/ricky/imgradient/params.py b/ricky/imgradient/params.py
index 373a9a1..8786ae6 100644
--- a/ricky/imgradient/params.py
+++ b/ricky/imgradient/params.py
@@ -1,120 +1,154 @@
-import re
 from ricky.params import Params as _Params
 from ricky.param.username import Username
 from ricky.param.multiselect import MultiSelect
-from ricky.param.numberrange import NumberRange
+from ricky.param.constrainednumber import ConstrainedNumber
+from ricky.param.bool import Bool
 from ricky.param.color import Color
-from ricky.imgradient.selections import *
+
+
+_HALFTONE_OPTIONS = [
+    "",
+    "checkeredfade",
+    "etchedtransition",
+    "bendaydots",
+    "smallerdots1",
+    "smallerdots2",
+    "flatstripes",
+]
+
+_BEVEL_OPTIONS = [
+    "",
+    "flatout",
+    "flatinner",
+    "evenlyframed",
+    "biginner",
+    "bigouter",
+    "dramaticflatout",
+    "dramaticflatinner",
+]
+
+_FILETYPE_OPTIONS = [
+    "png",
+    "jpg",
+    "gif",
+]
+
+_GRADIENTTYPE_OPTIONS = [
+    "canvas",
+    "gradient",
+    "radial",
+    "colorspace",
+    "plasmawash",
+    "gradientwash",
+    "mirrored",
+    "noise",
+]
 
 
 class Params(_Params):
     def __init__(self):
         super(Params, self).__init__(
             Username(name="username", required=0),
-            NumberRange(
+            ConstrainedNumber(
                 name="width",
                 required=1,
-                selections=width_selections,
                 min=10,
                 max=800
             ),
-            NumberRange(
+            ConstrainedNumber(
                 name="height",
                 required=1,
-                selections=height_selections,
                 min=10,
                 max=800
             ),
-            Color(name="color1", required=1, selections=color1_selections),
-            Color(name="color2", required=1, selections=color2_selections),
+            Color(name="color1", required=1),
+            Color(name="color2", required=1),
             MultiSelect(
                 name="filetype",
                 required=0,
-                selections=filetype_selections
             ),
             MultiSelect(
                 name="gradienttype",
                 required=1,
-                selections=gradienttype_selections
+                options=_GRADIENTTYPE_OPTIONS
             ),
             MultiSelect(
                 name="halftone",
                 required=0,
-                selections=halftone_selections
+                options=_HALFTONE_OPTIONS
             ),
-            MultiSelect(name="bevel", required=0, selections=bevel_selections),
-
-            NumberRange(
+            MultiSelect(
+                name="bevel",
+                required=0,
+                options=_BEVEL_OPTIONS
+            ),
+            ConstrainedNumber(
                 name="stripenumber",
                 required=0,
-                selections=stripenumber_selections,
                 min=0,
                 max=400
             ),
-            NumberRange(
+            ConstrainedNumber(
                 name="stripeintensity",
                 required=0,
-                selections=stripeintensity_selections,
                 min=0,
                 max=5000
             ),
 
-            NumberRange(
+            ConstrainedNumber(
                 name="blurriness",
                 required=0,
-                selections=blurriness_selections,
                 min=0,
                 max=200
             ),
-  #          NumberRange(
-  #              name="contrast",
-  #              required=0,
-  #              selections=contrast_selections,
-  #              min=0,
-  #              max=200
-  #          ),
-            NumberRange(
+            ConstrainedNumber(
+                name="contrast",
+                required=0,
+                min=0,
+                max=200
+            ),
+            ConstrainedNumber(
                 name="brightness",
                 required=0,
-                selections=brightness_selections,
                 min=0,
                 max=200
             ),
-            NumberRange(
+            ConstrainedNumber(
                 name="saturation",
                 required=0,
-                selections=saturation_selections,
                 min=0,
                 max=200
             ),
-            NumberRange(
+            ConstrainedNumber(
                 name="hue",
                 required=0,
-                selections=hue_selections,
                 min=0,
                 max=200
             ),
-            NumberRange(
+            ConstrainedNumber(
                 name="percentbeveled",
                 required=0,
-                selections=percentbeveled_selections,
                 min=0,
                 max=100
             ),
-            NumberRange(
+            ConstrainedNumber(
                 name="rotate",
                 required=0,
-                selections=rotate_selections,
                 min=0,
                 max=360
             ),
-            NumberRange(
+            ConstrainedNumber(
                 name="tilt",
                 required=0,
-                selections=tilt_selections,
                 min=0,
                 max=360
             ),
-            MultiSelect(name="flop", required=0, selections=flop_selections),
-            MultiSelect(name="flip", required=0, selections=flip_selections),
+            Bool(
+                name="flop",
+                required=0,
+            ),
+            Bool(
+                name="flip",
+                required=0
+            ),
         )