Flake8 cleanup

Author: iXce

printrun/calibrateextruder.py calibrateextruder.py

@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
 
-#Interactive RepRap e axis calibration program
-#(C) Nathan Zadoks 2011
+# Interactive RepRap e axis calibration program
+# (C) Nathan Zadoks 2011
 
 s = 300  # Extrusion speed (mm/min)
 n = 100  # Default length to extrude
@@ -95,7 +95,7 @@ def gettemp(p):
 if not os.path.exists(port):
     port = 0
 
-#Parse options
+# Parse options
 help = u"""
 %s [ -l DISTANCE ] [ -s STEPS ] [ -t TEMP ] [ -p PORT ]
         -l      --length        Length of filament to extrude for each calibration step (default: %d mm)
@@ -126,7 +126,7 @@ def gettemp(p):
     elif o in ('-p', '--port'):
         port = a
 
-#Show initial parameters
+# Show initial parameters
 print "Initial parameters"
 print "Steps per mm:    %3d steps" % k
 print "Length extruded: %3d mm" % n
@@ -135,7 +135,7 @@ def gettemp(p):
 
 p = None
 try:
-    #Connect to printer
+    # Connect to printer
     w("Connecting to printer..")
     try:
         p = printcore(port, 115200)
@@ -149,7 +149,7 @@ def gettemp(p):
 
     heatup(p, temp)
 
-    #Calibration loop
+    # Calibration loop
     while n != m:
         heatup(p, temp, True)
         p.send_now("G92 E0")  # Reset e axis

printrun/bmpDisplay.py

@@ -271,7 +271,7 @@ def _preprocess(self, lines = None, build_layers = False,
             cur_layer_has_extrusion = False
 
         for line in lines:
-            ## Parse line
+            # # Parse line
             split_raw = split(line)
             if line.command:
                 # Update properties
@@ -342,7 +342,7 @@ def _preprocess(self, lines = None, build_layers = False,
                 line.current_y = current_y
                 line.current_z = current_z
 
-                ## Process extrusion
+                # # Process extrusion
                 if line.e is not None:
                     if line.is_move:
                         if line.relative_e:
@@ -358,7 +358,7 @@ def _preprocess(self, lines = None, build_layers = False,
                     elif line.command == "G92":
                         offset_e = current_e - line.e
 
-                ## Create layers
+                # # Create layers
                 if not build_layers:
                     continue
                 # FIXME : looks like this needs to be tested with "lift Z on move"
@@ -413,7 +413,7 @@ def _preprocess(self, lines = None, build_layers = False,
                 line_idxs.append(layer_line)
                 layer_line += 1
                 prev_z = cur_z
-            ### Loop done
+            # ## Loop done
 
         # Store current status
         self.imperial = imperial
@@ -494,7 +494,7 @@ def estimate_duration(self):
         totalduration = 0.0
         acceleration = 2000.0  # mm/s^2
         layerbeginduration = 0.0
-        #TODO:
+        # TODO:
         # get device caps from firmware: max speed, acceleration/axis
         # (including extruder)
         # calculate the maximum move duration accounting for above ;)

printrun/gcoder.py

@@ -22,11 +22,9 @@
 from .gl.panel import wxGLPanel
 from .gl.trackball import build_rotmatrix
 from .gl.libtatlin import actors
-from .gl.libtatlin.actors import vec
 
 from pyglet.gl import glPushMatrix, glPopMatrix, \
     glTranslatef, glRotatef, glScalef, glMultMatrixd
-from pyglet.gl import *
 
 from .gviz import GvizBaseFrame
 

printrun/gcview.py

@@ -73,9 +73,9 @@ def disable_event(*pargs, **kwargs):
             pass  # the sauce, please
         self.Bind(wx.EVT_ERASE_BACKGROUND, disable_event)
 
-    ##
-    ## General methods
-    ##
+    #
+    # General methods
+    #
 
     def draw(self, dc, w, h):
         """
@@ -97,9 +97,9 @@ def getWidthHeight(self):
             height = 1
         return (width, height)
 
-    ##
-    ## Event handlers
-    ##
+    #
+    # Event handlers
+    #
 
     def onPaint(self, event):
         # Blit the front buffer to the screen

printrun/gui/bufferedcanvas.py

@@ -123,7 +123,7 @@ def add(name, widget, *args, **kwargs):
             container = self
         container.Add(widget, *args, **kwargs)
 
-    ## Hotend & bed temperatures
+    # Hotend & bed temperatures #
 
     # Hotend temp
     add("htemp_label", wx.StaticText(parentpanel, -1, _("Heat:")), flag = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT)
@@ -168,8 +168,8 @@ def add(name, widget, *args, **kwargs):
     root.btemp.SetValue(str(root.settings.last_bed_temperature))
     root.htemp.SetValue(str(root.settings.last_temperature))
 
-    ## added for an error where only the bed would get (pla) or (abs).
-    #This ensures, if last temp is a default pla or abs, it will be marked so.
+    # added for an error where only the bed would get (pla) or (abs).
+    # This ensures, if last temp is a default pla or abs, it will be marked so.
     # if it is not, then a (user) remark is added. This denotes a manual entry
 
     for i in btemp_choices:
@@ -184,7 +184,7 @@ def add(name, widget, *args, **kwargs):
     if '(' not in root.htemp.Value:
         root.htemp.SetValue(root.htemp.Value + ' (user)')
 
-    ## Speed control
+    # Speed control #
     speedpanel = root.newPanel(parentpanel)
     speedsizer = wx.BoxSizer(wx.HORIZONTAL)
     speedsizer.Add(wx.StaticText(speedpanel, -1, _("Print speed:")), flag = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT)
@@ -210,7 +210,7 @@ def speedslider_scroll(event):
         root.speed_label.SetLabel(_("%d%%") % value)
     root.speed_slider.Bind(wx.EVT_SCROLL, speedslider_scroll)
 
-    ## Temperature gauges
+    # Temperature gauges #
 
     if root.display_gauges:
         root.hottgauge = TempGauge(parentpanel, size = (-1, 24), title = _("Heater:"), maxval = 300, bgcolor = root.bgcolor)
@@ -234,7 +234,7 @@ def bedgauge_scroll_setpoint(e):
         root.hottgauge.Bind(wx.EVT_MOUSEWHEEL, hotendgauge_scroll_setpoint)
         root.bedtgauge.Bind(wx.EVT_MOUSEWHEEL, bedgauge_scroll_setpoint)
 
-    ## Temperature (M105) feedback display
+    # Temperature (M105) feedback display #
     root.tempdisp = wx.StaticText(parentpanel, -1, "", style = wx.ST_NO_AUTORESIZE)
 
     def on_tempdisp_size(evt):
@@ -248,14 +248,14 @@ def tempdisp_setlabel(label):
     root.tempdisp.SetLabel = tempdisp_setlabel
     add("tempdisp", root.tempdisp, flag = wx.EXPAND)
 
-    ## Temperature graph
+    # Temperature graph #
 
     if root.display_graph:
         root.graph = Graph(parentpanel, wx.ID_ANY, root)
         add("tempgraph", root.graph, flag = wx.EXPAND | wx.ALL, border = 5)
         root.graph.Bind(wx.EVT_LEFT_DOWN, root.graph.show_graph_window)
 
-    ## Extrusion controls
+    # Extrusion controls #
 
     # Extrusion settings
     esettingspanel = root.newPanel(parentpanel)

printrun/gui/controls.py

@@ -67,8 +67,8 @@ def __init__(self, parent, id, root, pos = wx.DefaultPosition,
         if self.rescaley:
             self._ybounds = Graph._YBounds(self)
 
-        #If rescaley is set then ybars gives merely an estimate
-        #Note that "bars" actually indicate the number of internal+external gridlines.
+        # If rescaley is set then ybars gives merely an estimate
+        # Note that "bars" actually indicate the number of internal+external gridlines.
         self.ybars = 5
         self.xbars = 7  # One bar per 10 second
         self.xsteps = 60  # Covering 1 minute in the graph
@@ -99,22 +99,22 @@ def updateTemperatures(self, event):
         self.Refresh()
 
     def drawgrid(self, dc, gc):
-        #cold, medium, hot = wx.Colour(0, 167, 223),\
-        #                    wx.Colour(239, 233, 119),\
-        #                    wx.Colour(210, 50.100)
-        #col1 = wx.Colour(255, 0, 0, 255)
-        #col2 = wx.Colour(255, 255, 255, 128)
+        # cold, medium, hot = wx.Colour(0, 167, 223),\
+        #                     wx.Colour(239, 233, 119),\
+        #                     wx.Colour(210, 50.100)
+        # col1 = wx.Colour(255, 0, 0, 255)
+        # col2 = wx.Colour(255, 255, 255, 128)
 
-        #b = gc.CreateLinearGradientBrush(0, 0, w, h, col1, col2)
+        # b = gc.CreateLinearGradientBrush(0, 0, w, h, col1, col2)
 
         gc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 1))
 
-        #gc.SetBrush(wx.Brush(wx.Colour(245, 245, 255, 52)))
+        # gc.SetBrush(wx.Brush(wx.Colour(245, 245, 255, 52)))
 
-        #gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(0, 0, 0, 255))))
+        # gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(0, 0, 0, 255))))
         gc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 255), 1))
 
-        #gc.DrawLines(wx.Point(0, 0), wx.Point(50, 10))
+        # gc.DrawLines(wx.Point(0, 0), wx.Point(50, 10))
 
         font = wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD)
         gc.SetFont(font, wx.Colour(23, 44, 44))
@@ -134,7 +134,7 @@ def drawgrid(self, dc, gc):
         firstbar = int(ceil(self.minyvalue / spacing))  # in degrees
         dc.SetPen(wx.Pen(wx.Colour(225, 225, 225), 1))
         for y in range(firstbar, firstbar + ybars + 1):
-            #y_pos = y*(float(self.height)/self.ybars)
+            # y_pos = y*(float(self.height)/self.ybars)
             degrees = y * spacing
             y_pos = self._y_pos(degrees)
             dc.DrawLine(0, y_pos, self.width, y_pos)
@@ -148,15 +148,15 @@ def drawgrid(self, dc, gc):
                         self.width / 2 - (font.GetPointSize() * 3),
                         self.height / 2 - (font.GetPointSize() * 1))
 
-        #dc.DrawCircle(50, 50, 1)
+        # dc.DrawCircle(50, 50, 1)
 
-        #gc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 1))
-        #gc.DrawLines([[20, 30], [10, 53]])
-        #dc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 1))
+        # gc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 1))
+        # gc.DrawLines([[20, 30], [10, 53]])
+        # dc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 1))
 
     def _y_pos(self, temperature):
         """Converts a temperature, in degrees, to a pixel position"""
-        #fraction of the screen from the bottom
+        # fraction of the screen from the bottom
         frac = (float(temperature - self.minyvalue)
                 / (self.maxyvalue - self.minyvalue))
         return int((1.0 - frac) * (self.height - 1))
@@ -168,7 +168,7 @@ def _calculate_spacing(self):
         log_yspan = log10(yspan / self.ybars)
         exponent = int(floor(log_yspan))
 
-        #calculate boundary points between allowed spacings
+        # calculate boundary points between allowed spacings
         log1_25 = log10(2) + log10(1) + log10(2.5) - log10(1 + 2.5)
         log25_5 = log10(2) + log10(2.5) + log10(5) - log10(2.5 + 5)
         log5_10 = log10(2) + log10(5) + log10(10) - log10(5 + 10)
@@ -205,7 +205,7 @@ def drawtemperature(self, dc, gc, temperature_list,
 
         if len(text) > 0:
             font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD)
-            #font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
+            # font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
             if self.timer.IsRunning() is False:
                 gc.SetFont(font, wx.Colour(128, 128, 128))
             else:
@@ -337,7 +337,7 @@ def __init__(self, graph, minimum_scale=5.0, buffer=0.10):
 
             # Frequency to rescale the graph
             self.update_freq = 10
-            #number of updates since last full refresh
+            # number of updates since last full refresh
             self._last_update = self.update_freq
 
         def update(self, forceUpdate=False):
@@ -418,7 +418,7 @@ def getBoundsQuick(self):
                 miny = min(miny, bed_min, bed_target)
                 maxy = max(maxy, bed_max, bed_target)
 
-            #We have to rescale, so add padding
+            # We have to rescale, so add padding
             bufratio = self.buffer / (1.0 - self.buffer)
             if miny < self.graph.minyvalue:
                 padding = (self.graph.maxyvalue - miny) * bufratio