From 16b5f6db25ae473777b5969c2df3c2e5b6c18f2d Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sat, 18 May 2013 11:05:45 +0200
Subject: [PATCH] Cleanup some code

Not sure about that dropping of the self.gwindow.Destroy try block, we'll see
---
 printrun/gviz.py | 19 ++++++++-----------
 pronterface.py   |  7 ++-----
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/printrun/gviz.py b/printrun/gviz.py
index 3a54fbd..c8e5d44 100755
--- a/printrun/gviz.py
+++ b/printrun/gviz.py
@@ -69,18 +69,17 @@ class window(wx.Frame):
 
     def mouse(self, event):
         if event.ButtonUp(wx.MOUSE_BTN_LEFT):
-            if(self.initpos is not None):
+            if self.initpos is not None:
                 self.initpos = None
         elif event.Dragging():
             e = event.GetPositionTuple()
             if self.initpos is None or not hasattr(self, "basetrans"):
                 self.initpos = e
                 self.basetrans = self.p.translate
-            self.p.translate = [ self.basetrans[0]+(e[0]-self.initpos[0]),
-                            self.basetrans[1]+(e[1]-self.initpos[1]) ]
+            self.p.translate = [self.basetrans[0] + (e[0] - self.initpos[0]),
+                                self.basetrans[1] + (e[1] - self.initpos[1])]
             self.p.dirty = 1
-            self.p.Refresh()
-
+            wx.CallAfter(self.p.Refresh)
         else:
             event.Skip()
 
@@ -174,7 +173,7 @@ class gviz(wx.Panel):
         self.layerindex = 0
         self.showall = 0
         self.dirty = 1
-        self.Refresh()
+        wx.CallAfter(self.Refresh)
 
     def layerup(self):
         if(self.layerindex+1<len(self.layers)):
@@ -182,7 +181,7 @@ class gviz(wx.Panel):
             # Display layer info on statusbar (Jezmy)
             self.parent.SetStatusText("Layer "+str(self.layerindex +1)+" - Going Up - Z = "+str(self.layers[self.layerindex])+" mm", 0)
             self.dirty = 1
-            self.Refresh()
+            wx.CallAfter(self.Refresh)
 
     def layerdown(self):
         if(self.layerindex>0):
@@ -190,7 +189,7 @@ class gviz(wx.Panel):
             # Display layer info on statusbar (Jezmy)
             self.parent.SetStatusText("Layer "+str(self.layerindex + 1)+" - Going Down - Z = "+str(self.layers[self.layerindex])+ " mm", 0)
             self.dirty = 1
-            self.Refresh()
+            wx.CallAfter(self.Refresh)
 
     def setlayer(self, layer):
         try:
@@ -222,7 +221,7 @@ class gviz(wx.Panel):
         for pen in self.penslist:
             pen.SetWidth(penwidth)
         self.dirty = 1
-        self.Refresh()
+        wx.CallAfter(self.Refresh)
 
     def repaint(self):
         self.blitmap = wx.EmptyBitmap(self.GetClientSize()[0], self.GetClientSize()[1],-1)
@@ -293,9 +292,7 @@ class gviz(wx.Panel):
         if self.dirty:
             self.repaint()
             self.dirty = 0
-        sz = self.GetClientSize()
         dc.DrawBitmap(self.blitmap, 0, 0)
-        del dc
 
     def addfile(self, gcode):
         self.clear()
diff --git a/pronterface.py b/pronterface.py
index 878e4c4..4c377bf 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -984,11 +984,8 @@ class PronterWindow(MainWindow, pronsole.pronsole):
             self.save_in_rc("set xy_feedrate", "set xy_feedrate %d" % self.settings.xy_feedrate)
             self.save_in_rc("set z_feedrate", "set z_feedrate %d" % self.settings.z_feedrate)
             self.save_in_rc("set e_feedrate", "set e_feedrate %d" % self.settings.e_feedrate)
-        try:
-            self.gwindow.Destroy()
-        except:
-            pass
-        self.Destroy()
+        wx.CallAfter(self.gwindow.Destroy)
+        wx.CallAfter(self.Destroy)
 
     def do_monitor(self, l = ""):
         if l.strip()=="":