chiark / gitweb /
Fixed #356
authordaid303 <daid303@gmail.com>
Tue, 5 Feb 2013 14:08:48 +0000 (15:08 +0100)
committerdaid303 <daid303@gmail.com>
Tue, 5 Feb 2013 14:08:48 +0000 (15:08 +0100)
Cura/gui/projectPlanner.py

index 863c3ddae378c69c71ded901e6be62d41c7e79d9..2d2f77267a2d0ecea0df1749b82148b87555e2ab 100644 (file)
@@ -200,9 +200,8 @@ class projectPlanner(wx.Frame):
                sizer = wx.GridBagSizer(2,2)
                panel.SetSizer(sizer)
                
-               self.infoToolButton   = openglGui.glButton(self.glCanvas, 0, 'Info', 0,0, self.OnInfoSelect)
-               self.rotateToolButton = openglGui.glButton(self.glCanvas, 1, 'Rotate', 0,1, self.OnRotateSelect)
-               self.scaleToolButton  = openglGui.glButton(self.glCanvas, 2, 'Scale', 0,2, self.OnScaleSelect)
+               self.rotateToolButton = openglGui.glButton(self.glCanvas, 1, 'Rotate', (0,1), self.OnRotateSelect)
+               self.scaleToolButton  = openglGui.glButton(self.glCanvas, 2, 'Scale', (0,2), self.OnScaleSelect)
 
                self.SetSize((800,600))
 
@@ -216,14 +215,12 @@ class projectPlanner(wx.Frame):
                self.glCanvas.Refresh()
 
        def OnRotateSelect(self):
-               self.infoToolButton.setSelected(False)
                self.rotateToolButton.setSelected(True)
                self.scaleToolButton.setSelected(False)
                self.tool = previewTools.toolRotate(self.glCanvas)
                self.glCanvas.Refresh()
 
        def OnScaleSelect(self):
-               self.infoToolButton.setSelected(False)
                self.rotateToolButton.setSelected(False)
                self.scaleToolButton.setSelected(True)
                self.tool = previewTools.toolScale(self.glCanvas)
@@ -295,7 +292,7 @@ class projectPlanner(wx.Frame):
                        vMin = item.getMinimum()
                        vMax = item.getMaximum()
                        offset = - vMin - (vMax - vMin) / 2
-                       offset += numpy.array([item.centerX, item.centerY, 0])
+                       offset += numpy.array([item.centerX, item.centerY, (vMax[2] - vMin[2]) / 2])
                        vertexes = (item.mesh.vertexes * item.matrix).getA() + offset
                        for v in vertexes:
                                output.addVertex(v[0], v[1], v[2])