Pass home position go gcoder.GCode instances

printrun/gcview.py

@@ -30,7 +30,7 @@ from pyglet.gl import *
 
 from .gviz import GvizBaseFrame
 
-from printrun_utils import imagefile, install_locale
+from printrun_utils import imagefile, install_locale, get_home_pos
 install_locale('pronterface')
 
 def create_model(light):
@@ -381,7 +381,7 @@ if __name__ == "__main__":
     title = 'Gcode view, shift to move view, mousewheel to set layer'
     frame = GcodeViewFrame(None, wx.ID_ANY, title, size = (400, 400),
                            build_dimensions = build_dimensions)
-    gcode = gcoder.GCode(open(sys.argv[1]))
+    gcode = gcoder.GCode(open(sys.argv[1]), get_home_pos(build_dimensions))
     frame.addfile(gcode)
 
     first_move = None

printrun/gviz.py

@@ -19,7 +19,7 @@ import wx
 import time
 from printrun import gcoder
 
-from printrun_utils import imagefile, install_locale
+from printrun_utils import imagefile, install_locale, get_home_pos
 install_locale('pronterface')
 
 class GvizBaseFrame(wx.Frame):
@@ -93,7 +93,7 @@ class GvizWindow(GvizBaseFrame):
         self.Bind(wx.EVT_MOUSE_EVENTS, self.mouse)
 
         if f:
-            gcode = gcoder.GCode(f)
+            gcode = gcoder.GCode(f, get_home_pos(self.p.build_dimensions))
             self.p.addfile(gcode)
 
     def set_current_gline(self, gline):
@@ -217,7 +217,7 @@ class Gviz(wx.Panel):
     def clear(self):
         self.lastpos = [0, 0, 0, 0, 0, 0, 0]
         self.hilightpos = self.lastpos[:]
-        self.gcoder = gcoder.GCode([])
+        self.gcoder = gcoder.GCode([], get_home_pos(self.build_dimensions))
         self.lines = {}
         self.pens = {}
         self.arcs = {}

printrun/pronsole.py

@@ -894,7 +894,8 @@ class pronsole(cmd.Cmd):
         if not os.path.exists(filename):
             self.logError("File not found!")
             return
-        self.fgcode = gcoder.GCode(open(filename, "rU"))
+        self.fgcode = gcoder.GCode(open(filename, "rU"),
+                                   get_home_pos(self.build_dimensions_list))
         self.filename = filename
         self.log("Loaded %s, %d lines." % (filename, len(self.fgcode)))
 

printrun/pronterface.py

@@ -1525,7 +1525,8 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
         fn = self.filename
         try:
             self.filename = self.model_to_gcode_filename(self.filename)
-            self.fgcode = gcoder.GCode(open(self.filename, "rU"))
+            self.fgcode = gcoder.GCode(open(self.filename, "rU"),
+                                       get_home_pos(self.build_dimensions_list))
             if self.p.online:
                 wx.CallAfter(self.printbtn.Enable)
 
@@ -1595,7 +1596,8 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
                 self.skein(name)
             else:
                 self.filename = name
-                self.fgcode = gcoder.GCode(open(self.filename, "rU"))
+                self.fgcode = gcoder.GCode(open(self.filename, "rU"),
+                                           get_home_pos(self.build_dimensions_list))
                 self.statusbar.SetStatusText(_("Loaded %s, %d lines") % (name, len(self.fgcode)))
                 print _("Loaded %s, %d lines") % (name, len(self.fgcode))
                 wx.CallAfter(self.printbtn.SetLabel, _("Print"))