chiark / gitweb /
Do not scale down huge objects, as it is not clear to users that the objects where...
authordaid303 <daid303@gmail.com>
Thu, 28 Feb 2013 12:39:17 +0000 (13:39 +0100)
committerdaid303 <daid303@gmail.com>
Thu, 28 Feb 2013 12:39:17 +0000 (13:39 +0100)
Cura/gui/preview3d.py

index e19876df38c4a9f1d1a849def50181ff33af12af..9e00411862935750b493e0dba9d82b135b0931ae 100644 (file)
@@ -206,7 +206,7 @@ class previewPanel(wx.Panel):
                sx, sy = self.glCanvas.GetClientSizeTuple()
                self.warningPopup.SetPosition((x, y+sy-self.warningPopup.GetSize().height))
 
-       def OnScaleMax(self, onlyScaleDown = False):
+       def OnScaleMax(self):
                if self.objectsMinV is None:
                        return
                vMin = self.objectsMinV
@@ -220,8 +220,6 @@ class previewPanel(wx.Panel):
                scaleY2 = (self.machineCenter.y - skirtSize) / ((vMax[1] - vMin[1]) / 2)
                scaleZ = self.machineSize.z / (vMax[2] - vMin[2])
                scale = min(scaleX1, scaleY1, scaleX2, scaleY2, scaleZ)
-               if scale > 1.0 and onlyScaleDown:
-                       return
                self.matrix *= numpy.matrix([[scale,0,0],[0,scale,0],[0,0,scale]], numpy.float64)
                if self.glCanvas.viewMode == 'GCode' or self.glCanvas.viewMode == 'Mixed':
                        self.setViewMode('Normal')
@@ -384,7 +382,6 @@ class previewPanel(wx.Panel):
                                obj.dirty = True
                                obj.steepDirty = True
                                self.updateModelTransform()
-                               self.OnScaleMax(True)
                                self.glCanvas.zoom = self.objectsBoundaryCircleSize * 6.0
                                self.errorList = []
                                wx.CallAfter(self.updateToolbar)