From: daid303 Date: Wed, 9 Jan 2013 13:28:12 +0000 (+0100) Subject: Remove some commented old code. X-Git-Tag: 13.03~116 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4f30ca5aa1ff47c53d4ccd5edda5a3b33b806961;p=cura.git Remove some commented old code. --- diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py index c8541058..356a856c 100644 --- a/Cura/gui/projectPlanner.py +++ b/Cura/gui/projectPlanner.py @@ -1012,92 +1012,6 @@ class ProjectSliceProgressWindow(wx.Frame): self.progressLog.append(line) line = p.stderr.readline() self.returnCode = p.wait() - -# resultFile = open(self.resultFilename, "w") -# put = profile.setTempOverride -# self.progressLog = [] -# for action in self.actionList: -# wx.CallAfter(self.SetTitle, "Building: [%d/%d]" % (self.actionList.index(action) + 1, len(self.actionList))) -# if not action.usePreviousSlice: -# p = sliceRun.startSliceCommandProcess(action.sliceCmd) -# line = p.stdout.readline() -# -# maxValue = 1 -# while(len(line) > 0): -# line = line.rstrip() -# if line[0:9] == "Progress[" and line[-1:] == "]": -# progress = line[9:-1].split(":") -# if len(progress) > 2: -# maxValue = int(progress[2]) -# wx.CallAfter(self.SetProgress, progress[0], int(progress[1]), maxValue) -# else: -# self.progressLog.append(line) -# wx.CallAfter(self.statusText.SetLabel, line) -# if self.abort: -# p.terminate() -# wx.CallAfter(self.statusText.SetLabel, "Aborted by user.") -# resultFile.close() -# return -# line = p.stdout.readline() -# self.returnCode = p.wait() -# -# put('object_center_x', action.centerX - self.extruderOffset[action.extruder][0]) -# put('object_center_y', action.centerY - self.extruderOffset[action.extruder][1]) -# put('clear_z', action.clearZ) -# put('extruder', action.extruder) -# put('print_temperature', action.temperature) -# -# if action == self.actionList[0]: -# resultFile.write(';TYPE:CUSTOM\n') -# resultFile.write('T%d\n' % (action.extruder)) -# currentExtruder = action.extruder -# prevTemp = action.temperature -# startGCode = profile.getAlterationFileContents('start.gcode') -# startGCode = startGCode.replace('?filename?', 'Multiple files') -# resultFile.write(startGCode) -# else: -# #reset the extrusion length, and move to the next object center. -# resultFile.write(';TYPE:CUSTOM\n') -# if prevTemp != action.temperature and action.temperature > 0: -# resultFile.write('M104 S%d\n' % (int(action.temperature))) -# prevTemp = action.temperature -# resultFile.write(profile.getAlterationFileContents('nextobject.gcode')) -# resultFile.write(';PRINTNR:%d\n' % self.actionList.index(action)) -# profile.resetTempOverride() -# -# if not action.usePreviousSlice: -# f = open(sliceRun.getExportFilename(action.filename, "project_tmp"), "r") -# data = f.read(4096) -# while data != '': -# resultFile.write(data) -# data = f.read(4096) -# f.close() -# savedCenterX = action.centerX -# savedCenterY = action.centerY -# else: -# f = open(sliceRun.getExportFilename(action.filename, "project_tmp"), "r") -# for line in f: -# if line[0] != ';': -# if 'X' in line: -# line = self._adjustNumberInLine(line, 'X', action.centerX - savedCenterX) -# if 'Y' in line: -# line = self._adjustNumberInLine(line, 'Y', action.centerY - savedCenterY) -# resultFile.write(line) -# f.close() -# -# if not action.leaveResultForNextSlice: -# os.remove(sliceRun.getExportFilename(action.filename, "project_tmp")) -# -# wx.CallAfter(self.progressGauge.SetValue, 10000) -# self.totalDoneFactor = 0.0 -# wx.CallAfter(self.progressGauge2.SetValue, self.actionList.index(action) + 1) -# -# resultFile.write(';TYPE:CUSTOM\n') -# if len(self.actionList) > 1 and self.actionList[-1].clearZ > 1: -# #only move to higher Z if we have sliced more then 1 object. This solves the "move into print after printing" problem with the print-all-at-once option. -# 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()