From 0e9991e9bd5748a6d32c825e0a00a5ac15c29982 Mon Sep 17 00:00:00 2001 From: Pepper Date: Sat, 26 Sep 2015 22:00:15 -0400 Subject: linting... --- lib/pb/gradient.py | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) (limited to 'lib/pb/gradient.py') diff --git a/lib/pb/gradient.py b/lib/pb/gradient.py index 02d57d3..c2a9066 100755 --- a/lib/pb/gradient.py +++ b/lib/pb/gradient.py @@ -1,11 +1,13 @@ -#!/usr/bin/python2.7 -from config import * +"""Creates a gradient image and adds effects to it""" + +from config import DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_FINALFORMAT, \ + BIN_CONVERT, BEVELBORDER, OUTPUT_IMAGE_TYPES from pb import Pb -_default_color_1 = "white" -_default_color_2 = "black" +_DEFAULT_COLOR_1 = "white" +_DEFAULT_COLOR_2 = "black" -_default_bevel_percent = "12" +_DEFAULT_BEVEL_PERCENT = "12" _halftone_values = { "checkeredfade": "h6x6a", @@ -39,8 +41,8 @@ class PbGradient(Pb): _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}, + '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}, @@ -57,14 +59,14 @@ class PbGradient(Pb): 'flatout', 'flatinner', 'evenlyframed', 'biginner', 'bigouter', 'dramaticflatout', 'dramaticflatinner', ]}, - 'percentbeveled': {'type':'int', 'default': _default_bevel_percent}, + '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, + 'type': 'enum', + 'enum_values': OUTPUT_IMAGE_TYPES, 'default': DEFAULT_FINALFORMAT }, 'gradienttype': {'type':'enum', 'enum_values':[ @@ -95,11 +97,16 @@ class PbGradient(Pb): "{}x{}".format(self.params.width, self.params.height) ]) - if self.params.rotate: cmd.extend(["-rotate", self.params.rotate]) - if self.params.tilt: cmd.extend(["-distort", "SRT", 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]) + if self.params.rotate: + cmd.extend(["-rotate", self.params.rotate]) + if self.params.tilt: + cmd.extend(["-distort", "SRT", 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]) _gradients = { "gradient" : ["gradient:{}-{}".format(self.params.color1, self.params.color2)], "canvas" : ["canvas:{}".format(self.params.color1)], @@ -113,18 +120,18 @@ class PbGradient(Pb): ], "mirrored" : [ "plasma:{}-{}".format(self.params.color1, self.params.color2), - "\(", "+clone", "-flop", "\)", - "append" + "\(", "+clone", "-flop", "\)", + "append" ], "plasmawash" : [ "plasma:{}-{}".format(self.params.color1, self.params.color2), - "-set","colorspace","HSB" + "-set", "colorspace", "HSB" ], "gradientwash" : [ "gradient:{}-{}".format(self.params.color1, self.params.color2), "-set", "colorspace", "HSB" ], - "noise" : ["xc:","+noise","Random","-virtual-pixel","tile"] + "noise" : ["xc:", "+noise", "Random", "-virtual-pixel", "tile"] } cmd += _gradients[str(self.params.gradienttype)] @@ -163,7 +170,7 @@ class PbGradient(Pb): return { "flatout": ["-s", bevpercentval, "-m", "outer"], "flatinner": ["-s", bevpercentval, "-m", "inner"], - "evenlyframed": ["-s ", bevpercentval, "-m", "split"], + "evenlyframed": ["-s ", bevpercentval, "-m", "split"], "biginner": ["-s", bevpercentval, "-m", "outer", "-c", "50", "-b", "red", "-a", "25"], "bigouter": ["-s", bevpercentval, "-m", "split", "-c", "50", "-b", "red", "-a", "25"], "dramaticflatout": ["-s", bevpercentval, "-m", "outer", "-a", "25", "-b", "blue"], -- cgit v1.2.3-70-g09d2