Only show gcode buttons when GCode is loaded. Only show layer selection in GCode...

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index ec525096fe64733a5c30f8ebe206c024b15bbcbc..ee1ed79ee4af0cf0216243abaee72037b313250c 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -63,7 +63,6 @@ class previewPanel(wx.Panel):
                self.xrayViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-xray-on.png', 'view-xray-off.png', 'X-Ray view', callback=self.OnViewChange)\r
                self.gcodeViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-gcode-on.png', 'view-gcode-off.png', 'GCode view', callback=self.OnViewChange)\r
                self.mixedViewButton = toolbarUtil.RadioButton(self.toolbar, group, 'view-mixed-on.png', 'view-mixed-off.png', 'Mixed model/GCode view', callback=self.OnViewChange)\r
-               self.OnViewChange()\r
                self.toolbar.AddSeparator()\r
 \r
                self.layerSpin = wx.SpinCtrl(self.toolbar, -1, '', size=(21*4,21), style=wx.SP_ARROW_KEYS)\r
@@ -107,7 +106,7 @@ class previewPanel(wx.Panel):
                self.toolbar2.AddControl(self.rotate)\r
 \r
                self.toolbar2.Realize()\r
-               self.updateToolbar()\r
+               self.OnViewChange()\r
                \r
                sizer = wx.BoxSizer(wx.VERTICAL)\r
                sizer.Add(self.toolbar, 0, flag=wx.EXPAND|wx.TOP|wx.LEFT|wx.RIGHT, border=1)\r
@@ -272,7 +271,9 @@ class previewPanel(wx.Panel):
                pass\r
        \r
        def updateToolbar(self):\r
-               self.layerSpin.Show(self.gcode != None)\r
+               self.gcodeViewButton.Show(self.gcode != None)\r
+               self.mixedViewButton.Show(self.gcode != None)\r
+               self.layerSpin.Show(self.glCanvas.viewMode == "GCode" or self.glCanvas.viewMode == "Mixed")\r
                if self.gcode != None:\r
                        self.layerSpin.SetRange(1, len(self.gcode.layerList))\r
                self.toolbar.Realize()\r
@@ -288,6 +289,7 @@ class previewPanel(wx.Panel):
                        self.glCanvas.viewMode = "GCode"\r
                elif self.mixedViewButton.GetValue():\r
                        self.glCanvas.viewMode = "Mixed"\r
+               self.updateToolbar()\r
                self.glCanvas.Refresh()\r
        \r
        def updateModelTransform(self, f=0):\r