flake8 cleanup on projectlayer

README.cleanup

@@ -28,7 +28,7 @@ Obviously this is not a perfect solution, it WILL break the code. Juste check th
 Flake8 checking:
 Flake8 can be used to check the coding style of the project.
 The current source code (as of July 23rd 2013) has been checked using the following command:
-    flake8 . --statistics --count --ignore=E251,E701,E302,E501 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,prontserve.py,./printrun/server,projectlayer.py,./printrun/cairosvg
+    flake8 . --statistics --count --ignore=E251,E701,E302,E501 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,./printrun/cairosvg
 This call ignores 4 kind of errors (E501: line being greater than 80 chars,
 E701: multiple statements on one line (usually this is if ...: ...), E302:
 wrong number of blank lines between functions, E251: unexpected spaces around

printrun/projectlayer.py

 # This file is part of the Printrun suite.
-# 
+#
 # Printrun is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # Printrun is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -28,11 +28,11 @@ import copy
 import re
 from collections import OrderedDict
 import itertools
-import math 
+import math
 
 class DisplayFrame(wx.Frame):
-    def __init__(self, parent, title, res=(1024, 768), printer=None, scale=1.0, offset=(0,0)):
-        wx.Frame.__init__(self, parent=parent, title=title, size=res)
+    def __init__(self, parent, title, res = (1024, 768), printer = None, scale = 1.0, offset = (0, 0)):
+        wx.Frame.__init__(self, parent = parent, title = title, size = res)
         self.printer = printer
         self.control_frame = parent
         self.pic = wx.StaticBitmap(self)
@@ -51,7 +51,7 @@ class DisplayFrame(wx.Frame):
         self.SetDoubleBuffered(True)
         self.SetPosition((self.control_frame.GetSize().x, 0))
         self.Show()
-        
+
         self.scale = scale
         self.index = 0
         self.size = res
@@ -71,8 +71,8 @@ class DisplayFrame(wx.Frame):
         except:
             raise
             pass
-        
-    def resize(self, res=(1024, 768)):
+
+    def resize(self, res = (1024, 768)):
         self.bitmap = wx.EmptyBitmap(*res)
         self.bbitmap = wx.EmptyBitmap(*res)
         dc = wx.MemoryDC()
@@ -80,7 +80,7 @@ class DisplayFrame(wx.Frame):
         dc.SetBackground(wx.Brush("black"))
         dc.Clear()
         dc.SelectObject(wx.NullBitmap)
-        
+
     def draw_layer(self, image):
         try:
             dc = wx.MemoryDC()
@@ -89,94 +89,94 @@ class DisplayFrame(wx.Frame):
             dc.Clear()
 
             if self.slicer == 'Slic3r' or self.slicer == 'Skeinforge':
-                
+
                 if self.scale != 1.0:
                     layercopy = copy.deepcopy(image)
-                    height = float(layercopy.get('height').replace('m',''))
-                    width = float(layercopy.get('width').replace('m',''))
-                    
-                    layercopy.set('height', str(height*self.scale) + 'mm')
-                    layercopy.set('width', str(width*self.scale) + 'mm')
-                    layercopy.set('viewBox', '0 0 ' + str(width*self.scale) + ' ' + str(height*self.scale))
+                    height = float(layercopy.get('height').replace('m', ''))
+                    width = float(layercopy.get('width').replace('m', ''))
+
+                    layercopy.set('height', str(height * self.scale) + 'mm')
+                    layercopy.set('width', str(width * self.scale) + 'mm')
+                    layercopy.set('viewBox', '0 0 ' + str(width * self.scale) + ' ' + str(height * self.scale))
 
                     g = layercopy.find("{http://www.w3.org/2000/svg}g")
-                    g.set('transform', 'scale('+str(self.scale)+')')
-                    stream = cStringIO.StringIO(PNGSurface.convert(dpi=self.dpi, bytestring=xml.etree.ElementTree.tostring(layercopy)))
+                    g.set('transform', 'scale(' + str(self.scale) + ')')
+                    stream = cStringIO.StringIO(PNGSurface.convert(dpi = self.dpi, bytestring = xml.etree.ElementTree.tostring(layercopy)))
                 else:
-                    stream = cStringIO.StringIO(PNGSurface.convert(dpi=self.dpi, bytestring=xml.etree.ElementTree.tostring(image)))
+                    stream = cStringIO.StringIO(PNGSurface.convert(dpi = self.dpi, bytestring = xml.etree.ElementTree.tostring(image)))
 
                 pngImage = wx.ImageFromStream(stream)
-                
-                #print "w:", pngImage.Width, ", dpi:",self.dpi, ", w (mm): ",(pngImage.Width / self.dpi) * 25.4
+
+                # print "w:", pngImage.Width, ", dpi:", self.dpi, ", w (mm): ",(pngImage.Width / self.dpi) * 25.4
 
                 if self.layer_red:
-                    pngImage = pngImage.AdjustChannels(1,0,0,1)
-                
+                    pngImage = pngImage.AdjustChannels(1, 0, 0, 1)
+
                 dc.DrawBitmap(wx.BitmapFromImage(pngImage), self.offset[0], self.offset[1], True)
 
             elif self.slicer == 'bitmap':
                 if isinstance(image, str):
                     image = wx.Image(image)
                 if self.layer_red:
-                    image = image.AdjustChannels(1,0,0,1)
+                    image = image.AdjustChannels(1, 0, 0, 1)
                 dc.DrawBitmap(wx.BitmapFromImage(image.Scale(image.Width * self.scale, image.Height * self.scale)), self.offset[0], -self.offset[1], True)
             else:
                 raise Exception(self.slicer + " is an unknown method.")
-            
+
             self.pic.SetBitmap(self.bitmap)
             self.pic.Show()
-            self.Refresh()            
-            
+            self.Refresh()
+
         except:
             raise
             pass
-            
+
     def show_img_delay(self, image):
-        print "Showing "+ str(time.clock())
+        print "Showing", str(time.clock())
         self.control_frame.set_current_layer(self.index)
         self.draw_layer(image)
         wx.FutureCall(1000 * self.interval, self.hide_pic_and_rise)
 
     def rise(self):
         if (self.direction == "Top Down"):
-            print "Lowering "+ str(time.clock())
+            print "Lowering", str(time.clock())
         else:
-            print "Rising "+ str(time.clock())
-                        
-        if self.printer != None and self.printer.online:
+            print "Rising", str(time.clock())
+
+        if self.printer is not None and self.printer.online:
             self.printer.send_now("G91")
-            
+
             if (self.prelift_gcode):
                 for line in self.prelift_gcode.split('\n'):
                     if line:
                         self.printer.send_now(line)
-            
+
             if (self.direction == "Top Down"):
-                self.printer.send_now("G1 Z-%f F%g" % (self.overshoot,self.z_axis_rate,))
-                self.printer.send_now("G1 Z%f F%g" % (self.overshoot-self.thickness,self.z_axis_rate,))
-            else: # self.direction == "Bottom Up"
-                self.printer.send_now("G1 Z%f F%g" % (self.overshoot,self.z_axis_rate,))
-                self.printer.send_now("G1 Z-%f F%g" % (self.overshoot-self.thickness,self.z_axis_rate,))
-            
+                self.printer.send_now("G1 Z-%f F%g" % (self.overshoot, self.z_axis_rate,))
+                self.printer.send_now("G1 Z%f F%g" % (self.overshoot - self.thickness, self.z_axis_rate,))
+            else:  # self.direction == "Bottom Up"
+                self.printer.send_now("G1 Z%f F%g" % (self.overshoot, self.z_axis_rate,))
+                self.printer.send_now("G1 Z-%f F%g" % (self.overshoot - self.thickness, self.z_axis_rate,))
+
             if (self.postlift_gcode):
                 for line in self.postlift_gcode.split('\n'):
                     if line:
                         self.printer.send_now(line)
-            
+
             self.printer.send_now("G90")
         else:
             time.sleep(self.pause)
-        
+
         wx.FutureCall(1000 * self.pause, self.next_img)
-        
+
     def hide_pic(self):
-        print "Hiding "+ str(time.clock())
+        print "Hiding", str(time.clock())
         self.pic.Hide()
-        
+
     def hide_pic_and_rise(self):
         wx.CallAfter(self.hide_pic)
         wx.FutureCall(500, self.rise)
-                    
+
     def next_img(self):
         if not self.running:
             return
@@ -188,21 +188,21 @@ class DisplayFrame(wx.Frame):
             print "end"
             wx.CallAfter(self.pic.Hide)
             wx.CallAfter(self.Refresh)
-        
-    def present(self, 
-                layers, 
-                interval=0.5, 
-                pause=0.2, 
-                overshoot=0.0, 
-                z_axis_rate=200, 
-                prelift_gcode="", 
-                postlift_gcode="", 
-                direction="Top Down", 
-                thickness=0.4, 
-                scale=1, 
-                size=(1024, 768), 
-                offset=(0, 0),
-                layer_red=False):
+
+    def present(self,
+                layers,
+                interval = 0.5,
+                pause = 0.2,
+                overshoot = 0.0,
+                z_axis_rate = 200,
+                prelift_gcode = "",
+                postlift_gcode = "",
+                direction = "Top Down",
+                thickness = 0.4,
+                scale = 1,
+                size = (1024, 768),
+                offset = (0, 0),
+                layer_red = False):
         wx.CallAfter(self.pic.Hide)
         wx.CallAfter(self.Refresh)
         self.layers = layers
@@ -215,247 +215,244 @@ class DisplayFrame(wx.Frame):
         self.z_axis_rate = z_axis_rate
         self.prelift_gcode = prelift_gcode
         self.postlift_gcode = postlift_gcode
-        self.direction = direction 
+        self.direction = direction
         self.layer_red = layer_red
         self.offset = offset
         self.index = 0
         self.running = True
-        
+
         self.next_img()
 
 class SettingsFrame(wx.Frame):
-    
+
     def _set_setting(self, name, value):
         if self.pronterface:
-            self.pronterface.set(name,value)
-    
-    def _get_setting(self,name, val):
+            self.pronterface.set(name, value)
+
+    def _get_setting(self, name, val):
         if self.pronterface:
             try:
                 return getattr(self.pronterface.settings, name)
-            except AttributeError, x:
+            except AttributeError:
                 return val
-        else: 
+        else:
             return val
-        
-    def __init__(self, parent, printer=None):
-        wx.Frame.__init__(self, parent, title="ProjectLayer Control",style=(wx.DEFAULT_FRAME_STYLE | wx.WS_EX_CONTEXTHELP))
+
+    def __init__(self, parent, printer = None):
+        wx.Frame.__init__(self, parent, title = "ProjectLayer Control", style = (wx.DEFAULT_FRAME_STYLE | wx.WS_EX_CONTEXTHELP))
         self.SetExtraStyle(wx.FRAME_EX_CONTEXTHELP)
         self.pronterface = parent
-        self.display_frame = DisplayFrame(self, title="ProjectLayer Display", printer=printer)
-        
+        self.display_frame = DisplayFrame(self, title = "ProjectLayer Display", printer = printer)
+
         self.panel = wx.Panel(self)
-                
-        vbox = wx.BoxSizer(wx.VERTICAL)       
-        buttonbox = wx.StaticBoxSizer(wx.StaticBox(self.panel, label="Controls"), wx.HORIZONTAL) 
-        
+
+        vbox = wx.BoxSizer(wx.VERTICAL)
+        buttonbox = wx.StaticBoxSizer(wx.StaticBox(self.panel, label = "Controls"), wx.HORIZONTAL)
+
         load_button = wx.Button(self.panel, -1, "Load")
         load_button.Bind(wx.EVT_BUTTON, self.load_file)
         load_button.SetHelpText("Choose an SVG file created from Slic3r or Skeinforge, or a zip file of bitmap images (with extension: .3dlp.zip).")
-        buttonbox.Add(load_button, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM, border=5)
-        
+        buttonbox.Add(load_button, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 5)
+
         present_button = wx.Button(self.panel, -1, "Present")
         present_button.Bind(wx.EVT_BUTTON, self.start_present)
         present_button.SetHelpText("Starts the presentation of the slices.")
-        buttonbox.Add(present_button, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM, border=5)
-        
+        buttonbox.Add(present_button, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 5)
+
         self.pause_button = wx.Button(self.panel, -1, "Pause")
         self.pause_button.Bind(wx.EVT_BUTTON, self.pause_present)
         self.pause_button.SetHelpText("Pauses the presentation. Can be resumed afterwards by clicking this button, or restarted by clicking present again.")
-        buttonbox.Add(self.pause_button, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM, border=5)
-                
+        buttonbox.Add(self.pause_button, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 5)
+
         stop_button = wx.Button(self.panel, -1, "Stop")
         stop_button.Bind(wx.EVT_BUTTON, self.stop_present)
         stop_button.SetHelpText("Stops presenting the slices.")
-        buttonbox.Add(stop_button, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM, border=5)
+        buttonbox.Add(stop_button, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 5)
 
         self.help_button = wx.ContextHelpButton(self.panel)
-        buttonbox.Add(self.help_button, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM, border=5)
-        
-        fieldboxsizer = wx.StaticBoxSizer(wx.StaticBox(self.panel, label="Settings"), wx.VERTICAL)
-        fieldsizer = wx.GridBagSizer(10,10)
-        
+        buttonbox.Add(self.help_button, flag = wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 5)
+
+        fieldboxsizer = wx.StaticBoxSizer(wx.StaticBox(self.panel, label = "Settings"), wx.VERTICAL)
+        fieldsizer = wx.GridBagSizer(10, 10)
+
         # Left Column
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Layer (mm):"), pos=(0, 0), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_layer", "0.1")), size=(80, -1))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Layer (mm):"), pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.thickness = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_layer", "0.1")), size = (80, -1))
         self.thickness.Bind(wx.EVT_TEXT, self.update_thickness)
-        self.thickness.SetHelpText("The thickness of each slice. Should match the value used to slice the model.  SVG files update this value automatically, 3dlp.zip files have to be manually entered.")        
-        fieldsizer.Add(self.thickness, pos=(0, 1))
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Exposure (s):"), pos=(1, 0), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_interval", "0.5")), size=(80,-1))
+        self.thickness.SetHelpText("The thickness of each slice. Should match the value used to slice the model.  SVG files update this value automatically, 3dlp.zip files have to be manually entered.")
+        fieldsizer.Add(self.thickness, pos = (0, 1))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Exposure (s):"), pos = (1, 0), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.interval = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_interval", "0.5")), size = (80, -1))
         self.interval.Bind(wx.EVT_TEXT, self.update_interval)
         self.interval.SetHelpText("How long each slice should be displayed.")
-        fieldsizer.Add(self.interval, pos=(1, 1))
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Blank (s):"), pos=(2,0), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_pause", "0.5")), size=(80,-1))
+        fieldsizer.Add(self.interval, pos = (1, 1))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Blank (s):"), pos = (2, 0), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.pause = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_pause", "0.5")), size = (80, -1))
         self.pause.Bind(wx.EVT_TEXT, self.update_pause)
         self.pause.SetHelpText("The pause length between slices. This should take into account any movement of the Z axis, plus time to prepare the resin surface (sliding, tilting, sweeping, etc).")
-        fieldsizer.Add(self.pause, pos=(2, 1))
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Scale:"), pos=(3,0), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.scale = floatspin.FloatSpin(self.panel, -1, value=self._get_setting('project_scale', 1.0), increment=0.1, digits=3, size=(80,-1))
+        fieldsizer.Add(self.pause, pos = (2, 1))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Scale:"), pos = (3, 0), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.scale = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_scale', 1.0), increment = 0.1, digits = 3, size = (80, -1))
         self.scale.Bind(floatspin.EVT_FLOATSPIN, self.update_scale)
         self.scale.SetHelpText("The additional scaling of each slice.")
-        fieldsizer.Add(self.scale, pos=(3, 1))
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Direction:"), pos=(4,0), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.direction = wx.ComboBox(self.panel, -1, choices=["Top Down","Bottom Up"], value=self._get_setting('project_direction', "Top Down"), size=(80,-1))
+        fieldsizer.Add(self.scale, pos = (3, 1))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Direction:"), pos = (4, 0), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.direction = wx.ComboBox(self.panel, -1, choices = ["Top Down", "Bottom Up"], value = self._get_setting('project_direction', "Top Down"), size = (80, -1))
         self.direction.Bind(wx.EVT_COMBOBOX, self.update_direction)
         self.direction.SetHelpText("The direction the Z axis should move. Top Down is where the projector is above the model, Bottom up is where the projector is below the model.")
-        fieldsizer.Add(self.direction, pos=(4, 1), flag=wx.ALIGN_CENTER_VERTICAL)
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Overshoot (mm):"), pos=(5,0), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.overshoot= floatspin.FloatSpin(self.panel, -1, value=self._get_setting('project_overshoot', 3.0), increment=0.1, digits=1, min_val=0, size=(80,-1))
+        fieldsizer.Add(self.direction, pos = (4, 1), flag = wx.ALIGN_CENTER_VERTICAL)
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Overshoot (mm):"), pos = (5, 0), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.overshoot = floatspin.FloatSpin(self.panel, -1, value = self._get_setting('project_overshoot', 3.0), increment = 0.1, digits = 1, min_val = 0, size = (80, -1))
         self.overshoot.Bind(floatspin.EVT_FLOATSPIN, self.update_overshoot)
         self.overshoot.SetHelpText("How far the axis should move beyond the next slice position for each slice. For Top Down printers this would dunk the model under the resi and then return. For Bottom Up printers this would raise the base away from the vat and then return.")
-        fieldsizer.Add(self.overshoot, pos=(5, 1))
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Pre-lift Gcode:"), pos=(6, 0), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.prelift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_prelift_gcode", "").replace("\\n",'\n')), size=(-1, 35), style=wx.TE_MULTILINE)
+        fieldsizer.Add(self.overshoot, pos = (5, 1))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Pre-lift Gcode:"), pos = (6, 0), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.prelift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_prelift_gcode", "").replace("\\n", '\n')), size = (-1, 35), style = wx.TE_MULTILINE)
         self.prelift_gcode.SetHelpText("Additional gcode to run before raising the Z axis. Be sure to take into account any additional time needed in the pause value, and be careful what gcode is added!")
         self.prelift_gcode.Bind(wx.EVT_TEXT, self.update_prelift_gcode)
-        fieldsizer.Add(self.prelift_gcode, pos=(6, 1), span=(2,1))
+        fieldsizer.Add(self.prelift_gcode, pos = (6, 1), span = (2, 1))
 
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Post-lift Gcode:"), pos=(6, 2), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.postlift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_postlift_gcode", "").replace("\\n",'\n')), size=(-1, 35), style=wx.TE_MULTILINE)
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Post-lift Gcode:"), pos = (6, 2), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.postlift_gcode = wx.TextCtrl(self.panel, -1, str(self._get_setting("project_postlift_gcode", "").replace("\\n", '\n')), size = (-1, 35), style = wx.TE_MULTILINE)
         self.postlift_gcode.SetHelpText("Additional gcode to run after raising the Z axis. Be sure to take into account any additional time needed in the pause value, and be careful what gcode is added!")
         self.postlift_gcode.Bind(wx.EVT_TEXT, self.update_postlift_gcode)
-        fieldsizer.Add(self.postlift_gcode, pos=(6, 3), span=(2,1))
+        fieldsizer.Add(self.postlift_gcode, pos = (6, 3), span = (2, 1))
 
         # Right Column
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "X (px):"), pos=(0, 2), flag=wx.ALIGN_CENTER_VERTICAL)
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "X (px):"), pos = (0, 2), flag = wx.ALIGN_CENTER_VERTICAL)
         projectX = int(math.floor(float(self._get_setting("project_x", 1920))))
-        self.X = wx.SpinCtrl(self.panel, -1, str(projectX), max=999999, size=(80,-1))
+        self.X = wx.SpinCtrl(self.panel, -1, str(projectX), max = 999999, size = (80, -1))
         self.X.Bind(wx.EVT_SPINCTRL, self.update_resolution)
         self.X.SetHelpText("The projector resolution in the X axis.")
-        fieldsizer.Add(self.X, pos=(0, 3))
+        fieldsizer.Add(self.X, pos = (0, 3))
 
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Y (px):"), pos=(1, 2), flag=wx.ALIGN_CENTER_VERTICAL)
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Y (px):"), pos = (1, 2), flag = wx.ALIGN_CENTER_VERTICAL)
         projectY = int(math.floor(float(self._get_setting("project_y", 1200))))
-        self.Y = wx.SpinCtrl(self.panel, -1, str(projectY), max=999999, size=(80,-1))
+        self.Y = wx.SpinCtrl(self.panel, -1, str(projectY), max = 999999, size = (80, -1))
         self.Y.Bind(wx.EVT_SPINCTRL, self.update_resolution)
         self.Y.SetHelpText("The projector resolution in the Y axis.")
-        fieldsizer.Add(self.Y, pos=(1, 3))
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetX (mm):"), pos=(2, 2), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.offset_X = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("project_offset_x", 0.0), increment=1, digits=1, size=(80,-1))
+        fieldsizer.Add(self.Y, pos = (1, 3))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetX (mm):"), pos = (2, 2), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.offset_X = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_x", 0.0), increment = 1, digits = 1, size = (80, -1))
         self.offset_X.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
         self.offset_X.SetHelpText("How far the slice should be offset from the edge in the X axis.")
-        fieldsizer.Add(self.offset_X, pos=(2, 3))
+        fieldsizer.Add(self.offset_X, pos = (2, 3))
 
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetY (mm):"), pos=(3, 2), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.offset_Y = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("project_offset_y", 0.0), increment=1, digits=1, size=(80,-1))
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "OffsetY (mm):"), pos = (3, 2), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.offset_Y = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_offset_y", 0.0), increment = 1, digits = 1, size = (80, -1))
         self.offset_Y.Bind(floatspin.EVT_FLOATSPIN, self.update_offset)
         self.offset_Y.SetHelpText("How far the slice should be offset from the edge in the Y axis.")
-        fieldsizer.Add(self.offset_Y, pos=(3, 3))
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "ProjectedX (mm):"), pos=(4, 2), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value=self._get_setting("project_projected_x", 505.0), increment=1, digits=1, size=(80,-1))
+        fieldsizer.Add(self.offset_Y, pos = (3, 3))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "ProjectedX (mm):"), pos = (4, 2), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.projected_X_mm = floatspin.FloatSpin(self.panel, -1, value = self._get_setting("project_projected_x", 505.0), increment = 1, digits = 1, size = (80, -1))
         self.projected_X_mm.Bind(floatspin.EVT_FLOATSPIN, self.update_projected_Xmm)
         self.projected_X_mm.SetHelpText("The actual width of the entire projected image. Use the Calibrate grid to show the full size of the projected image, and measure the width at the same level where the slice will be projected onto the resin.")
-        fieldsizer.Add(self.projected_X_mm, pos=(4, 3))
-        
-        
-        fieldsizer.Add(wx.StaticText(self.panel, -1, "Z Axis Speed (mm/min):"), pos=(5, 2), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("project_z_axis_rate", 200)), max=9999, size=(80,-1))
+        fieldsizer.Add(self.projected_X_mm, pos = (4, 3))
+
+        fieldsizer.Add(wx.StaticText(self.panel, -1, "Z Axis Speed (mm/min):"), pos = (5, 2), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.z_axis_rate = wx.SpinCtrl(self.panel, -1, str(self._get_setting("project_z_axis_rate", 200)), max = 9999, size = (80, -1))
         self.z_axis_rate.Bind(wx.EVT_SPINCTRL, self.update_z_axis_rate)
         self.z_axis_rate.SetHelpText("Speed of the Z axis in mm/minute. Take into account that slower rates may require a longer pause value.")
-        fieldsizer.Add(self.z_axis_rate, pos=(5, 3))
-        
+        fieldsizer.Add(self.z_axis_rate, pos = (5, 3))
+
         fieldboxsizer.Add(fieldsizer)
-        
+
         # Display
-        
-        displayboxsizer = wx.StaticBoxSizer(wx.StaticBox(self.panel, label="Display"), wx.VERTICAL)
-        displaysizer = wx.GridBagSizer(10,10)
-        
-        displaysizer.Add(wx.StaticText(self.panel, -1, "Fullscreen:"), pos=(0,0), flag=wx.ALIGN_CENTER_VERTICAL)
+
+        displayboxsizer = wx.StaticBoxSizer(wx.StaticBox(self.panel, label = "Display"), wx.VERTICAL)
+        displaysizer = wx.GridBagSizer(10, 10)
+
+        displaysizer.Add(wx.StaticText(self.panel, -1, "Fullscreen:"), pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
         self.fullscreen = wx.CheckBox(self.panel, -1)
         self.fullscreen.Bind(wx.EVT_CHECKBOX, self.update_fullscreen)
         self.fullscreen.SetHelpText("Toggles the project screen to full size.")
-        displaysizer.Add(self.fullscreen, pos=(0, 1), flag=wx.ALIGN_CENTER_VERTICAL)
-               
-        displaysizer.Add(wx.StaticText(self.panel, -1, "Calibrate:"), pos=(0,2), flag=wx.ALIGN_CENTER_VERTICAL)
+        displaysizer.Add(self.fullscreen, pos = (0, 1), flag = wx.ALIGN_CENTER_VERTICAL)
+
+        displaysizer.Add(wx.StaticText(self.panel, -1, "Calibrate:"), pos = (0, 2), flag = wx.ALIGN_CENTER_VERTICAL)
         self.calibrate = wx.CheckBox(self.panel, -1)
         self.calibrate.Bind(wx.EVT_CHECKBOX, self.show_calibrate)
         self.calibrate.SetHelpText("Toggles the calibration grid. Each grid should be 10mmx10mm in size. Use the grid to ensure the projected size is correct. See also the help for the ProjectedX field.")
-        displaysizer.Add(self.calibrate, pos=(0,3), flag=wx.ALIGN_CENTER_VERTICAL)
-        
-        displaysizer.Add(wx.StaticText(self.panel, -1, "1st Layer:"), pos=(0,4), flag=wx.ALIGN_CENTER_VERTICAL)
-        
-        first_layer_boxer = wx.BoxSizer(wx.HORIZONTAL)                
+        displaysizer.Add(self.calibrate, pos = (0, 3), flag = wx.ALIGN_CENTER_VERTICAL)
+
+        displaysizer.Add(wx.StaticText(self.panel, -1, "1st Layer:"), pos = (0, 4), flag = wx.ALIGN_CENTER_VERTICAL)
+
+        first_layer_boxer = wx.BoxSizer(wx.HORIZONTAL)
         self.first_layer = wx.CheckBox(self.panel, -1)
         self.first_layer.Bind(wx.EVT_CHECKBOX, self.show_first_layer)
         self.first_layer.SetHelpText("Displays the first layer of the model. Use this to project the first layer for longer so it holds to the base. Note: this value does not affect the first layer when the \"Present\" run is started, it should be used manually.")
 
-        first_layer_boxer.Add(self.first_layer, flag=wx.ALIGN_CENTER_VERTICAL)
+        first_layer_boxer.Add(self.first_layer, flag = wx.ALIGN_CENTER_VERTICAL)
 
-        first_layer_boxer.Add(wx.StaticText(self.panel, -1, " (s):"), flag=wx.ALIGN_CENTER_VERTICAL)
-        self.show_first_layer_timer = floatspin.FloatSpin(self.panel, -1, value=-1, increment=1, digits=1, size=(55,-1))
+        first_layer_boxer.Add(wx.StaticText(self.panel, -1, " (s):"), flag = wx.ALIGN_CENTER_VERTICAL)
+        self.show_first_layer_timer = floatspin.FloatSpin(self.panel, -1, value=-1, increment = 1, digits = 1, size = (55, -1))
         self.show_first_layer_timer.SetHelpText("How long to display the first layer for. -1 = unlimited.")
-        first_layer_boxer.Add(self.show_first_layer_timer, flag=wx.ALIGN_CENTER_VERTICAL)
-        displaysizer.Add(first_layer_boxer, pos=(0,6), flag=wx.ALIGN_CENTER_VERTICAL)
-        
-        displaysizer.Add(wx.StaticText(self.panel, -1, "Red:"), pos=(0,7), flag=wx.ALIGN_CENTER_VERTICAL)
+        first_layer_boxer.Add(self.show_first_layer_timer, flag = wx.ALIGN_CENTER_VERTICAL)
+        displaysizer.Add(first_layer_boxer, pos = (0, 6), flag = wx.ALIGN_CENTER_VERTICAL)
+
+        displaysizer.Add(wx.StaticText(self.panel, -1, "Red:"), pos = (0, 7), flag = wx.ALIGN_CENTER_VERTICAL)
         self.layer_red = wx.CheckBox(self.panel, -1)
         self.layer_red.Bind(wx.EVT_CHECKBOX, self.show_layer_red)
         self.layer_red.SetHelpText("Toggles whether the image should be red. Useful for positioning whilst resin is in the printer as it should not cause a reaction.")
-        displaysizer.Add(self.layer_red, pos=(0,8), flag=wx.ALIGN_CENTER_VERTICAL)
-        
-        
+        displaysizer.Add(self.layer_red, pos = (0, 8), flag = wx.ALIGN_CENTER_VERTICAL)
+
         displayboxsizer.Add(displaysizer)
-                
+
         # Info
-        infosizer = wx.StaticBoxSizer(wx.StaticBox(self.panel, label="Info"), wx.VERTICAL)
-                
-        infofieldsizer = wx.GridBagSizer(10,10)
-        
+        infosizer = wx.StaticBoxSizer(wx.StaticBox(self.panel, label = "Info"), wx.VERTICAL)
+
+        infofieldsizer = wx.GridBagSizer(10, 10)
+
         filelabel = wx.StaticText(self.panel, -1, "File:")
         filelabel.SetHelpText("The name of the model currently loaded.")
-        infofieldsizer.Add(filelabel, pos=(0,0))
-        self.filename = wx.StaticText(self.panel, -1, "")        
+        infofieldsizer.Add(filelabel, pos = (0, 0))
+        self.filename = wx.StaticText(self.panel, -1, "")
+
+        infofieldsizer.Add(self.filename, pos = (0, 1))
 
-        infofieldsizer.Add(self.filename, pos=(0,1))
-        
         totallayerslabel = wx.StaticText(self.panel, -1, "Total Layers:")
         totallayerslabel.SetHelpText("The total number of layers found in the model.")
-        infofieldsizer.Add(totallayerslabel, pos=(1,0))
+        infofieldsizer.Add(totallayerslabel, pos = (1, 0))
         self.total_layers = wx.StaticText(self.panel, -1)
-        
-        infofieldsizer.Add(self.total_layers, pos=(1,1))
+
+        infofieldsizer.Add(self.total_layers, pos = (1, 1))
 
         currentlayerlabel = wx.StaticText(self.panel, -1, "Current Layer:")
         currentlayerlabel.SetHelpText("The current layer being displayed.")
-        infofieldsizer.Add(currentlayerlabel, pos=(2,0))
+        infofieldsizer.Add(currentlayerlabel, pos = (2, 0))
         self.current_layer = wx.StaticText(self.panel, -1, "0")
-        infofieldsizer.Add(self.current_layer, pos=(2,1))
-        
+        infofieldsizer.Add(self.current_layer, pos = (2, 1))
+
         estimatedtimelabel = wx.StaticText(self.panel, -1, "Estimated Time:")
         estimatedtimelabel.SetHelpText("An estimate of the remaining time until print completion.")
-        infofieldsizer.Add(estimatedtimelabel, pos=(3,0))
+        infofieldsizer.Add(estimatedtimelabel, pos = (3, 0))
         self.estimated_time = wx.StaticText(self.panel, -1, "")
-        infofieldsizer.Add(self.estimated_time, pos=(3,1))
-        
+        infofieldsizer.Add(self.estimated_time, pos = (3, 1))
+
         infosizer.Add(infofieldsizer)
-        
+
         #
-        
-        vbox.Add(buttonbox, flag=wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP|wx.BOTTOM, border=10)
-        vbox.Add(fieldboxsizer, flag=wx.EXPAND|wx.LEFT|wx.RIGHT|wx.BOTTOM, border=10);
-        vbox.Add(displayboxsizer, flag=wx.EXPAND|wx.LEFT|wx.RIGHT|wx.BOTTOM, border=10);
-        vbox.Add(infosizer, flag=wx.EXPAND|wx.LEFT|wx.RIGHT|wx.BOTTOM, border=10)
-        
+
+        vbox.Add(buttonbox, flag = wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP | wx.BOTTOM, border = 10)
+        vbox.Add(fieldboxsizer, flag = wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 10)
+        vbox.Add(displayboxsizer, flag = wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 10)
+        vbox.Add(infosizer, flag = wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM, border = 10)
+
         self.panel.SetSizer(vbox)
-        self.panel.Fit() 
-        self.Fit() 
-        self.SetPosition((0, 0)) 
+        self.panel.Fit()
+        self.Fit()
+        self.SetPosition((0, 0))
         self.Show()
 
-
     def __del__(self):
         if hasattr(self, 'image_dir') and self.image_dir != '':
             shutil.rmtree(self.image_dir)
@@ -470,110 +467,110 @@ class SettingsFrame(wx.Frame):
         self.current_layer.SetLabel(str(index))
         self.set_estimated_time()
 
-    def display_filename(self,name):
+    def display_filename(self, name):
         self.filename.SetLabel(name)
-            
+
     def set_estimated_time(self):
         if not hasattr(self, 'layers'):
             return
-        
+
         current_layer = int(self.current_layer.GetLabel())
         remaining_layers = len(self.layers[0]) - current_layer
         # 0.5 for delay between hide and rise
-        estimated_time =  remaining_layers * (float(self.interval.GetValue()) + float(self.pause.GetValue()) + 0.5)  
-        self.estimated_time.SetLabel(time.strftime("%H:%M:%S",time.gmtime(estimated_time)))
-            
+        estimated_time = remaining_layers * (float(self.interval.GetValue()) + float(self.pause.GetValue()) + 0.5)
+        self.estimated_time.SetLabel(time.strftime("%H:%M:%S", time.gmtime(estimated_time)))
+
     def parse_svg(self, name):
-        et = xml.etree.ElementTree.ElementTree(file=name)
-        #xml.etree.ElementTree.dump(et)
-        
-        slicer = 'Slic3r' if et.getroot().find('{http://www.w3.org/2000/svg}metadata') == None else 'Skeinforge'
+        et = xml.etree.ElementTree.ElementTree(file = name)
+        # xml.etree.ElementTree.dump(et)
+
+        slicer = 'Slic3r' if et.getroot().find('{http://www.w3.org/2000/svg}metadata') is None else 'Skeinforge'
         zlast = 0
         zdiff = 0
         ol = []
         if (slicer == 'Slic3r'):
-            height = et.getroot().get('height').replace('m','')
-            width = et.getroot().get('width').replace('m','')
-            
+            height = et.getroot().get('height').replace('m', '')
+            width = et.getroot().get('width').replace('m', '')
+
             for i in et.findall("{http://www.w3.org/2000/svg}g"):
                 z = float(i.get('{http://slic3r.org/namespaces/slic3r}z'))
                 zdiff = z - zlast
                 zlast = z
-    
+
                 svgSnippet = xml.etree.ElementTree.Element('{http://www.w3.org/2000/svg}svg')
                 svgSnippet.set('height', height + 'mm')
                 svgSnippet.set('width', width + 'mm')
 
                 svgSnippet.set('viewBox', '0 0 ' + width + ' ' + height)
-                svgSnippet.set('style','background-color:black;fill:white;')
+                svgSnippet.set('style', 'background-color:black;fill:white;')
                 svgSnippet.append(i)
-    
+
                 ol += [svgSnippet]
-        else :
-            
+        else:
+
             slice_layers = et.findall("{http://www.w3.org/2000/svg}metadata")[0].findall("{http://www.reprap.org/slice}layers")[0]
             minX = slice_layers.get('minX')
             maxX = slice_layers.get('maxX')
             minY = slice_layers.get('minY')
             maxY = slice_layers.get('maxY')
-            
+
             height = str(abs(float(minY)) + abs(float(maxY)))
             width = str(abs(float(minX)) + abs(float(maxX)))
-            
+
             for g in et.findall("{http://www.w3.org/2000/svg}g")[0].findall("{http://www.w3.org/2000/svg}g"):
-                
-                g.set('transform','')
-                
+
+                g.set('transform', '')
+
                 text_element = g.findall("{http://www.w3.org/2000/svg}text")[0]
                 g.remove(text_element)
-                
+
                 path_elements = g.findall("{http://www.w3.org/2000/svg}path")
                 for p in path_elements:
-                    p.set('transform', 'translate('+maxX+','+maxY+')')
+                    p.set('transform', 'translate(' + maxX + ',' + maxY + ')')
                     p.set('fill', 'white')
 
                 z = float(g.get('id').split("z:")[-1])
                 zdiff = z - zlast
                 zlast = z
-    
+
                 svgSnippet = xml.etree.ElementTree.Element('{http://www.w3.org/2000/svg}svg')
                 svgSnippet.set('height', height + 'mm')
                 svgSnippet.set('width', width + 'mm')
 
                 svgSnippet.set('viewBox', '0 0 ' + width + ' ' + height)
-                svgSnippet.set('style','background-color:black;fill:white;')
+                svgSnippet.set('style', 'background-color:black;fill:white;')
                 svgSnippet.append(g)
-    
+
                 ol += [svgSnippet]
         return ol, zdiff, slicer
-    
+
     def parse_3DLP_zip(self, name):
         if not zipfile.is_zipfile(name):
             raise Exception(name + " is not a zip file!")
-        accepted_image_types = ['gif','tiff','jpg','jpeg','bmp','png']
+        accepted_image_types = ['gif', 'tiff', 'jpg', 'jpeg', 'bmp', 'png']
         zipFile = zipfile.ZipFile(name, 'r')
         self.image_dir = tempfile.mkdtemp()
         zipFile.extractall(self.image_dir)
         ol = []
-        
+
         # Note: the following funky code extracts any numbers from the filenames, matches
-        # them with the original then sorts them. It allows for filenames of the 
-        # format: abc_1.png, which would be followed by abc_10.png alphabetically.  
+        # them with the original then sorts them. It allows for filenames of the
+        # format: abc_1.png, which would be followed by abc_10.png alphabetically.
         os.chdir(self.image_dir)
         vals = filter(os.path.isfile, os.listdir('.'))
-        keys = map(lambda p:int(re.search('\d+', p).group()), vals)
+        keys = map(lambda p: int(re.search('\d+', p).group()), vals)
         imagefilesDict = dict(itertools.izip(keys, vals))
-        imagefilesOrderedDict = OrderedDict(sorted(imagefilesDict.items(), key=lambda t: t[0]))
-        
+        imagefilesOrderedDict = OrderedDict(sorted(imagefilesDict.items(), key = lambda t: t[0]))
+
         for f in imagefilesOrderedDict.values():
             path = os.path.join(self.image_dir, f)
             if os.path.isfile(path) and imghdr.what(path) in accepted_image_types:
                 ol.append(path)
-        
+
         return ol, -1, "bitmap"
-        
+
     def load_file(self, event):
-        dlg = wx.FileDialog(self, ("Open file to print"), style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
+        dlg = wx.FileDialog(self, ("Open file to print"), style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
         dlg.SetWildcard(("Slic3r or Skeinforge svg files (;*.svg;*.SVG;);3DLP Zip (;*.3dlp.zip;)"))
         if dlg.ShowModal() == wx.ID_OK:
             name = dlg.GetPath()
@@ -592,8 +589,8 @@ class SettingsFrame(wx.Frame):
             self.layers = layers
             self.set_total_layers(len(layers[0]))
             self.set_current_layer(0)
-            self.current_filename = os.path.basename(name) 
-            self.display_filename(self.current_filename) 
+            self.current_filename = os.path.basename(name)
+            self.display_filename(self.current_filename)
             self.slicer = layers[2]
             self.display_frame.slicer = self.slicer
         dlg.Destroy()
@@ -603,7 +600,7 @@ class SettingsFrame(wx.Frame):
             self.present_calibrate(event)
         else:
             if hasattr(self, 'layers'):
-                self.display_frame.slicer = self.layers[2] 
+                self.display_frame.slicer = self.layers[2]
             self.display_frame.scale = float(self.scale.GetValue())
             self.display_frame.clear_layer()
 
@@ -612,13 +609,13 @@ class SettingsFrame(wx.Frame):
             self.present_first_layer(event)
         else:
             if hasattr(self, 'layers'):
-                self.display_frame.slicer = self.layers[2] 
+                self.display_frame.slicer = self.layers[2]
             self.display_frame.scale = float(self.scale.GetValue())
             self.display_frame.clear_layer()
-    
+
     def show_layer_red(self, event):
         self.display_frame.layer_red = self.layer_red.IsChecked()
-        
+
     def present_calibrate(self, event):
         if self.calibrate.IsChecked():
             self.display_frame.Raise()
@@ -626,35 +623,35 @@ class SettingsFrame(wx.Frame):
             self.display_frame.scale = 1.0
             resolution_x_pixels = int(self.X.GetValue())
             resolution_y_pixels = int(self.Y.GetValue())
-            
+
             gridBitmap = wx.EmptyBitmap(resolution_x_pixels, resolution_y_pixels)
             dc = wx.MemoryDC()
             dc.SelectObject(gridBitmap)
             dc.SetBackground(wx.Brush("black"))
             dc.Clear()
-            
+
             dc.SetPen(wx.Pen("red", 7))
-            dc.DrawLine(0, 0, resolution_x_pixels, 0);
-            dc.DrawLine(0, 0, 0, resolution_y_pixels);
-            dc.DrawLine(resolution_x_pixels, 0, resolution_x_pixels, resolution_y_pixels);
-            dc.DrawLine(0, resolution_y_pixels, resolution_x_pixels, resolution_y_pixels);
-            
+            dc.DrawLine(0, 0, resolution_x_pixels, 0)
+            dc.DrawLine(0, 0, 0, resolution_y_pixels)
+            dc.DrawLine(resolution_x_pixels, 0, resolution_x_pixels, resolution_y_pixels)
+            dc.DrawLine(0, resolution_y_pixels, resolution_x_pixels, resolution_y_pixels)
+
             dc.SetPen(wx.Pen("red", 2))
             aspectRatio = float(resolution_x_pixels) / float(resolution_y_pixels)
-            
-            projectedXmm = float(self.projected_X_mm.GetValue())            
+
+            projectedXmm = float(self.projected_X_mm.GetValue())
             projectedYmm = round(projectedXmm / aspectRatio)
-            
+
             pixelsXPerMM = resolution_x_pixels / projectedXmm
             pixelsYPerMM = resolution_y_pixels / projectedYmm
-            
+
             gridCountX = int(projectedXmm / 10)
             gridCountY = int(projectedYmm / 10)
-            
+
             for y in xrange(0, gridCountY + 1):
                 for x in xrange(0, gridCountX + 1):
-                    dc.DrawLine(0, y * (pixelsYPerMM * 10), resolution_x_pixels, y * (pixelsYPerMM * 10));
-                    dc.DrawLine(x * (pixelsXPerMM * 10), 0, x * (pixelsXPerMM * 10), resolution_y_pixels);
+                    dc.DrawLine(0, y * (pixelsYPerMM * 10), resolution_x_pixels, y * (pixelsYPerMM * 10))
+                    dc.DrawLine(x * (pixelsXPerMM * 10), 0, x * (pixelsXPerMM * 10), resolution_y_pixels)
 
             self.first_layer.SetValue(False)
             self.display_frame.slicer = 'bitmap'
@@ -673,107 +670,107 @@ class SettingsFrame(wx.Frame):
             self.display_frame.dpi = self.get_dpi()
             self.display_frame.draw_layer(copy.deepcopy(self.layers[0][0]))
             self.calibrate.SetValue(False)
-            if self.show_first_layer_timer != -1.0 :
+            if self.show_first_layer_timer != -1.0:
                 def unpresent_first_layer():
                     self.display_frame.clear_layer()
                     self.first_layer.SetValue(False)
                 wx.CallLater(self.show_first_layer_timer.GetValue() * 1000, unpresent_first_layer)
 
     def update_offset(self, event):
-        
+
         offset_x = float(self.offset_X.GetValue())
         offset_y = float(self.offset_Y.GetValue())
         self.display_frame.offset = (offset_x, offset_y)
-        
-        self._set_setting('project_offset_x',offset_x)
-        self._set_setting('project_offset_y',offset_y)
-        
+
+        self._set_setting('project_offset_x', offset_x)
+        self._set_setting('project_offset_y', offset_y)
+
         self.refresh_display(event)
-        
+
     def refresh_display(self, event):
         self.present_calibrate(event)
         self.present_first_layer(event)
-    
+
     def update_thickness(self, event):
-        self._set_setting('project_layer',self.thickness.GetValue())
+        self._set_setting('project_layer', self.thickness.GetValue())
         self.refresh_display(event)
-        
+
     def update_projected_Xmm(self, event):
-        self._set_setting('project_projected_x',self.projected_X_mm.GetValue())
+        self._set_setting('project_projected_x', self.projected_X_mm.GetValue())
         self.refresh_display(event)
-        
+
     def update_scale(self, event):
         scale = float(self.scale.GetValue())
         self.display_frame.scale = scale
-        self._set_setting('project_scale',scale)
+        self._set_setting('project_scale', scale)
         self.refresh_display(event)
-        
+
     def update_interval(self, event):
         interval = float(self.interval.GetValue())
         self.display_frame.interval = interval
-        self._set_setting('project_interval',interval)
+        self._set_setting('project_interval', interval)
         self.set_estimated_time()
         self.refresh_display(event)
-        
+
     def update_pause(self, event):
         pause = float(self.pause.GetValue())
         self.display_frame.pause = pause
-        self._set_setting('project_pause',pause)
+        self._set_setting('project_pause', pause)
         self.set_estimated_time()
         self.refresh_display(event)
-    
+
     def update_overshoot(self, event):
         overshoot = float(self.overshoot.GetValue())
         self.display_frame.pause = overshoot
-        self._set_setting('project_overshoot',overshoot)
+        self._set_setting('project_overshoot', overshoot)
 
     def update_prelift_gcode(self, event):
         prelift_gcode = self.prelift_gcode.GetValue().replace('\n', "\\n")
         self.display_frame.prelift_gcode = prelift_gcode
-        self._set_setting('project_prelift_gcode',prelift_gcode)
-        
+        self._set_setting('project_prelift_gcode', prelift_gcode)
+
     def update_postlift_gcode(self, event):
         postlift_gcode = self.postlift_gcode.GetValue().replace('\n', "\\n")
         self.display_frame.postlift_gcode = postlift_gcode
-        self._set_setting('project_postlift_gcode',postlift_gcode)
-        
+        self._set_setting('project_postlift_gcode', postlift_gcode)
+
     def update_z_axis_rate(self, event):
         z_axis_rate = int(self.z_axis_rate.GetValue())
         self.display_frame.z_axis_rate = z_axis_rate
-        self._set_setting('project_z_axis_rate',z_axis_rate)
-        
+        self._set_setting('project_z_axis_rate', z_axis_rate)
+
     def update_direction(self, event):
         direction = self.direction.GetValue()
         self.display_frame.direction = direction
-        self._set_setting('project_direction',direction)
-        
+        self._set_setting('project_direction', direction)
+
     def update_fullscreen(self, event):
         if (self.fullscreen.GetValue()):
             self.display_frame.ShowFullScreen(1)
         else:
             self.display_frame.ShowFullScreen(0)
         self.refresh_display(event)
-    
+
     def update_resolution(self, event):
         x = int(self.X.GetValue())
         y = int(self.Y.GetValue())
-        self.display_frame.resize((x,y))
-        self._set_setting('project_x',x)
-        self._set_setting('project_y',y)
+        self.display_frame.resize((x, y))
+        self._set_setting('project_x', x)
+        self._set_setting('project_y', y)
         self.refresh_display(event)
-    
+
     def get_dpi(self):
         resolution_x_pixels = int(self.X.GetValue())
         projected_x_mm = float(self.projected_X_mm.GetValue())
         projected_x_inches = projected_x_mm / 25.4
-        
-        return resolution_x_pixels / projected_x_inches                         
-        
+
+        return resolution_x_pixels / projected_x_inches
+
     def start_present(self, event):
         if not hasattr(self, "layers"):
             print "No model loaded!"
             return
-        
+
         self.pause_button.SetLabel("Pause")
         self.set_current_layer(0)
         self.display_frame.Raise()
@@ -782,26 +779,26 @@ class SettingsFrame(wx.Frame):
         self.display_frame.slicer = self.layers[2]
         self.display_frame.dpi = self.get_dpi()
         self.display_frame.present(self.layers[0][:],
-            thickness=float(self.thickness.GetValue()),
-            interval=float(self.interval.GetValue()),
-            scale=float(self.scale.GetValue()),
-            pause=float(self.pause.GetValue()),
-            overshoot=float(self.overshoot.GetValue()),
-            z_axis_rate=int(self.z_axis_rate.GetValue()),
-            prelift_gcode=self.prelift_gcode.GetValue(),
-            postlift_gcode=self.postlift_gcode.GetValue(),
-            direction=self.direction.GetValue(),
-            size=(float(self.X.GetValue()), float(self.Y.GetValue())),
-            offset=(float(self.offset_X.GetValue()), float(self.offset_Y.GetValue())),
-            layer_red=self.layer_red.IsChecked())
-        
+                                   thickness = float(self.thickness.GetValue()),
+                                   interval = float(self.interval.GetValue()),
+                                   scale = float(self.scale.GetValue()),
+                                   pause = float(self.pause.GetValue()),
+                                   overshoot = float(self.overshoot.GetValue()),
+                                   z_axis_rate = int(self.z_axis_rate.GetValue()),
+                                   prelift_gcode = self.prelift_gcode.GetValue(),
+                                   postlift_gcode = self.postlift_gcode.GetValue(),
+                                   direction = self.direction.GetValue(),
+                                   size = (float(self.X.GetValue()), float(self.Y.GetValue())),
+                                   offset = (float(self.offset_X.GetValue()), float(self.offset_Y.GetValue())),
+                                   layer_red = self.layer_red.IsChecked())
+
     def stop_present(self, event):
         print "Stop"
         self.pause_button.SetLabel("Pause")
         self.set_current_layer(0)
         self.display_frame.running = False
-        
-    def pause_present(self, event):        
+
+    def pause_present(self, event):
         if self.pause_button.GetLabel() == 'Pause':
             print "Pause"
             self.pause_button.SetLabel("Continue")
@@ -815,7 +812,6 @@ class SettingsFrame(wx.Frame):
 if __name__ == "__main__":
     provider = wx.SimpleHelpProvider()
     wx.HelpProvider_Set(provider)
-    #a = wx.App(redirect=True,filename="mylogfile.txt")
     a = wx.App()
     SettingsFrame(None).Show()
     a.MainLoop()