GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-05 18:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better variable names

Browse Source
This commit is contained in:
daid 2012-05-16 14:00:53 +02:00
parent 92048ed255
commit ddd3883ad1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cura/gui/projectPlanner.py
View File

@ -568,13 +568,13 @@ class projectPlanner(wx.Frame):
action.filename = item.filename action.filename = item.filename
clearZ = max(clearZ, item.getMaximum().z * item.scale) clearZ = max(clearZ, item.getMaximum().z * item.scale)
action.clearZ = clearZ action.clearZ = clearZ
action.leaveForNext = False action.leaveResultForNextSlice = False
action.usePrevious = False action.usePreviousSlice = False
actionList.append(action) actionList.append(action)
if self.list.index(item) > 0 and item.isSameExceptForPosition(self.list[self.list.index(item)-1]): if self.list.index(item) > 0 and item.isSameExceptForPosition(self.list[self.list.index(item)-1]):
actionList[-2].leaveForNext = True actionList[-2].leaveResultForNextSlice = True
actionList[-1].usePrevious = True actionList[-1].usePreviousSlice = True
if item.profile != None: if item.profile != None:
profile.loadGlobalProfileFromString(oldProfile) profile.loadGlobalProfileFromString(oldProfile)
@ -869,14 +869,14 @@ class ProjectSliceProgressWindow(wx.Frame):
def OnRun(self): def OnRun(self):
resultFile = open(self.resultFilename, "w") resultFile = open(self.resultFilename, "w")
put = profile.setTempOverride put = profile.setTempOverride
self.progressLog = []
for action in self.actionList: for action in self.actionList:
wx.CallAfter(self.SetTitle, "Building: [%d/%d]" % (self.actionList.index(action) + 1, len(self.actionList))) wx.CallAfter(self.SetTitle, "Building: [%d/%d]" % (self.actionList.index(action) + 1, len(self.actionList)))
if not action.usePrevious: if not action.usePreviousSlice:
p = subprocess.Popen(action.sliceCmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) p = subprocess.Popen(action.sliceCmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
line = p.stdout.readline() line = p.stdout.readline()
maxValue = 1 maxValue = 1
self.progressLog = []
while(len(line) > 0): while(len(line) > 0):
line = line.rstrip() line = line.rstrip()
if line[0:9] == "Progress[" and line[-1:] == "]": if line[0:9] == "Progress[" and line[-1:] == "]":
@ -913,7 +913,7 @@ class ProjectSliceProgressWindow(wx.Frame):
resultFile.write(';PRINTNR:%d\n' % self.actionList.index(action)) resultFile.write(';PRINTNR:%d\n' % self.actionList.index(action))
profile.resetTempOverride() profile.resetTempOverride()
if not action.usePrevious: if not action.usePreviousSlice:
f = open(action.filename[: action.filename.rfind('.')] + "_export.project_tmp", "r") f = open(action.filename[: action.filename.rfind('.')] + "_export.project_tmp", "r")
data = f.read(4096) data = f.read(4096)
while data != '': while data != '':
@ -933,7 +933,7 @@ class ProjectSliceProgressWindow(wx.Frame):
resultFile.write(line) resultFile.write(line)
f.close() f.close()
if not action.leaveForNext: if not action.leaveResultForNextSlice:
os.remove(action.filename[: action.filename.rfind('.')] + "_export.project_tmp") os.remove(action.filename[: action.filename.rfind('.')] + "_export.project_tmp")
wx.CallAfter(self.progressGauge.SetValue, 10000) wx.CallAfter(self.progressGauge.SetValue, 10000)