From: daid <daid303@gmail.com>
Date: Fri, 4 May 2012 10:03:08 +0000 (+0200)
Subject: Remove duplicate code.
X-Git-Tag: RC3~13^2~1^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f437bc38eb143a86bb2d7a44d957da34d2188106;p=cura.git

Remove duplicate code.
---

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index a198a76d..97b9bbc8 100644
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -636,28 +636,6 @@ class ProjectSliceProgressWindow(wx.Frame):
 		self.startTime = time.time()
 		self.sliceStartTime = time.time()
 		
-		#How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.
-		# TODO: Duplicate with sliceProgressPanel, move to sliceRun.
-		self.sliceStepTimeFactor = {
-			'start': 3.3713991642,
-			'slice': 15.4984838963,
-			'preface': 5.17178297043,
-			'inset': 116.362634182,
-			'fill': 215.702672005,
-			'multiply': 21.9536788464,
-			'speed': 12.759510994,
-			'raft': 31.4580039978,
-			'skirt': 19.3436040878,
-			'skin': 1.0,
-			'joris': 1.0,
-			'comb': 23.7805759907,
-			'cool': 27.148763895,
-			'dimension': 90.4914340973
-		}
-		self.totalRunTimeFactor = 0
-		for v in self.sliceStepTimeFactor.itervalues():
-			self.totalRunTimeFactor += v
-		
 		self.sizer = wx.GridBagSizer(2, 2) 
 		self.statusText = wx.StaticText(self, -1, "Building: %s" % (resultFilename))
 		self.progressGauge = wx.Gauge(self, -1)
@@ -689,13 +667,13 @@ class ProjectSliceProgressWindow(wx.Frame):
 
 	def SetProgress(self, stepName, layer, maxLayer):
 		if self.prevStep != stepName:
-			self.totalDoneFactor += self.sliceStepTimeFactor[self.prevStep]
+			self.totalDoneFactor += sliceRun.sliceStepTimeFactor[self.prevStep]
 			newTime = time.time()
 			#print "#####" + str(newTime-self.startTime) + " " + self.prevStep + " -> " + stepName
 			self.startTime = newTime
 			self.prevStep = stepName
 		
-		progresValue = ((self.totalDoneFactor + self.sliceStepTimeFactor[stepName] * layer / maxLayer) / self.totalRunTimeFactor) * 10000
+		progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000
 		self.progressGauge.SetValue(int(progresValue))
 		self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
 	
diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 4eed4712..9e49e5b3 100644
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -15,27 +15,6 @@ class sliceProgessPanel(wx.Panel):
 		self.filelist = filelist
 		self.abort = False
 		
-		#How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.
-		self.sliceStepTimeFactor = {
-			'start': 3.3713991642,
-			'slice': 15.4984838963,
-			'preface': 5.17178297043,
-			'inset': 116.362634182,
-			'fill': 215.702672005,
-			'multiply': 21.9536788464,
-			'speed': 12.759510994,
-			'raft': 31.4580039978,
-			'skirt': 19.3436040878,
-			'skin': 1.0,
-			'joris': 1.0,
-			'comb': 23.7805759907,
-			'cool': 27.148763895,
-			'dimension': 90.4914340973
-		}
-		self.totalRunTimeFactor = 0
-		for v in self.sliceStepTimeFactor.itervalues():
-			self.totalRunTimeFactor += v
-
 		box = wx.StaticBox(self, -1, filelist[0])
 		self.sizer = wx.StaticBoxSizer(box, wx.HORIZONTAL)
 
@@ -125,13 +104,13 @@ class sliceProgessPanel(wx.Panel):
 	
 	def SetProgress(self, stepName, layer, maxLayer):
 		if self.prevStep != stepName:
-			self.totalDoneFactor += self.sliceStepTimeFactor[self.prevStep]
+			self.totalDoneFactor += sliceRun.sliceStepTimeFactor[self.prevStep]
 			newTime = time.time()
 			#print "#####" + str(newTime-self.startTime) + " " + self.prevStep + " -> " + stepName
 			self.startTime = newTime
 			self.prevStep = stepName
 		
-		progresValue = ((self.totalDoneFactor + self.sliceStepTimeFactor[stepName] * layer / maxLayer) / self.totalRunTimeFactor) * 10000
+		progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000
 		self.progressGauge.SetValue(int(progresValue))
 		self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
 
diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index edc304d3..4bc302a0 100644
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -5,6 +5,28 @@ import platform, os, subprocess, sys
 from cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft
 from util import profile
 
+#How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.
+sliceStepTimeFactor = {
+	'start': 3.3713991642,
+	'slice': 15.4984838963,
+	'preface': 5.17178297043,
+	'inset': 116.362634182,
+	'fill': 215.702672005,
+	'multiply': 21.9536788464,
+	'speed': 12.759510994,
+	'raft': 31.4580039978,
+	'skirt': 19.3436040878,
+	'skin': 1.0,
+	'joris': 1.0,
+	'comb': 23.7805759907,
+	'cool': 27.148763895,
+	'dimension': 90.4914340973
+}
+
+totalRunTimeFactor = 0
+for v in sliceStepTimeFactor.itervalues():
+	totalRunTimeFactor += v
+
 def getPyPyExe():
 	"Return the path to the pypy executable if we can find it. Else return False"
 	if platform.system() == "Windows":