From bdaceed7fd1e012ff3238bf5be9b88f168e266ec Mon Sep 17 00:00:00 2001
From: Daid <daid303@gmail.com>
Date: Sun, 22 Apr 2012 23:45:19 +0200
Subject: [PATCH] Enable skirt in project planner if needed.

---
 Cura/alterations/nextobject.gcode |  2 +-
 Cura/gui/projectPlanner.py        | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Cura/alterations/nextobject.gcode b/Cura/alterations/nextobject.gcode
index e977dc64..be4ffc1a 100644
--- a/Cura/alterations/nextobject.gcode
+++ b/Cura/alterations/nextobject.gcode
@@ -3,7 +3,7 @@ G92 E0
 G1 Z{clear_z} E-5 F{max_z_speed}
 G92 E0
 G1 X{machine_center_x} Y{machine_center_y} F{travel_speed}
-G1 F200 E6.5
+G1 F200 E5.5
 G92 E0
 G1 Z0 F{max_z_speed}
 
diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index f0a49843..f5340ee0 100644
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -236,6 +236,13 @@ class projectPlanner(wx.Frame):
 		self.preview.Refresh()
 	
 	def _doAutoPlace(self, allowedSizeY):
+		extraSizeMin = self.headSizeMin
+		extraSizeMax = self.headSizeMax
+		if profile.getProfileSettingFloat('skirt_line_count') > 0:
+			skirtSize = profile.getProfileSettingFloat('skirt_line_count') * profile.calculateEdgeWidth() + profile.getProfileSettingFloat('skirt_gap')
+			extraSizeMin = extraSizeMin - util3d.Vector3(skirtSize, skirtSize, 0)
+			extraSizeMax = extraSizeMax + util3d.Vector3(skirtSize, skirtSize, 0)
+
 		posX = self.machineSize.x
 		posY = 0
 		minX = self.machineSize.x
@@ -248,11 +255,11 @@ class projectPlanner(wx.Frame):
 			item.centerX = posX + item.getMaximum().x * item.scale * dirX
 			item.centerY = posY + item.getMaximum().y * item.scale * dirY
 			if item.centerY + item.getSize().y >= allowedSizeY:
-				posX = minX - self.headSizeMax.x - 1
+				posX = minX - extraSizeMax.x - 1
 				posY = 0
 				item.centerX = posX + item.getMaximum().x * item.scale * dirX
 				item.centerY = posY + item.getMaximum().y * item.scale * dirY
-			posY += item.getSize().y  * item.scale * dirY + self.headSizeMin.y + 1
+			posY += item.getSize().y  * item.scale * dirY + extraSizeMin.y + 1
 			minX = min(minX, item.centerX - item.getSize().x * item.scale / 2)
 			minY = min(minY, item.centerY - item.getSize().y * item.scale / 2)
 			maxX = max(maxX, item.centerX + item.getSize().x * item.scale / 2)
@@ -274,7 +281,6 @@ class projectPlanner(wx.Frame):
 
 		put('model_multiply_x', '1')
 		put('model_multiply_y', '1')
-		put('skirt_line_count', '0')
 		put('enable_raft', 'False')
 		put('add_start_end_gcode', 'False')
 		put('gcode_extension', 'project_tmp')
@@ -505,6 +511,12 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 	def OnDraw(self):
 		machineSize = self.parent.machineSize
 		opengl.DrawMachine(machineSize)
+		extraSizeMin = self.parent.headSizeMin
+		extraSizeMax = self.parent.headSizeMax
+		if profile.getProfileSettingFloat('skirt_line_count') > 0:
+			skirtSize = profile.getProfileSettingFloat('skirt_line_count') * profile.calculateEdgeWidth() + profile.getProfileSettingFloat('skirt_gap')
+			extraSizeMin = extraSizeMin - util3d.Vector3(skirtSize, skirtSize, 0)
+			extraSizeMax = extraSizeMax + util3d.Vector3(skirtSize, skirtSize, 0)
 
 		for item in self.parent.list:
 			item.validPlacement = True
@@ -512,8 +524,8 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 		
 		for idx1 in xrange(0, len(self.parent.list)):
 			item = self.parent.list[idx1]
-			iMin1 = item.getMinimum() * item.scale + util3d.Vector3(item.centerX, item.centerY, 0) - self.parent.headSizeMin
-			iMax1 = item.getMaximum() * item.scale + util3d.Vector3(item.centerX, item.centerY, 0) + self.parent.headSizeMax
+			iMin1 = item.getMinimum() * item.scale + util3d.Vector3(item.centerX, item.centerY, 0) - extraSizeMin
+			iMax1 = item.getMaximum() * item.scale + util3d.Vector3(item.centerX, item.centerY, 0) + extraSizeMax
 			for idx2 in xrange(0, idx1):
 				item2 = self.parent.list[idx2]
 				iMin2 = item2.getMinimum() * item2.scale + util3d.Vector3(item2.centerX, item2.centerY, 0)
@@ -561,8 +573,8 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 			
 			vMin = item.getMinimum() * item.scale
 			vMax = item.getMaximum() * item.scale
-			vMinHead = vMin - self.parent.headSizeMin
-			vMaxHead = vMax + self.parent.headSizeMax
+			vMinHead = vMin - extraSizeMin
+			vMaxHead = vMax + extraSizeMax
 
 			glDisable(GL_LIGHTING)
 
-- 
2.30.2