Mercurial > hg-public > lasercut-scripts / file diff

--- a/printrun-src/printrun/pronterface.py	Fri Jun 03 21:14:09 2016 +0200
+++ b/printrun-src/printrun/pronterface.py	Sat Jun 04 09:22:51 2016 +0200
@@ -2,6 +2,7 @@
 
 # FILE MODIFIED BY NEOSOFT - MALTE BAYER
 # Embed Lasercut functions from laser.py 
+import laser
 
 # This file is part of the Printrun suite.
 #
@@ -1378,22 +1379,22 @@
                 self.logError(_("Could not update recent files list:") +
                               "\n" + traceback.format_exc())
 
-            # import the library local so we dont have to restart the whole app when making code changes
-            from laser import Lasercutter
+            # reload the library local so we dont have to restart the whole app when making code changes
+            reload(laser)
 
             if name.lower().endswith(".stl") or name.lower().endswith(".obj"):
                 self.slice(name)
             elif name.lower().endswith(".png") or name.lower().endswith(".jpg") or name.lower().endswith(".gif"):
                 # Generate GCODE from IMAGE
-                lc = Lasercutter(pronterwindow = self)
+                lc = laser.Lasercutter(pronterwindow = self)
                 lc.image2gcode(name)  
             elif name.lower().endswith(".svg"):
                 # Generate GCODE from SVG
-                lc = Lasercutter(pronterwindow = self)
+                lc = laser.Lasercutter(pronterwindow = self)
                 lc.svg2gcode(name)  
             elif name.lower().endswith(".hpgl") or name.lower().endswith(".plt"):
                 # Generate GCODE from HPGL
-                lc = Lasercutter(pronterwindow = self)
+                lc = laser.Lasercutter(pronterwindow = self)
                 lc.hpgl2gcode(name)  
             else:
                 self.load_gcode_async(name)