Updates after some testing with dual extrusion (loads of work to do)

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 3c87e22ae0f9b2452082809fec2768f9b059d1b6..35367b4c51b8bd6068056972e46ef2ff1ab91b01 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -64,6 +64,7 @@ class sliceProgessPanel(wx.Panel):
                        if self.filelist.index(filename) > 0:
                                profile.putProfileSetting('fan_enabled', 'False')
                                profile.putProfileSetting('skirt_line_count', '0')
+                               profile.putProfileSetting('machine_center_x', profile.getProfileSettingFloat('machine_center_y') + 22)
                        if len(self.filelist) > 1:
                                profile.putProfileSetting('add_start_end_gcode', 'False')
                                profile.putProfileSetting('gcode_extension', 'multi_extrude_tmp')
@@ -179,6 +180,7 @@ class WorkerThread(threading.Thread):
                        files.append(open(filename[:filename.rfind('.')]+'_export.multi_extrude_tmp', "r"))
                
                currentExtruder = 0
+               resultFile.write('T%d\n' % (currentExtruder))
                layerNr = -1
                hasLine = True
                while hasLine:
@@ -194,10 +196,10 @@ class WorkerThread(threading.Thread):
                                                resultFile.write(';LAYER:%d\n' % (layerNr))
                                                resultFile.write(';EXTRUDER:%d\n' % (nextExtruder))
                                                if nextExtruder != currentExtruder:
-                                                       resultFile.write("G1 E-2 F3000\n")
+                                                       resultFile.write("G1 E-5 F5000\n")
                                                        resultFile.write("T%d\n" % (nextExtruder))
-                                                       resultFile.write("G1 E2 F3000\n")
-                                                       resultFile.write("M92 E0\n")
+                                                       resultFile.write("G1 E5 F5000\n")
+                                                       resultFile.write("G92 E0\n")
                                                        currentExtruder = nextExtruder
                                                layerHasLine = True
                                        resultFile.write(line)

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index b6fb3ac75d6b49f9c217af85b6a142f74d91c2a9..419724cbb9107e1e774cdef9393a639c6d8079f0 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -34,7 +34,7 @@ profileDefaultSettings = {
        'bottom_layer_speed': '20',\r
        'cool_min_layer_time': '10',\r
        'fan_enabled': 'True',\r
-       'fan_layer': '0',\r
+       'fan_layer': '1',\r
        'fan_speed': '100',\r
        'model_scale': '1.0',\r
        'flip_x': 'False',\r