From 0c965a54861e779ca51b235e7a3c2475d8a84dfb Mon Sep 17 00:00:00 2001
From: Pepper <pepper@scannerjammer.com>
Date: Fri, 9 Oct 2015 02:42:18 -0400
Subject: fixed something in gradient

---
 lib/pb/gradient.py | 77 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 29 deletions(-)

(limited to 'lib/pb/gradient.py')

diff --git a/lib/pb/gradient.py b/lib/pb/gradient.py
index 9bca087..055f5b7 100755
--- a/lib/pb/gradient.py
+++ b/lib/pb/gradient.py
@@ -19,23 +19,24 @@ _halftone_values = {
 }
 
 class PbGradient(Pb):
-    example_params = {
-        "width" : "200",
-        "color1" : "#ffdead",
-        "color2" : "blue",
-        "stripes" : "true",
-        "stripenumber" : "20",
-        "gradienttype" : "radial",
-        "stripeintensity" : "20",
-        "halftone" : "checkeredfade",
-        "percentbeveled" : "30",
-        "flip" : "true",
-        "bevel" : "flatinner",
-        "rotate" : "20",
-        "height" : "200",
-        "filetype" : "jpg",
-        "username" : "whatever"
-    }
+    example_params = {'username': 'RICHARD_GIOVANNI', 'bevel': 'flatinner', 'saturation': '', 'rotate': 34, 'percentbeveled': 96, 'brightness': 79, 'stripenumber': 2, 'filetype': 'png', 'blurriness': 180, 'flip': '', 'height': 594, 'color1': 'rgb(191,125,24)', 'width': 536, 'color2': 'rgb(186,78,94)', 'gradienttype': 'mirrored', 'stripeintensity': 2515, 'tilt': 58, 'flop': '', 'halftone': 'etchedtransition', 'hue': 146}
+#    example_params = {
+#        "width" : "200",
+#        "color1" : "#ffdead",
+#        "color2" : "blue",
+#        "stripes" : "true",
+#        "stripenumber" : "20",
+#        "gradienttype" : "radial",
+#        "stripeintensity" : "20",
+#        "halftone" : "checkeredfade",
+#        "percentbeveled" : "30",
+#        "flip" : "true",
+#        "bevel" : "flatinner",
+#        "rotate" : "20",
+#        "height" : "200",
+#        "filetype" : "jpg",
+#        "username" : "whatever"
+#    }
     def __init__(self, **kwargs):
         super(PbGradient, self).__init__(**kwargs)
         _definitions = {
@@ -98,15 +99,15 @@ class PbGradient(Pb):
         ])
 
         if self.params.rotate:
-            cmd.extend(["-rotate", self.params.rotate])
+            cmd.extend(["-rotate", str(self.params.rotate)])
         if self.params.tilt:
-            cmd.extend(["-distort", "SRT", self.params.tilt])
+            cmd.extend(["-distort", "SRT", str(self.params.tilt)])
         if self.params.flip == "true":
             cmd.append("-flip")
         if self.params.flop == "true":
             cmd.append("-flop")
         if self.params.contrast:
-            cmd.extend(["-contrast-stretch", self.params.contrast])
+            cmd.extend(["-contrast-stretch", str(self.params.contrast)])
         _gradients = {
             "gradient" : ["gradient:{}-{}".format(self.params.color1, self.params.color2)],
             "canvas" : ["canvas:{}".format(self.params.color1)],
@@ -119,19 +120,31 @@ class PbGradient(Pb):
             "colorspace" : [
                 "-colorspace",
                 "Gray",
-                "plasma:{}-{}".format(self.params.color1, self.params.color2)
+                "plasma:{}-{}".format(
+                    self.params.color1, 
+                    self.params.color2
+                )
             ],
             "mirrored" : [
-                "plasma:{}-{}".format(self.params.color1, self.params.color2),
-                "\(", "+clone", "-flop", "\)",
-                "append"
+                "plasma:{}-{}".format(
+                    self.params.color1,
+                    self.params.color2
+                ),
+                "(", "+clone", "-flop", ")", 
+                "+append"
             ],
             "plasmawash" : [
-                "plasma:{}-{}".format(self.params.color1, self.params.color2),
+                "plasma:{}-{}".format(
+                    self.params.color1,
+                    self.params.color2
+                ),
                 "-set", "colorspace", "HSB"
             ],
             "gradientwash" : [
-                "gradient:{}-{}".format(self.params.color1, self.params.color2),
+                "gradient:{}-{}".format(
+                    self.params.color1,
+                    self.params.color2
+                ),
                 "-set", "colorspace", "HSB"
             ],
             "noise" : ["xc:", "+noise", "Random", "-virtual-pixel", "tile"]
@@ -141,12 +154,16 @@ class PbGradient(Pb):
         if self.params.blurriness:
             cmd.extend(["-blur", "0x{}".format(self.params.blurriness), "-auto-level"])
 
-        if self.params.stripes == "true" and len(self.params.stripenumber):
+        if self.params.stripes and self.params.stripenumber:
             cmd.extend(["-function", "Sinusoid"])
             if self.params.stripeintensity:
-                cmd.append("{},{}".format(self.params.stripenumber, self.params.stripeintensity))
+                cmd.append("{},{}".format(
+                        self.params.stripenumber,
+                        self.params.stripeintensity
+                    )
+                )
             else:
-                cmd.append(self.params.stripenumber)
+                cmd.append(str(self.params.stripenumber))
         if str(self.params.halftone) in _halftone_values:
             cmd.extend([
                 "-ordered-dither",
@@ -161,6 +178,8 @@ class PbGradient(Pb):
             )
         ]
         cmd.append(self.filepath)
+        import sys
+        sys.stderr.write("\n%s\n" % cmd)
         self._call_cmd(cmd)
         if self.params.bevel: self._make_bevel()
 
-- 
cgit v1.2.3-70-g09d2