Fix build dimensions offsets usage in platers

printrun/gcodeplater.py

@@ -97,6 +97,7 @@ class GcodePlater(Plater):
         while generator_output is not None:
             generator_output = generator.next()
         obj = gcview.GCObject(model)
+        obj.offsets = [self.build_dimensions[3], self.build_dimensions[4], 0]
         obj.gcode = gcode
         obj.dims = [gcode.xmin, gcode.xmax,
                     gcode.ymin, gcode.ymax,

printrun/objectplater.py

@@ -198,7 +198,9 @@ class Plater(wx.Frame):
                     print _("Bed full, sorry sir :(")
                     self.Refresh()
                     return
-            centreoffset = [(bedsize[0] - max[0]) / 2, (bedsize[1] - max[1]) / 2]
+            centerx = self.build_dimensions[0] / 2 + self.build_dimensions[3]
+            centery = self.build_dimensions[1] / 2 + self.build_dimensions[4]
+            centreoffset = [centerx - max[0] / 2, centery - max[1] / 2]
             for i in self.models:
                 self.models[i].offsets[0] += centreoffset[0]
                 self.models[i].offsets[1] += centreoffset[1]

printrun/stlplater.py

@@ -350,7 +350,7 @@ class StlPlater(Plater):
             print "Rebasing %s" % best_match
             model = self.models[best_match]
             newmodel = model.rebase(best_facet)
-            newmodel.offsets = model.offsets
+            newmodel.offsets = list(model.offsets)
             newmodel.rot = 0
             newmodel.scale = model.scale
             newmodel.filename = model.filename
@@ -436,8 +436,10 @@ class StlPlater(Plater):
                 self.load_stl_into_model(name, name)
         wx.CallAfter(self.Refresh)
 
-    def load_stl_into_model(self, path, name, offset = [0, 0, 0], rotation = 0, scale = [1.0, 1.0, 1.0]):
+    def load_stl_into_model(self, path, name, offset = None, rotation = 0, scale = [1.0, 1.0, 1.0]):
         model = stltool.stl(path)
+        if offset is None:
+            offset = [self.build_dimensions[3], self.build_dimensions[4], 0]
         model.offsets = list(offset)
         model.rot = rotation
         model.scale = list(scale)
@@ -503,8 +505,8 @@ class StlPlater(Plater):
                 for name, model in models.items():
                     # FIXME: not sure this is going to work superwell with utf8
                     if model.filename == filename:
-                        model.offsets[0] = x
-                        model.offsets[1] = y
+                        model.offsets[0] = x + self.build_dimensions[3]
+                        model.offsets[1] = y + self.build_dimensions[4]
                         model.rot = rot
                         del models[name]
                         break