Merge branch 'experimental' of github.com:kliment/Printrun into experimental

plater.py

@@ -244,7 +244,10 @@ class showstl(wx.Window):
 class stlwin(wx.Frame):
     def __init__(self, size = (800, 580), callback = None, parent = None):
         wx.Frame.__init__(self, parent, title = _("Plate building tool"), size = size)
-        self.SetIcon(wx.Icon(pixmapfile("plater.ico"), wx.BITMAP_TYPE_ICO))
+        if hasattr(sys,"frozen") and sys.frozen=="windows_exe":
+            self.SetIcon(wx.Icon(sys.executable, wx.BITMAP_TYPE_ICO))
+        else:
+            self.SetIcon(wx.Icon(pixmapfile("plater.ico"), wx.BITMAP_TYPE_ICO))
         self.mainsizer = wx.BoxSizer(wx.HORIZONTAL)
         self.panel = wx.Panel(self, -1, size = (150, 600), pos = (0, 0))
         #self.panel.SetBackgroundColour((10, 10, 10))

printrun/gcoder.py

@@ -314,15 +314,15 @@ class GCode(object):
             zmin = min(zm, zmin)
             zmax = max(zM, zmax)
 
-        self.xmin = xmin
-        self.xmax = xmax
-        self.ymin = ymin
-        self.ymax = ymax
-        self.zmin = zmin
-        self.zmax = zmax
-        self.width = xmax - xmin
-        self.depth = ymax - ymin
-        self.height = zmax - zmin
+        self.xmin = xmin if not math.isinf(xmin) else 0
+        self.xmax = xmax if not math.isinf(xmax) else 0
+        self.ymin = ymin if not math.isinf(ymin) else 0
+        self.ymax = ymax if not math.isinf(ymax) else 0
+        self.zmin = zmin if not math.isinf(zmin) else 0
+        self.zmax = zmax if not math.isinf(zmax) else 0
+        self.width = self.xmax - self.xmin
+        self.depth = self.ymax - self.ymin
+        self.height = self.zmax - self.zmin
 
     def estimate_duration(self):
         lastx = lasty = lastz = laste = lastf = 0.0

pronsole.py

@@ -608,6 +608,8 @@ class pronsole(cmd.Cmd):
             self.processing_rc = False
 
     def load_default_rc(self, rc_filename = ".pronsolerc"):
+        if rc_filename == ".pronsolerc" and hasattr(sys,"frozen") and sys.frozen in ["windows_exe", "console_exe"]:
+            rc_filename="printrunconf.ini"
         try:
             try:
                 self.load_rc(os.path.join(os.path.expanduser("~"), rc_filename))

pronterface.py

@@ -196,7 +196,10 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         self.filename = filename
         os.putenv("UBUNTU_MENUPROXY", "0")
         MainWindow.__init__(self, None, title = _("Printer Interface"), size = size);
-        self.SetIcon(wx.Icon(pixmapfile("P-face.ico"), wx.BITMAP_TYPE_ICO))
+        if hasattr(sys,"frozen") and sys.frozen=="windows_exe":
+            self.SetIcon(wx.Icon(sys.executable, wx.BITMAP_TYPE_ICO))
+        else:
+            self.SetIcon(wx.Icon(pixmapfile("P-face.ico"), wx.BITMAP_TYPE_ICO))
         self.panel = wx.Panel(self,-1, size = size)
 
         self.statuscheck = False
@@ -1367,19 +1370,18 @@ class PronterWindow(MainWindow, pronsole.pronsole):
                 basedir = os.path.split(self.filename)[0]
             except:
                 pass
-	dlg=None
-	if filename is None:
-	        dlg = wx.FileDialog(self, _("Open file to print"), basedir, style = wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
-        	dlg.SetWildcard(_("OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"))
-        if(filename is not None or dlg.ShowModal() == wx.ID_OK):
-            if filename is not None:
+        dlg = None
+        if filename is None:
+            dlg = wx.FileDialog(self, _("Open file to print"), basedir, style = wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
+            dlg.SetWildcard(_("OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"))
+        if filename or dlg.ShowModal() == wx.ID_OK:
+            if filename:
                 name = filename
             else:
                 name = dlg.GetPath()
-            if not(os.path.exists(name)):
+                dlg.Destroy()
+            if not os.path.exists(name):
                 self.status.SetStatusText(_("File not found!"))
-                if dlg is not None:
-                    dlg.Destroy()
                 return
             path = os.path.split(name)[0]
             if path != self.settings.last_file_path:
@@ -1400,8 +1402,8 @@ class PronterWindow(MainWindow, pronsole.pronsole):
                 if self.p.online:
                     wx.CallAfter(self.printbtn.Enable)
                 threading.Thread(target = self.loadviz).start()
-            if dlg is not None:
-                dlg.Destroy()	
+        else:
+            dlg.Destroy()
 
     def loadviz(self):
         gcode = self.fgcode