From: daid303 <daid303@gmail.com>
Date: Wed, 9 Jan 2013 10:24:00 +0000 (+0100)
Subject: Fix the progressbars in the projectplanner..
X-Git-Tag: 13.03~117
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=20560f54c679d1eb0d3f2cae5db004d81771385a;p=cura.git

Fix the progressbars in the projectplanner..
---

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 7992c343..c8541058 100644
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -947,6 +947,7 @@ class ProjectSliceProgressWindow(wx.Frame):
 		self.progressGauge.SetRange(10000)
 		self.progressGauge2 = wx.Gauge(self, -1)
 		self.progressGauge2.SetRange(self.fileCount)
+		self.progressGauge2.SetValue(-1)
 		self.abortButton = wx.Button(self, -1, "Abort")
 		self.sizer.Add(self.statusText, (0,0), span=(1,5))
 		self.sizer.Add(self.progressGauge, (1, 0), span=(1,5), flag=wx.EXPAND)
@@ -972,6 +973,9 @@ class ProjectSliceProgressWindow(wx.Frame):
 
 	def SetProgress(self, stepName, layer, maxLayer):
 		if self.prevStep != stepName:
+			if stepName == 'slice':
+				self.progressGauge2.SetValue(self.progressGauge2.GetValue() + 1)
+				self.totalDoneFactor = 0
 			self.totalDoneFactor += sliceRun.sliceStepTimeFactor[self.prevStep]
 			newTime = time.time()
 			#print "#####" + str(newTime-self.startTime) + " " + self.prevStep + " -> " + stepName
@@ -1094,7 +1098,8 @@ class ProjectSliceProgressWindow(wx.Frame):
 #			resultFile.write('G1 Z%f F%f\n' % (self.actionList[-1].clearZ, profile.getProfileSettingFloat('max_z_speed') * 60))
 #		resultFile.write(profile.getAlterationFileContents('end.gcode'))
 #		resultFile.close()
-		
+		self.progressGauge2.SetValue(self.fileCount)
+
 		gcode = gcodeInterpreter.gcode()
 		gcode.load(self.resultFilename)