From: daid303 Date: Fri, 4 Jan 2013 20:37:11 +0000 (+0100) Subject: Huge update to put all the code for slicing at the slicer, and not in the gui. Step... X-Git-Tag: 13.03~127 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dff73d3545103c1de0223488c63eb6333f06301b;p=cura.git Huge update to put all the code for slicing at the slicer, and not in the gui. Step 1, still need to fix the project planner. --- diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py index 5cb01f2d..b73f1e2d 100644 --- a/Cura/gui/sliceProgessPanel.py +++ b/Cura/gui/sliceProgessPanel.py @@ -44,21 +44,8 @@ class sliceProgessPanel(wx.Panel): self.startTime = time.time() if profile.getPreference('save_profile') == 'True': profile.saveGlobalProfile(self.filelist[0][: self.filelist[0].rfind('.')] + "_profile.ini") - cmdList = [] - for filename in self.filelist: - idx = self.filelist.index(filename) - #print filename, idx - if idx > 0: - profile.setTempOverride('fan_enabled', 'False') - profile.setTempOverride('skirt_line_count', '0') - profile.setTempOverride('object_center_x', profile.getPreferenceFloat('machine_width') / 2 - profile.getPreferenceFloat('extruder_offset_x%d' % (idx))) - profile.setTempOverride('object_center_y', profile.getPreferenceFloat('machine_depth') / 2 - profile.getPreferenceFloat('extruder_offset_y%d' % (idx))) - profile.setTempOverride('alternative_center', self.filelist[0]) - if len(self.filelist) > 1: - profile.setTempOverride('add_start_end_gcode', 'False') - profile.setTempOverride('gcode_extension', 'multi_extrude_tmp') - cmdList.append(sliceRun.getSliceCommand(filename)) - profile.resetTempOverride() + center = profile.getMachineCenterCoords() + cmdList = [sliceRun.getSliceCommand(sliceRun.getExportFilename(self.filelist[0]), ['|'.join(self.filelist)], [center])] self.thread = WorkerThread(self, filelist, cmdList) def OnAbort(self, e): @@ -173,7 +160,8 @@ class WorkerThread(threading.Thread): line = p.stdout.readline() self.progressLog = [] maxValue = 1 - while(len(line) > 0): + starttime = time.time() + while len(line) > 0: line = line.rstrip() if line[0:9] == "Progress[" and line[-1:] == "]": progress = line[9:-1].split(":") @@ -181,7 +169,7 @@ class WorkerThread(threading.Thread): maxValue = int(progress[2]) wx.CallAfter(self.notifyWindow.SetProgress, progress[0], int(progress[1]), maxValue) else: - self.progressLog.append(line) + self.progressLog.append("%0.2f: %s" % (time.time() - starttime, line)) wx.CallAfter(self.notifyWindow.statusText.SetLabel, line) if self.notifyWindow.abort: p.terminate() @@ -189,79 +177,25 @@ class WorkerThread(threading.Thread): return line = p.stdout.readline() line = p.stderr.readline() - while(len(line) > 0): + while len(line) > 0: line = line.rstrip() self.progressLog.append(line) line = p.stderr.readline() self.returnCode = p.wait() self.fileIdx += 1 if self.fileIdx == len(self.cmdList): - if len(self.filelist) > 1: - self._stitchMultiExtruder() gcodeFilename = sliceRun.getExportFilename(self.filelist[0]) gcodefile = open(gcodeFilename, "a") for logLine in self.progressLog: if logLine.startswith('Model error('): gcodefile.write(';%s\n' % (logLine)) gcodefile.close() - wx.CallAfter(self.notifyWindow.statusText.SetLabel, "Running plugins") - ret = profile.runPostProcessingPlugins(gcodeFilename) - if ret != None: - self.progressLog.append(ret) self.gcode = gcodeInterpreter.gcode() self.gcode.load(gcodeFilename) profile.replaceGCodeTags(gcodeFilename, self.gcode) wx.CallAfter(self.notifyWindow.OnSliceDone, self) else: self.run() - - def _stitchMultiExtruder(self): - files = [] - resultFile = open(sliceRun.getExportFilename(self.filelist[0]), "w") - resultFile.write(';TYPE:CUSTOM\n') - resultFile.write(profile.getAlterationFileContents('start.gcode')) - for filename in self.filelist: - if os.path.isfile(sliceRun.getExportFilename(filename, 'multi_extrude_tmp')): - files.append(open(sliceRun.getExportFilename(filename, 'multi_extrude_tmp'), "r")) - else: - return - - currentExtruder = 0 - resultFile.write('T%d\n' % (currentExtruder)) - layerNr = -1 - hasLine = True - filesOrder = files[:] - while hasLine: - hasLine = False - filesOrder.reverse() - for f in filesOrder: - layerHasLine = False - for line in f: - hasLine = True - if line.startswith(';LAYER:'): - break - if 'Z' in line: - lastZ = float(re.search('Z([^\s]+)', line).group(1)) - if not layerHasLine: - nextExtruder = files.index(f) - resultFile.write(';LAYER:%d\n' % (layerNr)) - resultFile.write(';EXTRUDER:%d\n' % (nextExtruder)) - if nextExtruder != currentExtruder: - resultFile.write(';TYPE:CUSTOM\n') - profile.setTempOverride('extruder', nextExtruder) - resultFile.write(profile.getAlterationFileContents('switchExtruder.gcode') + '\n') - profile.resetTempOverride() - currentExtruder = nextExtruder - layerHasLine = True - resultFile.write(line) - layerNr += 1 - for f in files: - f.close() - for filename in self.filelist: - os.remove(sliceRun.getExportFilename(filename, 'multi_extrude_tmp')) - resultFile.write(';TYPE:CUSTOM\n') - resultFile.write(profile.getAlterationFileContents('end.gcode')) - resultFile.close() class LogWindow(wx.Frame): def __init__(self, logText): diff --git a/Cura/gui/tools/batchRun.py b/Cura/gui/tools/batchRun.py index 0b545d2e..bf71b557 100644 --- a/Cura/gui/tools/batchRun.py +++ b/Cura/gui/tools/batchRun.py @@ -88,8 +88,9 @@ class batchRunWindow(wx.Frame): def OnSlice(self, e): sliceCmdList = [] + center = profile.getMachineCenterCoords() for filename in self.list: - sliceCmdList.append(sliceRun.getSliceCommand(filename)) + sliceCmdList.append(sliceRun.getSliceCommand(sliceRun.getExportFilename(filename), [filename], [center])) bspw = BatchSliceProgressWindow(self.list[:], sliceCmdList) bspw.Centre() bspw.Show(True) diff --git a/Cura/cura_sf/__init__.py b/Cura/slice/__init__.py similarity index 100% rename from Cura/cura_sf/__init__.py rename to Cura/slice/__init__.py diff --git a/Cura/cura_sf/SkeinforgeVersion b/Cura/slice/cura_sf/SkeinforgeVersion similarity index 100% rename from Cura/cura_sf/SkeinforgeVersion rename to Cura/slice/cura_sf/SkeinforgeVersion diff --git a/Cura/cura_sf/fabmetheus_utilities/__init__.py b/Cura/slice/cura_sf/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/__init__.py rename to Cura/slice/cura_sf/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/archive.py b/Cura/slice/cura_sf/fabmetheus_utilities/archive.py similarity index 98% rename from Cura/cura_sf/fabmetheus_utilities/archive.py rename to Cura/slice/cura_sf/fabmetheus_utilities/archive.py index 5ec89716..5a770fbe 100644 --- a/Cura/cura_sf/fabmetheus_utilities/archive.py +++ b/Cura/slice/cura_sf/fabmetheus_utilities/archive.py @@ -397,9 +397,6 @@ def writeFileMessageEnd(end, fileName, fileText, message): def writeFileText(fileName, fileText, writeMode='w+'): 'Write a text to a file.' - try: - file = open(fileName, writeMode) - file.write(fileText) - file.close() - except IOError: - print('The file ' + fileName + ' can not be written to.') + file = open(fileName, writeMode) + file.write(fileText) + file.close() diff --git a/Cura/cura_sf/fabmetheus_utilities/euclidean.py b/Cura/slice/cura_sf/fabmetheus_utilities/euclidean.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/euclidean.py rename to Cura/slice/cura_sf/fabmetheus_utilities/euclidean.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py b/Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py rename to Cura/slice/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py diff --git a/Cura/cura_sf/fabmetheus_utilities/gcodec.py b/Cura/slice/cura_sf/fabmetheus_utilities/gcodec.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/gcodec.py rename to Cura/slice/cura_sf/fabmetheus_utilities/gcodec.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/circle.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/circle.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/gear.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/gear.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/grid.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/grid.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/line.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/line.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/peg.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/peg.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/solid.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/solid.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/square.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/square.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/text.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/creation/text.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/example.csv b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/example.csv similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/example.csv rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/example.csv diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/cube.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/cube.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/difference.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/difference.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/group.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/group.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/union.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/solids/union.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/_print.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/_print.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/class.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/class.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/elif.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/elif.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/else.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/else.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/for.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/for.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/function.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/function.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/if.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/if.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/return.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/return.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/statement.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/statement.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/while.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry/statements/while.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/__init__.py b/Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/__init__.py rename to Cura/slice/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py diff --git a/Cura/cura_sf/fabmetheus_utilities/intercircle.py b/Cura/slice/cura_sf/fabmetheus_utilities/intercircle.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/intercircle.py rename to Cura/slice/cura_sf/fabmetheus_utilities/intercircle.py diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/slice/cura_sf/fabmetheus_utilities/settings.py similarity index 99% rename from Cura/cura_sf/fabmetheus_utilities/settings.py rename to Cura/slice/cura_sf/fabmetheus_utilities/settings.py index 078acf18..7bbb739e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/settings.py +++ b/Cura/slice/cura_sf/fabmetheus_utilities/settings.py @@ -11,7 +11,7 @@ import types import math from Cura.util import profile -from Cura.cura_sf.fabmetheus_utilities import archive +from Cura.slice.cura_sf.fabmetheus_utilities import archive def DEFSET(setting): return setting.value @@ -386,7 +386,7 @@ def getProfileInformation(): 'Retraction_Distance_millimeters': lambda setting: profile.getProfileSettingFloat('retraction_amount') if profile.getProfileSetting('retraction_enable') == 'True' else 0, 'Restart_Extra_Distance_millimeters': storedSettingFloat('retraction_extra'), },'alteration': { - 'Activate_Alteration': storedSetting('add_start_end_gcode'), + 'Activate_Alteration': "False", 'Name_of_End_File': "end.gcode", 'Name_of_Start_File': "start.gcode", 'Remove_Redundant_Mcode': "True", diff --git a/Cura/cura_sf/fabmetheus_utilities/svg_reader.py b/Cura/slice/cura_sf/fabmetheus_utilities/svg_reader.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/svg_reader.py rename to Cura/slice/cura_sf/fabmetheus_utilities/svg_reader.py diff --git a/Cura/cura_sf/fabmetheus_utilities/svg_writer.py b/Cura/slice/cura_sf/fabmetheus_utilities/svg_writer.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/svg_writer.py rename to Cura/slice/cura_sf/fabmetheus_utilities/svg_writer.py diff --git a/Cura/cura_sf/fabmetheus_utilities/templates/canvas_template.svg b/Cura/slice/cura_sf/fabmetheus_utilities/templates/canvas_template.svg similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/templates/canvas_template.svg rename to Cura/slice/cura_sf/fabmetheus_utilities/templates/canvas_template.svg diff --git a/Cura/cura_sf/fabmetheus_utilities/templates/layer_template.svg b/Cura/slice/cura_sf/fabmetheus_utilities/templates/layer_template.svg similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/templates/layer_template.svg rename to Cura/slice/cura_sf/fabmetheus_utilities/templates/layer_template.svg diff --git a/Cura/cura_sf/fabmetheus_utilities/vector3.py b/Cura/slice/cura_sf/fabmetheus_utilities/vector3.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/vector3.py rename to Cura/slice/cura_sf/fabmetheus_utilities/vector3.py diff --git a/Cura/cura_sf/fabmetheus_utilities/vector3index.py b/Cura/slice/cura_sf/fabmetheus_utilities/vector3index.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/vector3index.py rename to Cura/slice/cura_sf/fabmetheus_utilities/vector3index.py diff --git a/Cura/cura_sf/fabmetheus_utilities/version.txt b/Cura/slice/cura_sf/fabmetheus_utilities/version.txt similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/version.txt rename to Cura/slice/cura_sf/fabmetheus_utilities/version.txt diff --git a/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py b/Cura/slice/cura_sf/fabmetheus_utilities/xml_simple_reader.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py rename to Cura/slice/cura_sf/fabmetheus_utilities/xml_simple_reader.py diff --git a/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py b/Cura/slice/cura_sf/fabmetheus_utilities/xml_simple_writer.py similarity index 100% rename from Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py rename to Cura/slice/cura_sf/fabmetheus_utilities/xml_simple_writer.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py b/Cura/slice/cura_sf/skeinforge_application/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py similarity index 99% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py index 4ac2a731..cf3d2f94 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py +++ b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py @@ -168,7 +168,7 @@ class AlterationSkein(object): def addFromUpperLowerFile(self, fileName): "Add lines of text from the fileName or the lowercase fileName, if there is no file by the original fileName in the directory." - alterationFileLines = map(lambda l: l.replace('?filename?', self.fileName), settings.getAlterationFileLines(fileName)) + alterationFileLines = map(lambda l: l.replace('?filename?', self.fileName.encode('ascii', 'replace')), settings.getAlterationFileLines(fileName)) self.distanceFeedRate.addLinesSetAbsoluteDistanceMode(alterationFileLines) def getCraftedGcode(self, gcodeText, repository, fileName): diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py similarity index 92% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py index b6ff2239..d640f208 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py +++ b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py @@ -256,7 +256,7 @@ def sendOutputTo(outputTo, text): return archive.writeFileText(outputTo, text) -def writeOutput(fileName, shouldAnalyze=True): +def getOutput(fileName): 'Export a gcode linear move file.' if fileName == '': return None @@ -264,51 +264,33 @@ def writeOutput(fileName, shouldAnalyze=True): settings.getReadRepository(repository) startTime = time.time() print('File ' + archive.getSummarizedFileName(fileName.encode('ascii', 'replace')) + ' is being chain exported.') - fileNameSuffix = fileName[: fileName.rfind('.')] - if repository.addExportSuffix.value: - fileNameSuffix += '_export' gcodeText = gcodec.getGcodeFileText(fileName, '') procedures = skeinforge_craft.getProcedures('export', gcodeText) gcodeText = skeinforge_craft.getChainTextFromProcedures(fileName, procedures[: -1], gcodeText) if gcodeText == '': return None - if repository.addProfileExtension.value: - fileNameSuffix += '.' + getFirstValue(gcodeText, '(') - if repository.addDescriptiveExtension.value: - fileNameSuffix += getDescriptiveExtension(gcodeText) - if repository.addTimestampExtension.value: - fileNameSuffix += '.' + getFirstValue(gcodeText, '(') - fileNameSuffix += '.' + repository.fileExtension.value fileNamePenultimate = fileName[: fileName.rfind('.')] + '_penultimate.gcode' - filePenultimateWritten = False if repository.savePenultimateGcode.value: archive.writeFileText(fileNamePenultimate, gcodeText) - filePenultimateWritten = True print('The penultimate file is saved as ' + archive.getSummarizedFileName(fileNamePenultimate)) exportGcode = getCraftedTextFromText(gcodeText, repository) - window = None - if shouldAnalyze and repository.analyzeGcode.value: - window = skeinforge_analyze.writeOutput(fileName, fileNamePenultimate, fileNameSuffix, filePenultimateWritten, gcodeText) replaceableExportGcode = None selectedPluginModule = getSelectedPluginModule(repository.exportPlugins) - if selectedPluginModule == None: + if selectedPluginModule is None: replaceableExportGcode = exportGcode else: if selectedPluginModule.globalIsReplaceable: replaceableExportGcode = selectedPluginModule.getOutput(exportGcode) - else: - selectedPluginModule.writeOutput(fileNameSuffix, exportGcode) - if replaceableExportGcode != None: + #else: + # selectedPluginModule.writeOutput(outputFilename, exportGcode) + if replaceableExportGcode is not None: replaceableExportGcode = getReplaceableExportGcode(repository.nameOfReplaceFile.value, replaceableExportGcode) - archive.writeFileText( fileNameSuffix, replaceableExportGcode ) - print('The exported file is saved as ' + archive.getSummarizedFileName(fileNameSuffix)) if repository.alsoSendOutputTo.value != '': if replaceableExportGcode == None: replaceableExportGcode = selectedPluginModule.getOutput(exportGcode) sendOutputTo(repository.alsoSendOutputTo.value, replaceableExportGcode) print('It took %s to export the file.' % euclidean.getDurationString(time.time() - startTime)) - return window - + return replaceableExportGcode class ExportRepository(object): 'A class to handle the export settings.' @@ -318,10 +300,6 @@ class ExportRepository(object): self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Export', self, '') self.openWikiManualHelpPage = settings.HelpPage().getOpenFromAbsolute('http://fabmetheus.crsndoo.com/wiki/index.php/Skeinforge_Export') self.activateExport = settings.BooleanSetting().getFromValue('Activate Export', self, True) - self.addDescriptiveExtension = settings.BooleanSetting().getFromValue('Add Descriptive Extension', self, False) - self.addExportSuffix = settings.BooleanSetting().getFromValue('Add Export Suffix', self, True) - self.addProfileExtension = settings.BooleanSetting().getFromValue('Add Profile Extension', self, False) - self.addTimestampExtension = settings.BooleanSetting().getFromValue('Add Timestamp Extension', self, False) self.alsoSendOutputTo = settings.StringSetting().getFromValue('Also Send Output To:', self, '') self.analyzeGcode = settings.BooleanSetting().getFromValue('Analyze Gcode', self, True) self.commentChoice = settings.MenuButtonDisplay().getFromName('Comment Choice:', self) diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/help.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/help.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py diff --git a/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py b/Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py similarity index 100% rename from Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py rename to Cura/slice/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py diff --git a/Cura/util/profile.py b/Cura/util/profile.py index f27227a6..26a736c2 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -76,7 +76,6 @@ profileDefaultSettings = { 'object_center_x': '-1', 'object_center_y': '-1', - 'add_start_end_gcode': 'True', 'gcode_extension': 'gcode', 'alternative_center': '', 'clear_z': '0.0', @@ -423,6 +422,9 @@ def calculateSolidLayerCount(): solidThickness = getProfileSettingFloat('solid_layer_thickness') return int(math.ceil(solidThickness / layerHeight - 0.0001)) +def getMachineCenterCoords(): + return (getPreferenceFloat('machine_width') / 2, getPreferenceFloat('machine_depth') / 2) + ######################################################### ## Alteration file functions ######################################################### @@ -536,7 +538,7 @@ def getAlterationFileContents(filename): clearTempOverride('extruder') else: alterationContents = '' - return unicode(prefix + re.sub("(.)\{([^\}]*)\}", replaceTagMatch, alterationContents).rstrip() + '\n' + postfix).strip().encode('utf-8') + return unicode(prefix + re.sub("(.)\{([^\}]*)\}", replaceTagMatch, alterationContents).rstrip() + '\n' + postfix).strip().encode('utf-8') + '\n' ###### PLUGIN ##### diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py index 4f71aab9..4b50ef58 100644 --- a/Cura/util/sliceRun.py +++ b/Cura/util/sliceRun.py @@ -5,12 +5,6 @@ import os import subprocess import sys -if not hasattr(sys, 'frozen'): - cura_sf_path = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../cura_sf/")) - if cura_sf_path not in sys.path: - sys.path.append(cura_sf_path) - from Cura.cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft - from Cura.util import resources from Cura.util import profile @@ -58,52 +52,7 @@ def getPyPyExe(): pypyExe = os.path.join(p, exeName) if os.path.exists(pypyExe): return pypyExe - return False - -def getSlic3rExe(): - "Return the path to the pypy executable if we can find it. Else return False" - if platform.system() == "Windows": - exeName = "slic3r.exe" - slic3rExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../Slic3r/bin/slic3r.exe")); - else: - exeName = "slic3r" - slic3rExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../Slic3r/bin/slic3r")); - if os.path.exists(slic3rExe): - return slic3rExe - - path = os.environ['PATH'] - paths = path.split(os.pathsep) - for p in paths: - slic3rExe = os.path.join(p, exeName) - if os.path.exists(slic3rExe): - return slic3rExe - return False - -def runSlice(fileNames): - "Run the slicer on the files. If we are running with PyPy then just do the slicing action. If we are running as Python, try to find pypy." - pypyExe = getPyPyExe() - for fileName in fileNames: - if fileName.startswith("#UTF8#"): - fileName = unicode(fileName[6:], "utf-8") - if platform.python_implementation() == "PyPy": - skeinforge_craft.writeOutput(fileName) - elif pypyExe == False: - if not hasattr(sys, 'frozen'): - print("************************************************") - print("* Failed to find pypy, so slicing with python! *") - print("************************************************") - skeinforge_craft.writeOutput(fileName) - print("************************************************") - print("* Failed to find pypy, so sliced with python! *") - print("************************************************") - else: - print("******************************************************************") - print("* Failed to find pypy, we need pypy to slice with a frozen build *") - print("* Place pypy in the same directory as Cura so Cura can find it. *") - print("******************************************************************") - sys.exit(1) - else: - subprocess.call(getSliceCommand(fileName)) + return None def getExportFilename(filename, ext = "gcode"): return "%s.%s" % (filename[: filename.rfind('.')], ext) @@ -114,77 +63,24 @@ def getShortFilename(filename): filename = filename[: filename.rfind('.')] return filename[:8] + ext[:2] -def getSliceCommand(filename): - if profile.getPreference('slicer').startswith('Slic3r') and getSlic3rExe() != False: - slic3rExe = getSlic3rExe() - if slic3rExe == False: - return False - cmd = [slic3rExe, - '--output-filename-format', '[input_filename_base].gcode', - '--nozzle-diameter', str(profile.calculateEdgeWidth()), - '--print-center', '%s,%s' % (profile.getPreferenceFloat('machine_width') / 2, profile.getPreferenceFloat('machine_depth') / 2), - '--z-offset', '0', - '--gcode-flavor', 'reprap', - '--gcode-comments', - '--filament-diameter', profile.getProfileSetting('filament_diameter'), - '--extrusion-multiplier', str(1.0 / float(profile.getProfileSetting('filament_density'))), - '--temperature', profile.getProfileSetting('print_temperature'), - '--travel-speed', profile.getProfileSetting('travel_speed'), - '--perimeter-speed', profile.getProfileSetting('print_speed'), - '--small-perimeter-speed', profile.getProfileSetting('print_speed'), - '--infill-speed', profile.getProfileSetting('print_speed'), - '--solid-infill-speed', profile.getProfileSetting('print_speed'), - '--bridge-speed', profile.getProfileSetting('print_speed'), - '--bottom-layer-speed-ratio', str(float(profile.getProfileSetting('bottom_layer_speed')) / float(profile.getProfileSetting('print_speed'))), - '--layer-height', profile.getProfileSetting('layer_height'), - '--first-layer-height-ratio', '1.0', - '--infill-every-layers', '1', - '--perimeters', str(profile.calculateLineCount()), - '--solid-layers', str(profile.calculateSolidLayerCount()), - '--fill-density', str(float(profile.getProfileSetting('fill_density'))/100), - '--fill-angle', '45', - '--fill-pattern', 'rectilinear', #rectilinear line concentric hilbertcurve archimedeanchords octagramspiral - '--solid-fill-pattern', 'rectilinear', - '--start-gcode', profile.getAlterationFilePath('start.gcode'), - '--end-gcode', profile.getAlterationFilePath('end.gcode'), - '--retract-length', profile.getProfileSetting('retraction_amount'), - '--retract-speed', str(int(float(profile.getProfileSetting('retraction_speed')))), - '--retract-restart-extra', profile.getProfileSetting('retraction_extra'), - '--retract-before-travel', profile.getProfileSetting('retraction_min_travel'), - '--retract-lift', '0', - '--slowdown-below-layer-time', profile.getProfileSetting('cool_min_layer_time'), - '--min-print-speed', profile.getProfileSetting('cool_min_feedrate'), - '--skirts', profile.getProfileSetting('skirt_line_count'), - '--skirt-distance', str(int(float(profile.getProfileSetting('skirt_gap')))), - '--skirt-height', '1', - '--scale', profile.getProfileSetting('model_scale'), - '--rotate', profile.getProfileSetting('model_rotate_base'), - '--duplicate-x', profile.getProfileSetting('model_multiply_x'), - '--duplicate-y', profile.getProfileSetting('model_multiply_y'), - '--duplicate-distance', '10'] - if profile.getProfileSetting('support') != 'None': - cmd.extend(['--support-material']) - cmd.extend([filename]) - return cmd - else: - pypyExe = getPyPyExe() - if pypyExe == False: - pypyExe = sys.executable - - #In case we have a frozen exe, then argv[0] points to the executable, but we want to give pypy a real script file. - #if hasattr(sys, 'frozen'): - # mainScriptFile = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../..", "cura_sf.zip")) - #else: - # mainScriptFile = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", os.path.split(sys.argv[0])[1])) - cmd = [pypyExe, '-m', 'Cura.cura', '-p', profile.getGlobalProfileString(), '-s'] - if platform.system() == "Windows": - try: - cmd.append(str(filename)) - except UnicodeEncodeError: - cmd.append("#UTF8#" + filename.encode("utf-8")) - else: - cmd.append(filename) - return cmd +def getSliceCommand(outputfilename, filenames, positions): + pypyExe = getPyPyExe() + if pypyExe is None: + pypyExe = sys.executable + cmd = [pypyExe, '-m', 'Cura.slice', '-p', profile.getGlobalProfileString(), '-o'] + try: + cmd.append(str(outputfilename)) + except UnicodeEncodeError: + cmd.append("#UTF8#" + outputfilename.encode("utf-8")) + for idx in xrange(0, len(filenames)): + filename = filenames[idx] + position = positions[idx] + cmd.append("%f,%f" % (position[0], position[1])) + try: + cmd.append(str(filename)) + except UnicodeEncodeError: + cmd.append("#UTF8#" + filename.encode("utf-8")) + return cmd def startSliceCommandProcess(cmdList): kwargs = {}