From: daid303 <daid303@gmail.com>
Date: Tue, 4 Dec 2012 08:22:35 +0000 (+0100)
Subject: Switch the order of extruders every layer when printing with dual extrusion.
X-Git-Tag: 13.03~181
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c99eda4377c7f30a85fa175abef6e00ca061d1cb;p=cura.git

Switch the order of extruders every layer when printing with dual extrusion.
---

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 5e099b96..fce06a4b 100644
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -225,9 +225,11 @@ class WorkerThread(threading.Thread):
 		resultFile.write('T%d\n' % (currentExtruder))
 		layerNr = -1
 		hasLine = True
+		filesOrder = files[:]
 		while hasLine:
 			hasLine = False
-			for f in files:
+			filesOrder.reverse()
+			for f in filesOrder:
 				layerHasLine = False
 				for line in f:
 					hasLine = True
@@ -242,7 +244,7 @@ class WorkerThread(threading.Thread):
 						if nextExtruder != currentExtruder:
 							resultFile.write(';TYPE:CUSTOM\n')
 							profile.setTempOverride('extruder', nextExtruder)
-							resultFile.write(profile.getAlterationFileContents('switchExtruder.gcode'))
+							resultFile.write(profile.getAlterationFileContents('switchExtruder.gcode') + '\n')
 							profile.resetTempOverride()
 							currentExtruder = nextExtruder
 						layerHasLine = True
diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index d065abc1..6afeb4a9 100644
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -26,6 +26,7 @@ sliceStepTimeFactor = {
 	'dwindle': 1.0,
 	'comb': 23.7805759907,
 	'cool': 27.148763895,
+	'hop': 1.0,
 	'dimension': 90.4914340973
 }