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

Move multiply to preview window. (Only rotate left to move)

master
daid 2012-03-22 11:24:52 +01:00
parent 77b16b5ccf
commit befd9bfdc5
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SkeinPyPy/newui/mainWindow.py
View File

@ -163,13 +163,6 @@ class mainWindow(configBase.configWindowBase):
c = configBase.SettingRow(right, "Rotate (deg)", 'model_rotate_base', '0', '')
validators.validFloat(c)
configBase.settingNotify(c, self.preview3d.updateModelTransform)
configBase.TitleRow(right, "Multiply")
c = configBase.SettingRow(right, "Multiple X", 'model_multiply_x', '1', '')
validators.validInt(c)
configBase.settingNotify(c, self.preview3d.updateModelTransform)
c = configBase.SettingRow(right, "Multiple Y", 'model_multiply_y', '1', '')
validators.validInt(c)
configBase.settingNotify(c, self.preview3d.updateModelTransform)
# load and slice buttons.
loadButton = wx.Button(self, -1, 'Load Model')

34
SkeinPyPy/newui/preview3d.py
View File

@ -74,11 +74,27 @@ class previewPanel(wx.Panel):
self.toolbar2.AddControl(self.flipZ)
self.Bind(wx.EVT_CHECKBOX, self.OnFlipZClick, self.flipZ)
self.toolbar2.InsertSeparator(4)
self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Scale'))
self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21))
self.toolbar2.AddControl(self.scale)
self.Bind(wx.EVT_TEXT, self.OnScale, self.scale)
self.toolbar2.InsertSeparator(self.toolbar2.GetToolsCount())
self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Copy:'))
self.mulXsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))
self.toolbar2.AddControl(self.mulXsub)
self.Bind(wx.EVT_BUTTON, self.OnMulXSubClick, self.mulXsub)
self.mulXadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))
self.toolbar2.AddControl(self.mulXadd)
self.Bind(wx.EVT_BUTTON, self.OnMulXAddClick, self.mulXadd)
self.mulYsub = wx.Button(self.toolbar2, -1, '-', size=(21,21))
self.toolbar2.AddControl(self.mulYsub)
self.Bind(wx.EVT_BUTTON, self.OnMulYSubClick, self.mulYsub)
self.mulYadd = wx.Button(self.toolbar2, -1, '+', size=(21,21))
self.toolbar2.AddControl(self.mulYadd)
self.Bind(wx.EVT_BUTTON, self.OnMulYAddClick, self.mulYadd)
self.toolbar2.Realize()
self.updateToolbar()
@ -101,6 +117,22 @@ class previewPanel(wx.Panel):
profile.putProfileSetting('flip_z', str(self.flipZ.GetValue()))
self.updateModelTransform()
def OnMulXAddClick(self, e):
profile.putProfileSetting('model_multiply_x', str(max(1, int(profile.getProfileSetting('model_multiply_x'))+1)))
self.updateModelTransform()
def OnMulXSubClick(self, e):
profile.putProfileSetting('model_multiply_x', str(max(1, int(profile.getProfileSetting('model_multiply_x'))-1)))
self.updateModelTransform()
def OnMulYAddClick(self, e):
profile.putProfileSetting('model_multiply_y', str(max(1, int(profile.getProfileSetting('model_multiply_y'))+1)))
self.updateModelTransform()
def OnMulYSubClick(self, e):
profile.putProfileSetting('model_multiply_y', str(max(1, int(profile.getProfileSetting('model_multiply_y'))-1)))
self.updateModelTransform()
def OnScale(self, e):
try:
scale = float(self.scale.GetValue())