ok cleaning up the last few modules

1 files changed, 28 insertions, 56 deletions

diff --git a/Pb/Grid/__init__.py b/Pb/Grid/__init__.py
index 09718bd..b2c8bdd 100755
--- a/Pb/Grid/__init__.py
+++ b/Pb/Grid/__init__.py
@@ -11,7 +11,17 @@ from Pb import Pb
 
 _default_line_color = "silver"
 
-class Imgrid(Pb):
+class PbGrid(Pb):
+    example_params = {
+      'bgimage' : 'http://i.asdf.us/im/1a/imBreak_1424909483_xx_abridged___.gif',
+      'planebgimage' : 'http://i.imgur.com/FICZtph.png',
+      'tilt' : '30',
+      'spacing' : '30',
+      'hlines' : 'true',
+      'roll' : '30',
+      'shadow' : 'true',
+      'trim' : 'true'
+    }
     def __init__(self, 
           width=None,
           height=None,
@@ -37,41 +47,23 @@ class Imgrid(Pb):
           finalformat=DEFAULT_FINALFORMAT,
           username=None
         ):
-        super(Imgrid,self).__init__();
-
-        _frame = inspect.currentframe(); 
-        _args_vals = inspect.getargvalues(_frame);
-        for arg in _args_vals.args:
-          if arg == "self":
-            continue
-          argval = _args_vals.locals.get(arg)
-          try:
-            if arg in [ 'skycolor', 'bgcolor', 'planebgcolor','linecolor' ]:
-              self.params.set_val(arg, argval, value_type="color")
-            elif arg == 'opacity':
-              self.params.set_val(arg, argval, value_type="float")
-            elif arg == 'zoom':
-              self.params.set_val(arg, argval, value_type="int")
-            elif arg in [ 'bgimage', 'planebgimage', 'imageinstead' ]:
-              self.params.set_val(arg, argval, value_type="img_url")
-              if self.params.get_mimetype(arg) == 'gif':
-                self.params.gif_convert_to_still(arg)
-              self.files_created.append(self.params.get_filepath(arg))
-            elif arg in ['finalformat', 'username' ] :
-              self.params.set_val(arg, argval, value_type="string")
-            else:
-              self.params.set_val(arg, argval, value_type="bool")
-  
-          except Exception as e:
-            self.log_err(str(e))
-
-        #FIXME these need to be bumped up to the parent class
-        self.basename = self._get_filename();
-        self.filename = "{}.{}".format(self.basename, self.params.finalformat)
-        #final filepath is stored in self.filepath
-        self.filepath = os.path.join(WORKING_DIR, self.filename) 
-
-
+        super(PbGrid,self).__init__();
+        self.params.set_val("skycolor", skycolor, value_type="color")
+        self.params.set_val("bgcolor", bgcolor, value_type="color")
+        self.params.set_val("planebgcolor", planebgcolor, value_type="color")
+        self.params.set_val("linecolor", linecolor, value_type="color")
+        self.params.set_val("opacity", opacity, value_type="float")
+        self.params.set_val("zoom", zoom, value_type="int")
+        self.params.set_val("bgimage", bgimage, value_type="img_url")
+        self.params.set_val("planebgimage", planebgimage, value_type="img_url")
+        self.params.set_val("imageinstead", imageinstead, value_type="img_url")
+#FIXME choose gif frame
+        self.params.set_val("spacing", spacing, value_type="bool")
+        self.params.set_val("vlines", vlines, value_type="bool")
+        self.params.set_val("hlines", hlines, value_type="bool")
+        self.params.set_val("shadow", shadow, value_type="bool")
+        self.params.set_val("finalformat", finalformat, value_type="string")
+        self.params.set_val("username", username, value_type="string")
 
     #makes a canvas file...step 1 (if not bgimage)
     def _make_canvas(self):
@@ -157,12 +149,6 @@ class Imgrid(Pb):
         ]
         self._call_cmd(cmd)
              
-    def _cleanup(self):
-        if not len(self.files_created):
-            return
-        cmd = ["rm", "-f"] + self.files_created
-        self._call_cmd(cmd)
-        
     def create(self):
         if self.params.bgimage:
             self._prepare_gridimage(self.params.bgimage)
@@ -177,17 +163,3 @@ class Imgrid(Pb):
         if self.params.planebgimage: self._overlay_planebgimage()
         if self.params.trim: self._trim_cmd() 
         self._cleanup()
-
-if __name__ == "__main__":
-    g = Imgrid(**{
-      'bgimage' : 'http://i.asdf.us/im/1a/imBreak_1424909483_xx_abridged___.gif',
-      'planebgimage' : 'http://i.imgur.com/FICZtph.png',
-      'tilt' : '30',
-      'spacing' : '30',
-      'hlines' : 'true',
-      'roll' : '30',
-      'shadow' : 'true',
-      'trim' : 'true'
-    })
-    g.create()
-    print g.commands