q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bugs where scale/rotate will not update on Linux

Browse source
This commit is contained in:
daid 2012-04-18 11:00:41 +02:00
parent 00ba00cefa
commit 4d10199e74
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cura/gui/preview3d.py
View file

@ -159,7 +159,7 @@ class previewPanel(wx.Panel):
self.toolbar2 = wx.ToolBar( self, -1, style = wx.TB_HORIZONTAL | wx.NO_BORDER ) self.toolbar2 = wx.ToolBar( self, -1, style = wx.TB_HORIZONTAL | wx.NO_BORDER )
self.toolbar2.SetToolBitmapSize( ( 21, 21 ) ) self.toolbar2.SetToolBitmapSize( ( 21, 21 ) )
# Mirror # Mirror
self.mirrorX = ToggleButton(self.toolbar2, self, 'flip_x', 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Mirror X') self.mirrorX = ToggleButton(self.toolbar2, self, 'flip_x', 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Mirror X')
self.toolbar2.AddControl(self.mirrorX) self.toolbar2.AddControl(self.mirrorX)
@ -171,7 +171,7 @@ class previewPanel(wx.Panel):
self.toolbar2.AddSeparator() self.toolbar2.AddSeparator()
# Swap # Swap
self.swapXZ = ToggleButton(self.toolbar2, self, 'swap_xz', 'object-swap-xz-on.png', 'object-swap-xz-off.png', 'Swap XZ') self.swapXZ = ToggleButton(self.toolbar2, self, 'swap_xz', 'object-swap-xz-on.png', 'object-swap-xz-off.png', 'Swap XZ')
self.toolbar2.AddControl(self.swapXZ) self.toolbar2.AddControl(self.swapXZ)
@ -180,17 +180,17 @@ class previewPanel(wx.Panel):
self.toolbar2.AddSeparator() self.toolbar2.AddSeparator()
# Scale # Scale
self.scaleReset = NormalButton(self.toolbar2, self, 'object-scale.png', 'Reset model scale') self.scaleReset = NormalButton(self.toolbar2, self, 'object-scale.png', 'Reset model scale')
self.scaleReset.Bind(wx.EVT_BUTTON, self.OnScaleReset) self.scaleReset.Bind(wx.EVT_BUTTON, self.OnScaleReset)
self.toolbar2.AddControl(self.scaleReset) self.toolbar2.AddControl(self.scaleReset)
self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21)) self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21))
self.toolbar2.AddControl(self.scale) self.toolbar2.AddControl(self.scale)
self.Bind(wx.EVT_TEXT, self.OnScale, self.scale) self.scale.Bind(wx.EVT_TEXT, self.OnScale)
self.toolbar2.AddSeparator() self.toolbar2.AddSeparator()
# Multiply # Multiply
self.mulXadd = NormalButton(self.toolbar2, self, 'object-mul-x-add.png', 'Increase number of models on X axis') self.mulXadd = NormalButton(self.toolbar2, self, 'object-mul-x-add.png', 'Increase number of models on X axis')
self.mulXadd.Bind(wx.EVT_BUTTON, self.OnMulXAddClick) self.mulXadd.Bind(wx.EVT_BUTTON, self.OnMulXAddClick)
self.toolbar2.AddControl(self.mulXadd) self.toolbar2.AddControl(self.mulXadd)
@ -209,7 +209,7 @@ class previewPanel(wx.Panel):
self.toolbar2.AddSeparator() self.toolbar2.AddSeparator()
# Rotate # Rotate
self.rotateReset = NormalButton(self.toolbar2, self, 'object-rotate.png', 'Reset model rotation') self.rotateReset = NormalButton(self.toolbar2, self, 'object-rotate.png', 'Reset model rotation')
self.rotateReset.Bind(wx.EVT_BUTTON, self.OnRotateReset) self.rotateReset.Bind(wx.EVT_BUTTON, self.OnRotateReset)
self.toolbar2.AddControl(self.rotateReset) self.toolbar2.AddControl(self.rotateReset)
@ -266,6 +266,7 @@ class previewPanel(wx.Panel):
def OnScaleReset(self, e): def OnScaleReset(self, e):
self.scale.SetValue('1.0') self.scale.SetValue('1.0')
self.OnScale(None)
def OnScale(self, e): def OnScale(self, e):
profile.putProfileSetting('model_scale', self.scale.GetValue()) profile.putProfileSetting('model_scale', self.scale.GetValue())
@ -289,6 +290,7 @@ class previewPanel(wx.Panel):
def OnRotateReset(self, e): def OnRotateReset(self, e):
self.rotate.SetValue(0) self.rotate.SetValue(0)
self.OnRotate(None)
def OnRotate(self, e): def OnRotate(self, e):
profile.putProfileSetting('model_rotate_base', self.rotate.GetValue()) profile.putProfileSetting('model_rotate_base', self.rotate.GetValue())