Fix head size on object loading.

diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index b229a70923edc67a640ad0298f224c3754245b80..d75350099a25a220cfe8945414a1c080b9df3dbf 100644 (file)
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -103,7 +103,7 @@ class Scene(object):
        def updateMachineDimensions(self):
                self._machineSize = numpy.array([profile.getMachineSettingFloat('machine_width'), profile.getMachineSettingFloat('machine_depth'), profile.getMachineSettingFloat('machine_height')])
                self._machinePolygons = profile.getMachineSizePolygons()
-               self.setHeadSize(profile.getMachineSettingFloat('extruder_head_size_min_x'), profile.getMachineSettingFloat('extruder_head_size_max_x'), profile.getMachineSettingFloat('extruder_head_size_min_y'), profile.getMachineSettingFloat('extruder_head_size_max_y'), profile.getMachineSettingFloat('extruder_head_size_height'))
+               self.updateHeadSize()
 
        # Size offsets are offsets caused by brim, skirt, etc.
        def updateSizeOffsets(self, force=False):
@@ -125,7 +125,13 @@ class Scene(object):
                        obj.setPrintAreaExtends(extends[len(obj._meshList) - 1])
 
        #size of the printing head.
-       def setHeadSize(self, xMin, xMax, yMin, yMax, gantryHeight):
+       def updateHeadSize(self, obj = None):
+               xMin = profile.getMachineSettingFloat('extruder_head_size_min_x')
+               xMax = profile.getMachineSettingFloat('extruder_head_size_max_x')
+               yMin = profile.getMachineSettingFloat('extruder_head_size_min_y')
+               yMax = profile.getMachineSettingFloat('extruder_head_size_max_y')
+               gantryHeight = profile.getMachineSettingFloat('extruder_head_size_height')
+
                self._leftToRight = xMin < xMax
                self._frontToBack = yMin < yMax
                self._headSizeOffsets[0] = min(xMin, xMax)
@@ -135,7 +141,10 @@ class Scene(object):
 
                headArea = numpy.array([[-xMin,-yMin],[ xMax,-yMin],[ xMax, yMax],[-xMin, yMax]], numpy.float32)
 
-               for obj in self._objectList:
+               if obj is None:
+                       for obj in self._objectList:
+                               obj.setHeadArea(headArea, self._headSizeOffsets)
+               else:
                        obj.setHeadArea(headArea, self._headSizeOffsets)
 
        def setExtruderOffset(self, extruderNr, offsetX, offsetY):
@@ -152,6 +161,7 @@ class Scene(object):
                        obj.applyMatrix(numpy.matrix(matrix, numpy.float64))
                self._findFreePositionFor(obj)
                self._objectList.append(obj)
+               self.updateHeadSize(obj)
                self.updateSizeOffsets(True)
                self.pushFree()
 

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 87c539fec2351a9a1f2d3760d166d0b16f40f47c..60e0aba4b695c6a54424e7269ed86edeee951d11 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -113,6 +113,8 @@ class Slicer(object):
                return '%0.2f meter %0.0f gram' % (float(self._filamentMM[e]) / 1000.0, self.getFilamentWeight(e) * 1000.0)
 
        def runSlicer(self, scene):
+               if len(scene.objects()) < 1:
+                       return
                extruderCount = 1
                for obj in scene.objects():
                        if scene.checkPlatform(obj):