Remove duplicate code.

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index a198a76d190f14d6a096b6ff5815ad4b4e0491c8..97b9bbc83f0c92861b750f0bfef2a42c6b072efc 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -636,28 +636,6 @@ class ProjectSliceProgressWindow(wx.Frame):
                self.startTime = time.time()\r
                self.sliceStartTime = time.time()\r
                \r
-               #How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.\r
-               # TODO: Duplicate with sliceProgressPanel, move to sliceRun.\r
-               self.sliceStepTimeFactor = {\r
-                       'start': 3.3713991642,\r
-                       'slice': 15.4984838963,\r
-                       'preface': 5.17178297043,\r
-                       'inset': 116.362634182,\r
-                       'fill': 215.702672005,\r
-                       'multiply': 21.9536788464,\r
-                       'speed': 12.759510994,\r
-                       'raft': 31.4580039978,\r
-                       'skirt': 19.3436040878,\r
-                       'skin': 1.0,\r
-                       'joris': 1.0,\r
-                       'comb': 23.7805759907,\r
-                       'cool': 27.148763895,\r
-                       'dimension': 90.4914340973\r
-               }\r
-               self.totalRunTimeFactor = 0\r
-               for v in self.sliceStepTimeFactor.itervalues():\r
-                       self.totalRunTimeFactor += v\r
-               \r
                self.sizer = wx.GridBagSizer(2, 2) \r
                self.statusText = wx.StaticText(self, -1, "Building: %s" % (resultFilename))\r
                self.progressGauge = wx.Gauge(self, -1)\r
@@ -689,13 +667,13 @@ class ProjectSliceProgressWindow(wx.Frame):
 \r
        def SetProgress(self, stepName, layer, maxLayer):\r
                if self.prevStep != stepName:\r
-                       self.totalDoneFactor += self.sliceStepTimeFactor[self.prevStep]\r
+                       self.totalDoneFactor += sliceRun.sliceStepTimeFactor[self.prevStep]\r
                        newTime = time.time()\r
                        #print "#####" + str(newTime-self.startTime) + " " + self.prevStep + " -> " + stepName\r
                        self.startTime = newTime\r
                        self.prevStep = stepName\r
                \r
-               progresValue = ((self.totalDoneFactor + self.sliceStepTimeFactor[stepName] * layer / maxLayer) / self.totalRunTimeFactor) * 10000\r
+               progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000\r
                self.progressGauge.SetValue(int(progresValue))\r
                self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")\r
        \r

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 4eed4712d1a5c90ef1967e0801cec1603d574af0..9e49e5b37bfda043cd51367fea15755aa99de720 100644 (file)
--- 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 edc304d317c553c0dbbfe58f86fb53ef84319982..4bc302a04f443f9fd2f8686f76af50c59d38853d 100644 (file)
--- 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":