Added scale to preview window instead of model tab

diff --git a/SkeinPyPy/newui/mainWindow.py b/SkeinPyPy/newui/mainWindow.py
index d8688c4a12c7dea96237302c45853f20ccbf9053..b6200ed3e6b97681e10820cc8f72da084a894ea5 100644 (file)
--- a/SkeinPyPy/newui/mainWindow.py
+++ b/SkeinPyPy/newui/mainWindow.py
@@ -159,10 +159,6 @@ class mainWindow(configBase.configWindowBase):
                nb.AddPage(alterationPanel.alterationPanel(nb), "Start/End-GCode")
 
                (left, right) = self.CreateConfigTab(nb, '3D Model')
-               configBase.TitleRow(left, "Scale")
-               c = configBase.SettingRow(left, "Scale", 'model_scale', '1.0', '')
-               validators.validFloat(c, 0.01)
-               configBase.settingNotify(c, self.preview3d.updateModelTransform)
                configBase.TitleRow(right, "Rotate")
                c = configBase.SettingRow(right, "Rotate (deg)", 'model_rotate_base', '0', '')
                validators.validFloat(c)

diff --git a/SkeinPyPy/newui/preview3d.py b/SkeinPyPy/newui/preview3d.py
index 4941a8f6beb107aefb6a8a069d8759d7ccc681ba..fc36fd66ca552992cd6148c7710bdf85b8799f92 100644 (file)
--- a/SkeinPyPy/newui/preview3d.py
+++ b/SkeinPyPy/newui/preview3d.py
@@ -74,6 +74,13 @@ class previewPanel(wx.Panel):
                self.toolbar2.AddControl(self.flipZ)\r
                self.Bind(wx.EVT_CHECKBOX, self.OnFlipZClick, self.flipZ)\r
                \r
+               self.toolbar2.InsertSeparator(4)\r
+               self.toolbar2.AddControl(wx.StaticText(self.toolbar2, -1, 'Scale'))\r
+               self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21))\r
+               self.toolbar2.AddControl(self.scale)\r
+               self.Bind(wx.EVT_TEXT, self.OnScale, self.scale)\r
+               \r
+               self.toolbar2.Realize()\r
                self.updateToolbar()\r
                \r
                sizer = wx.BoxSizer(wx.VERTICAL)\r
@@ -94,6 +101,14 @@ class previewPanel(wx.Panel):
                profile.putProfileSetting('flip_z', str(self.flipZ.GetValue()))\r
                self.updateModelTransform()\r
 \r
+       def OnScale(self, e):\r
+               try:\r
+                       scale = float(self.scale.GetValue())\r
+               except:\r
+                       scale = 1.0\r
+               profile.putProfileSetting('model_scale', str(scale))\r
+               self.updateModelTransform()\r
+\r
        def On3DClick(self, e):\r
                self.glCanvas.yaw = 30\r
                self.glCanvas.pitch = 60\r