diff options
Diffstat (limited to 'Pb/Gradient/__init__.py')
| -rwxr-xr-x | Pb/Gradient/__init__.py | 100 |
1 files changed, 41 insertions, 59 deletions
diff --git a/Pb/Gradient/__init__.py b/Pb/Gradient/__init__.py index 2ef8b93..00adbf1 100755 --- a/Pb/Gradient/__init__.py +++ b/Pb/Gradient/__init__.py @@ -41,68 +41,50 @@ class PbGradient(Pb): "filetype" : "jpg",
"username" : "whatever"
}
- def __init__(self,
- width=DEFAULT_WIDTH, height=DEFAULT_HEIGHT,
- color1=_default_color_1, color2=_default_color_2,
- stripes=False,
- stripenumber=0,
- stripeintensity=0,
- blurriness=0,
- contrast=100,
- brightness=100,
- saturation=100,
- hue=100,
- halftone=None,
- bevel=None,
- percentbeveled=_default_bevel_percent,
- tilt=0, rotate=0,
- flip=False, flop=False,
- filetype=DEFAULT_FINALFORMAT,
- gradienttype="default",
- username=None,
- ):
+ def __init__(self, **kwargs):
super(PbGradient,self).__init__();
- self.params.set_val("width", width, value_type="int")
- self.params.set_val("height", height, value_type="int")
- self.params.set_val("color1", color1, value_type="color")
- self.params.set_val("color2", color2, value_type="color")
- self.params.set_val("stripes", stripes, value_type="bool")
- self.params.set_val("stripenumber", stripenumber, value_type="int")
- self.params.set_val("stripeintensity", stripeintensity, value_type="int")
- self.params.set_val("blurriness", blurriness, value_type="int")
- self.params.set_val("contrast", contrast, value_type="int")
- self.params.set_val("brightness", brightness, value_type="int")
- self.params.set_val("saturation", saturation, value_type="int")
- self.params.set_val("hue", hue, value_type="int")
-
- self.params.set_val("halftone", halftone, value_type="enum", enum_values=[
- "checkeredfade", "etchedtransition", "bendaydots",
- "smallerdots1", "smallerdots2", "flatstripes",
- ])
- self.params.set_val("bevel", bevel, value_type="enum", enum_values=[
- "flatout", "flatinner", "evenlyframed", "biginner",
- "bigouter", "dramaticflatout", "dramaticflatinner",
- ])
- self.params.set_val("percentbeveled", percentbeveled, value_type="int")
- self.params.set_val("tilt", tilt, value_type="int")
- self.params.set_val("rotate", rotate, value_type="int")
- self.params.set_val("flip", flip, value_type="bool")
- self.params.set_val("flop", flop, value_type="bool")
-
- self.params.set_val("filetype", filetype, value_type="enum", enum_values=OUTPUT_IMAGE_TYPES)
- self.params.set_val("gradienttype", gradienttype, value_type="enum", enum_values=[
- "default", "canvas", "radial", "colorspace",
- "mirrored", "plasmawash", "gradientwash", "noise"
- ])
- self.params.set_val("username", username, value_type="string")
+ _definitions = {
+ 'width': { 'type':'int', 'default': DEFAULT_WIDTH },
+ 'height': { 'type':'int', 'default' : DEFAULT_HEIGHT },
+ 'color1': { 'type':'color', 'default': _default_color_1 },
+ 'color2': { 'type':'color', 'default': _default_color_2 },
+ 'stripes': { 'type':'bool' },
+ 'stripenumber': { 'type':'int', 'default': 0 },
+ 'stripeintensity': { 'type':'int', 'default': 0 },
+ 'blurriness': { 'type':'int', 'default': 0 },
+ 'contrast': { 'type':'int', 'default': 100 },
+ 'brightness': { 'type':'int', 'default': 100 },
+ 'saturation': { 'type':'int', 'default': 100 },
+ 'hue': { 'type':'int', 'default': 100 },
+ 'halftone': { 'type':'enum', 'enum_values' : [
+ 'checkeredfade', 'etchedtransition', 'bendaydots',
+ 'smallerdots1', 'smallerdots2', 'flatstripes',
+ ] },
+ 'bevel': { 'type':'enum', 'enum_values' : [
+ 'flatout', 'flatinner', 'evenlyframed', 'biginner',
+ 'bigouter', 'dramaticflatout', 'dramaticflatinner',
+ ] },
+ 'percentbeveled': { 'type':'int', 'default': _default_bevel_percent },
+ 'tilt': { 'type':'int' },
+ 'rotate': { 'type':'int' },
+ 'flip': { 'type':'bool' },
+ 'flop': { 'type':'bool' },
+ 'filetype': { 'type':'enum', 'enum_values' : OUTPUT_IMAGE_TYPES, 'default': DEFAULT_FINALFORMAT },
+ 'gradienttype': { 'type':'enum', 'enum_values' : [
+ 'default', 'canvas', 'radial', 'colorspace',
+ 'mirrored', 'plasmawash', 'gradientwash', 'noise'
+ ], 'default': 'default' },
+ 'username': { 'type':'string' }
+ }
+ self.params.definitions_import(_definitions, kwargs, classname=self.__class__.__name__);
self.filename, self.filepath = self._filename_filepath_create()
def _filename_create(self, **kwargs):
_base = "{}{}-{}_{}".format(
self.__class__.__name__,
- self.params.color1.replace('#','').replace('(','-').replace(')','-'),
- self.params.color2.replace('#','').replace('(','-').replace(')','-'),
+ str(self.params.color1).replace('#','').replace('(','-').replace(')','-'),
+ str(self.params.color2).replace('#','').replace('(','-').replace(')','-'),
self._now,
)
if self.params.username: _base += "_%s" % self.params.username
@@ -147,7 +129,7 @@ class PbGradient(Pb): ],
"noise" : ["xc:","+noise","Random","-virtual-pixel","tile"]
}
- cmd += _gradients[self.params.gradienttype]
+ cmd += _gradients[str(self.params.gradienttype)]
if self.params.blurriness:
cmd.extend(["-blur","0x{}".format(self.params.blurriness),"-auto-level"])
@@ -158,10 +140,10 @@ class PbGradient(Pb): cmd.append("{},{}".format(self.params.stripenumber,self.params.stripeintensity))
else:
cmd.append(self.params.stripenumber)
- if self.params.halftone in _halftone_values:
+ if str(self.params.halftone) in _halftone_values:
cmd.extend([
"-ordered-dither",
- _halftone_values[self.params.halftone]
+ _halftone_values[str(self.params.halftone)]
])
cmd += [
'-modulate',
@@ -188,7 +170,7 @@ class PbGradient(Pb): "bigouter": ["-s",bevpercentval,"-m","split","-c","50","-b","red","-a","25"],
"dramaticflatout": ["-s",bevpercentval,"-m","outer","-a","25","-b","blue"],
"dramaticflatinner": ["-s",bevpercentval,"-m","outer","-a","25","-b","blue"],
- }[self.params.bevel]
+ }[str(self.params.bevel)]
def _make_bevel(self):
cmd = [BEVELBORDER]
|