ok

3 files changed, 142 insertions, 24 deletions

diff --git a/ricky/imgradient/__init__.py b/ricky/imgradient/__init__.py
index 1d8da3d..a8ed8a6 100644
--- a/ricky/imgradient/__init__.py
+++ b/ricky/imgradient/__init__.py
@@ -11,6 +11,5 @@ class ImGradient(Im):
 
     def params_init(self):
         new_params = Params()
-        #new_params = self.get_from_server()
         new_params.api = self
         return new_params
diff --git a/ricky/imgradient/params.py b/ricky/imgradient/params.py
index 8786ae6..38cea33 100644
--- a/ricky/imgradient/params.py
+++ b/ricky/imgradient/params.py
@@ -48,107 +48,106 @@ _GRADIENTTYPE_OPTIONS = [
 class Params(_Params):
     def __init__(self):
         super(Params, self).__init__(
-            Username(name="username", required=0),
+            Username(name="username", required=False),
             ConstrainedNumber(
                 name="width",
-                required=1,
+                required=True,
                 min=10,
                 max=800
             ),
             ConstrainedNumber(
                 name="height",
-                required=1,
+                required=True,
                 min=10,
                 max=800
             ),
-            Color(name="color1", required=1),
-            Color(name="color2", required=1),
+            Color(name="color1", required=True),
+            Color(name="color2", required=True),
             MultiSelect(
                 name="filetype",
-                required=0,
+                required=False,
             ),
             MultiSelect(
                 name="gradienttype",
-                required=1,
+                required=True,
                 options=_GRADIENTTYPE_OPTIONS
             ),
             MultiSelect(
                 name="halftone",
-                required=0,
+                required=False,
                 options=_HALFTONE_OPTIONS
             ),
             MultiSelect(
                 name="bevel",
-                required=0,
+                required=False,
                 options=_BEVEL_OPTIONS
             ),
             ConstrainedNumber(
                 name="stripenumber",
-                required=0,
+                required=False,
                 min=0,
                 max=400
             ),
             ConstrainedNumber(
                 name="stripeintensity",
-                required=0,
+                required=False,
                 min=0,
                 max=5000
             ),
-
             ConstrainedNumber(
                 name="blurriness",
-                required=0,
+                required=False,
                 min=0,
                 max=200
             ),
             ConstrainedNumber(
                 name="contrast",
-                required=0,
+                required=False,
                 min=0,
                 max=200
             ),
             ConstrainedNumber(
                 name="brightness",
-                required=0,
+                required=False,
                 min=0,
                 max=200
             ),
             ConstrainedNumber(
                 name="saturation",
-                required=0,
+                required=False,
                 min=0,
                 max=200
             ),
             ConstrainedNumber(
                 name="hue",
-                required=0,
+                required=False,
                 min=0,
                 max=200
             ),
             ConstrainedNumber(
                 name="percentbeveled",
-                required=0,
+                required=False,
                 min=0,
                 max=100
             ),
             ConstrainedNumber(
                 name="rotate",
-                required=0,
+                required=False,
                 min=0,
                 max=360
             ),
             ConstrainedNumber(
                 name="tilt",
-                required=0,
+                required=False,
                 min=0,
                 max=360
             ),
             Bool(
                 name="flop",
-                required=0,
+                required=False,
             ),
             Bool(
                 name="flip",
-                required=0
-            ),
+                required=False
+            )
         )
diff --git a/ricky/imgradient/probabilities.json b/ricky/imgradient/probabilities.json
new file mode 100644
index 0000000..0c6c0df
--- /dev/null
+++ b/ricky/imgradient/probabilities.json
@@ -0,0 +1,120 @@
+{
+    "width" : [
+        {"value": 40, "weight": 10}
+    ],
+    "height" : [
+        {"value": 400, "weight": 100}
+    ],
+    "color1" : [
+        {"value": "", "weight": 0},
+        {"value": "black", "weight": 1},
+        {"value": "white", "weight": 2}
+    ],
+    "color2" : [
+        {"value": "", "weight": 0},
+        {"value": "black", "weight": 2},
+        {"value": "white", "weight": 1}
+    ],
+    "stripes" : [
+        {"value": "true", "weight": 3},
+        {"value": "false", "weight": 1}
+    ],
+    "stripenumber" : [
+        {"value": 3, "weight": 10},
+        {"value": 10, "weight": 10},
+        {"value": 20, "weight": 10},
+        {"value": 100, "weight": 10},
+        {"value": 40, "weight": 10},
+        {"value": 1, "weight": 50},
+        {"value": 2, "weight": 50},
+        {"value": 2, "weight": 50}
+    ],
+    "stripeintensity" : [
+        {"value": 1000, "weight": 10},
+        {"value": 4, "weight": 10}
+    ],
+    "contrast" : [
+        {"value": "", "weight": 0},
+        {"value": "", "weight": 300}
+    ],
+    "brightness" : [
+        {"value": "", "weight": 0},
+        {"value": "", "weight": 300}
+    ],
+    "saturation" : [
+        {"value": "", "weight": 0},
+        {"value": "", "weight": 300}
+    ],
+    "hue" : [
+        {"value": "", "weight": 0},
+        {"value": "", "weight": 300}
+    ],
+    "halftone" : [
+        {"value": "", "weight": 60},
+        {"value": "checkeredfade", "weight": 10},
+        {"value": "etchedtransition", "weight": 10},
+        {"value": "bendaydots", "weight": 10},
+        {"value": "smallerdots1", "weight": 10},
+        {"value": "smallerdots2", "weight": 10},
+        {"value": "flatstripes", "weight": 10}
+    ],
+    "bevel" : [
+        {"value": "", "weight": 4},
+        {"value": "flatout", "weight": 1},
+        {"value": "flatinner", "weight": 0},
+        {"value": "evenlyframed", "weight": 1},
+        {"value": "biginner", "weight": 1},
+        {"value": "bigouter", "weight": 1},
+        {"value": "dramaticflatout", "weight": 1},
+        {"value": "dramaticflatinner", "weight": 1}
+    ],
+    "blurriness" : [
+        {"value": 30, "weight": 10},
+        {"value": 10, "weight": 10},
+        {"value": 5, "weight": 10},
+        {"value": 20, "weight": 10},
+        {"value": 25, "weight": 10},
+        {"value": 7, "weight": 10},
+        {"value": "", "weight": 1}
+    ],
+    "percentbeveled" : [
+        {"value": 30, "weight": 10},
+        {"value": 10, "weight": 10},
+        {"value": 5, "weight": 10},
+        {"value": 20, "weight": 10},
+        {"value": 25, "weight": 10},
+        {"value": 7, "weight": 10},
+        {"value": "", "weight": 1}
+    ],
+    "rotate" : [
+        {"value": 0, "weight": 200},
+        {"value": 90,  "weight": 2},
+        {"value": 180, "weight": 2},
+        {"value": 270, "weight": 2}
+    ],
+    "tilt" : [
+        {"value": 0, "weight": 200},
+        {"value": 90,  "weight": 2},
+        {"value": 180, "weight": 2},
+        {"value": 270, "weight": 2}
+    ],
+    "flop_probabilities : flip" : [
+        {"value": "", "weight": 1},
+        {"value": "true",  "weight": 1}
+    ],
+    "filetype" : [
+        {"value": "png", "weight": 10},
+        {"value": "jpg", "weight": 2},
+        {"value": "gif", "weight": 2}
+    ],
+    "gradienttype" : [
+        {"value": "canvas", "weight": 1},
+        {"value": "gradient", "weight": 5},
+        {"value": "radial", "weight": 1},
+        {"value": "colorspace", "weight": 1},
+        {"value": "plasmawash", "weight": 2},
+        {"value": "gradientwash", "weight": 1},
+        {"value": "mirrored", "weight": 0},
+        {"value": "noise", "weight": 1}
+    ]
+}