From: daid <daid303@gmail.com>
Date: Wed, 2 May 2012 12:14:41 +0000 (+0200)
Subject: Only show gcode buttons when GCode is loaded. Only show layer selection in GCode... 
X-Git-Tag: RC3~13^2~5^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=92c42d1afa7f8a7c2aa05b6a1b62fa7f1c554faf;p=cura.git

Only show gcode buttons when GCode is loaded. Only show layer selection in GCode and mixed view. Fixed #87
---

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