summaryrefslogtreecommitdiff
path: root/ricky/imgradient
diff options
context:
space:
mode:
Diffstat (limited to 'ricky/imgradient')
-rw-r--r--ricky/imgradient/__init__.py17
-rw-r--r--ricky/imgradient/imgradient.py16
-rw-r--r--ricky/imgradient/params.py116
-rw-r--r--ricky/imgradient/selections.py105
4 files changed, 91 insertions, 163 deletions
diff --git a/ricky/imgradient/__init__.py b/ricky/imgradient/__init__.py
index 72efca1..1d8da3d 100644
--- a/ricky/imgradient/__init__.py
+++ b/ricky/imgradient/__init__.py
@@ -1 +1,16 @@
-from ricky.imgradient.imgradient import ImGradient
+"""class for the imgradient api handler"""
+from ricky.im import Im
+from ricky.imgradient.params import Params
+from ricky.config import IMGRADIENT_URL
+
+
+class ImGradient(Im):
+ def __init__(self):
+ super(ImGradient, self).__init__()
+ self.url = IMGRADIENT_URL
+
+ 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/imgradient.py b/ricky/imgradient/imgradient.py
deleted file mode 100644
index 1d8da3d..0000000
--- a/ricky/imgradient/imgradient.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""class for the imgradient api handler"""
-from ricky.im import Im
-from ricky.imgradient.params import Params
-from ricky.config import IMGRADIENT_URL
-
-
-class ImGradient(Im):
- def __init__(self):
- super(ImGradient, self).__init__()
- self.url = IMGRADIENT_URL
-
- 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 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
+ ),
)
diff --git a/ricky/imgradient/selections.py b/ricky/imgradient/selections.py
deleted file mode 100644
index 5d0d345..0000000
--- a/ricky/imgradient/selections.py
+++ /dev/null
@@ -1,105 +0,0 @@
-from ricky.param.selections import Selections
-
-width_selections = Selections.from_dict(
- {"value": 40, "weight": 60},
- {"value": 20, "weight": 60},
- {"value": 60, "weight": 60},
- {"value": 80, "weight": 60},
-)
-height_selections = Selections.from_dict(
- {"value": 400, "weight": 900},
-)
-color1_selections = Selections.from_dict(
- {"value": "", "weight": 0},
-# {"value": "black", "weight": 1},
-# {"value": "white", "weight": 2},
-)
-color2_selections = Selections.from_dict(
- {"value": "", "weight": 0},
-# {"value": "black", "weight": 2},
-# {"value": "white", "weight": 1},
-)
-stripes_selections = Selections.from_dict(
- {"value": "true", "weight": 3},
- {"value": "false", "weight": 1},
-)
-stripenumber_selections = Selections.from_dict(
- {"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_selections = Selections.from_dict(
- {"value": 1000, "weight": 10},
- {"value": 4, "weight": 10},
-)
-# contrast_selections = \
-brightness_selections = \
- saturation_selections = \
- hue_selections = \
- Selections.from_dict(
- {"value": "", "weight": 0},
-# {"value": "", "weight": 300},
-)
-halftone_selections = Selections.from_dict(
- {"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_selections = Selections.from_dict(
- {"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_selections = \
- percentbeveled_selections = Selections.from_dict(
- {"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_selections = \
- tilt_selections = Selections.from_dict(
- {"value": 0, "weight": 200},
- {"value": 90, "weight": 2},
- {"value": 180, "weight": 2},
- {"value": 270, "weight": 2},
-)
-flop_selections = flip_selections = Selections.from_dict(
- {"value": "", "weight": 1},
- {"value": "true", "weight": 1},
-)
-
-filetype_selections = Selections.from_dict(
- {"value": "png", "weight": 10},
- {"value": "jpg", "weight": 2},
- {"value": "gif", "weight": 2},
-)
-gradienttype_selections = Selections.from_dict(
- {"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},
-)
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-24 19:53:20 +0000