1 files changed, 37 insertions, 69 deletions

diff --git a/Pb/Generate/__init__.py b/Pb/Generate/__init__.py
index 0062652..e50e514 100755
--- a/Pb/Generate/__init__.py
+++ b/Pb/Generate/__init__.py
@@ -13,7 +13,6 @@ _compose_params = [ "Over", "ATop", "Dst_Over", "Dst_In", "Dst_Out", "Multiply",
   "Linear_Dodge", "Linear_Burn", "Color_Dodge", "Color_Burn" ]
 _dispose_params = ["None","Previous","Background"]
 _dispose_default = "None"
-
 class PbGenerate(Pb):
     example_params = {
 #{{{ example params
@@ -45,80 +44,49 @@ class PbGenerate(Pb):
      'fuzz': '5'
 #}}}
     }
-    def __init__(self, 
-      #URLS
-      url=None,
-      background=None,
-      #BOOLS
-      coalesce=None,
-      nearest=None,
-      merge_early=None,
-      flip=None,
-      flop=None,
-      tile=None,
-      transparent=None,
-      #COLORS
-      black="black",
-      white="white",
-      subtract="white",
-      #INTS
-      fuzz=None,
-      width=None,
-      height=None,
-      brightness=None,
-      contrast=None,
-      saturation=None,
-      rotate=None,
-      hue=None,
-      #ENUMS
-      compose="Atop",
-      gravity=_gravity_default,
-      format=DEFAULT_FINALFORMAT,
-      dispose="None",
-      #STRINGS
-      name=None,
-      callback=None,
-    ):  
+    def __init__(self, **kwargs):  
       super(PbGenerate,self).__init__();
-      #IMAGES
-      self.params.set_val("url", url, value_type="img_url")
-      self.params.set_val("background", background, value_type="img_url")
-
-      #BOOLS
-      self.params.set_val("coalesce", coalesce, value_type="bool")
-      self.params.set_val("nearest", nearest, value_type="bool")
-      self.params.set_val("merge_early", merge_early, value_type="bool")
-      self.params.set_val("flip", flip, value_type="bool")
-      self.params.set_val("flop", flop, value_type="bool")
-      self.params.set_val("tile", tile, value_type="bool")
-      self.params.set_val("transparent", transparent, value_type="bool")
+      _definitions = { 
+        #IMAGES
+        "url": { 'type': "img_url" },
+        "background": { 'type': "img_url" },
 
-      #COLORS
-      self.params.set_val("black", black, value_type="color")
-      self.params.set_val("white", white, value_type="color")
-      self.params.set_val("subtract", subtract, value_type="color")
+        #BOOLS
+        "coalesce": { 'type': "bool" },
+        "nearest": { 'type': "bool" },
+        "merge_early": { 'type': "bool" },
+        "flip": { 'type': "bool" },
+        "flop": { 'type': "bool" },
+        "tile": { 'type': "bool" },
+        "transparent": { 'type': "bool" },
 
-      #INTS
-      self.params.set_val("fuzz", fuzz or 0, value_type="int")
-      self.params.set_val("width", width or 0, value_type="int")
-      self.params.set_val("height", height or 0, value_type="int")
-      self.params.set_val("brightness", brightness or 0, value_type="int")
-      self.params.set_val("contrast", contrast or 0, value_type="int")
-      self.params.set_val("saturation", saturation or 0, value_type="int")
-      self.params.set_val("rotate", rotate or 0, value_type="int")
-      self.params.set_val("hue", hue or 0, value_type="int")
-      
-      #ENUMS
-      self.params.set_val("compose", compose, value_type="enum", enum_values=_compose_params)
-      self.params.set_val("gravity", gravity, value_type="enum", enum_values=_gravity_params)
-      self.params.set_val("dispose", dispose, value_type="enum", enum_values=_dispose_params)
-      self.params.set_val("format", format, value_type="enum", enum_values=OUTPUT_IMAGE_TYPES)
+        #COLORS
+        "black": { 'type': "color", 'default': 'black' },
+        "white": { 'type': "color", 'default': 'white' },
+        "subtract": { 'type': "color" },
 
-      #STRINGS
-      self.params.set_val("username", name, value_type="string")
-      self.params.set_val("callback", callback, value_type="string")
+        #INTS
+        "fuzz": { 'type': "int" },
+        "width": { 'type': "int" },
+        "height": { 'type': "int" },
+        "brightness": { 'type': "int" },
+        "contrast": { 'type': "int" },
+        "saturation": { 'type': "int" },
+        "rotate": { 'type': "int" },
+        "hue": { 'type': "int" },
+        
+        #ENUMS
+        "compose": { 'type': "enum", 'enum_values': _compose_params, 'default': "Atop" },
+        "gravity": { 'type': "enum", 'enum_values': _gravity_params, 'default': _gravity_default },
+        "dispose": { 'type': "enum", 'enum_values': _dispose_params, 'default': "None" },
+        "format": { 'type': "enum", 'enum_values': OUTPUT_IMAGE_TYPES, 'default': DEFAULT_FINALFORMAT },
 
+        #STRINGS
+        "username": { 'type': "string" },
+        "callback": { 'type': "string" },
+      }
       self.tag = _default_tag
+      self.params.definitions_import(_definitions, kwargs, classname=self.__class__.__name__);
       if self.params.background: self.tag = self.params.compose 
       if self.params.transparent: self.tag = self.params.transparent