From eddb60dc168a7769a523c5a5481b2c1550aabf4b Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 2 Sep 2012 11:17:08 +0200
Subject: [PATCH] Fix imports of stlview and projectlayer

---
 plater.py      | 2 +-
 pronterface.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plater.py b/plater.py
index c6f3ba4..7697aee 100755
--- a/plater.py
+++ b/plater.py
@@ -35,7 +35,7 @@ from printrun.printrun_utils import pixmapfile
 glview = False
 if "-nogl" not in sys.argv:
     try:
-        import stlview
+        from printrun import stlview
         glview = True
     except:
         pass
diff --git a/pronterface.py b/pronterface.py
index 0abcd32..bfe331a 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -410,7 +410,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         return baselist+glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') +glob.glob("/dev/tty.*")+glob.glob("/dev/cu.*")+glob.glob("/dev/rfcomm*")
 
     def project(self,event):
-        import projectlayer
+        from printrun import projectlayer
         if(self.p.online):
             projectlayer.setframe(self,self.p).Show()
         else:
@@ -785,7 +785,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.gviz.showall=1
         try:
             raise ""
-            import stlview
+            from printrun import stlview
             self.gwindow=stlview.GCFrame(None, wx.ID_ANY, 'Gcode view, shift to move view, mousewheel to set layer', size=(600,600))
         except:
             self.gwindow=gviz.window([],