q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add taskbar progress to both the project planner and normal slicing.

master
daid303 2012-10-10 13:43:44 +02:00
parent f6b472cc3b
commit 7ad7ec6873
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cura/gui/projectPlanner.py
View File

@ -22,6 +22,7 @@ from gui import icon
from gui import configBase from gui import configBase
from gui import printWindow from gui import printWindow
from gui import dropTarget from gui import dropTarget
from gui import taskbar
from util import validators from util import validators
from util import profile from util import profile
from util import util3d from util import util3d
@ -931,6 +932,7 @@ class ProjectSliceProgressWindow(wx.Frame):
progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000 progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000
self.progressGauge.SetValue(int(progresValue)) self.progressGauge.SetValue(int(progresValue))
self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]") self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
taskbar.setProgress(self, 10000 * self.progressGauge2.GetValue() + int(progresValue), 10000 * len(self.actionList))
def OnRun(self): def OnRun(self):
resultFile = open(self.resultFilename, "w") resultFile = open(self.resultFilename, "w")
@ -1058,6 +1060,7 @@ class ProjectSliceProgressWindow(wx.Frame):
self.Bind(wx.EVT_BUTTON, self.OnShowLog, self.logButton) self.Bind(wx.EVT_BUTTON, self.OnShowLog, self.logButton)
self.Layout() self.Layout()
self.Fit() self.Fit()
taskbar.setBusy(self, False)
def OnCopyToSD(self, e): def OnCopyToSD(self, e):
filename = os.path.basename(self.resultFilename) filename = os.path.basename(self.resultFilename)

3
Cura/gui/sliceProgessPanel.py
View File

@ -3,6 +3,7 @@ import __init__
import wx, sys, os, shutil, math, threading, subprocess, time, re import wx, sys, os, shutil, math, threading, subprocess, time, re
from gui import taskbar
from util import profile from util import profile
from util import sliceRun from util import sliceRun
from util import exporer from util import exporer
@ -112,6 +113,7 @@ class sliceProgessPanel(wx.Panel):
self.abort = True self.abort = True
if self.mainWindow.preview3d.loadReModelFiles(self.filelist): if self.mainWindow.preview3d.loadReModelFiles(self.filelist):
self.mainWindow.preview3d.setViewMode("GCode") self.mainWindow.preview3d.setViewMode("GCode")
taskbar.setBusy(self.GetParent(), False)
def SetProgress(self, stepName, layer, maxLayer): def SetProgress(self, stepName, layer, maxLayer):
if self.prevStep != stepName: if self.prevStep != stepName:
@ -123,6 +125,7 @@ class sliceProgessPanel(wx.Panel):
progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000 progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000
self.progressGauge.SetValue(int(progresValue)) self.progressGauge.SetValue(int(progresValue))
taskbar.setProgress(self.GetParent(), int(progresValue), self.progressGauge.GetRange())
self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]") self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
class WorkerThread(threading.Thread): class WorkerThread(threading.Thread):