From: daid303 <daid303@gmail.com>
Date: Tue, 8 Jan 2013 14:56:47 +0000 (+0100)
Subject: Better show invalid placement when objects are not placed on the printer bed.
X-Git-Tag: 13.03~121
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b55f4f062adb7fd87409acb777506410b9c73152;p=cura.git

Better show invalid placement when objects are not placed on the printer bed.
---

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 197e83dc..30412b79 100644
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -529,8 +529,9 @@ class projectPlanner(wx.Frame):
 				bestAllowedSize = i
 				bestArea = area
 		self._doAutoPlace(bestAllowedSize)
-		for item in self.list:
-			item.clampXY()
+		if not self.alwaysAutoPlace:
+			for item in self.list:
+				item.clampXY()
 		self.preview.Refresh()
 	
 	def _doAutoPlace(self, allowedSizeY):
@@ -825,6 +826,10 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 			item = self.parent.list[idx1]
 			iMin1 = (item.getMinimum() * item.scale) + numpy.array([item.centerX, item.centerY, 0]) - extraSizeMin - self.parent.extruderOffset[item.extruder]
 			iMax1 = (item.getMaximum() * item.scale) + numpy.array([item.centerX, item.centerY, 0]) + extraSizeMax - self.parent.extruderOffset[item.extruder]
+			if iMin1[0] < -self.parent.headSizeMin[0] or iMin1[1] < -self.parent.headSizeMin[1]:
+				item.validPlacement = False
+			if iMax1[0] > machineSize[0] + self.parent.headSizeMax[0] or iMax1[1] > machineSize[1] + self.parent.headSizeMax[1]:
+				item.validPlacement = False
 			for idx2 in xrange(0, idx1):
 				item2 = self.parent.list[idx2]
 				iMin2 = (item2.getMinimum() * item2.scale) + numpy.array([item2.centerX, item2.centerY, 0])
diff --git a/Cura/slice/__main__.py b/Cura/slice/__main__.py
index fef7c8f8..6d51a286 100644
--- a/Cura/slice/__main__.py
+++ b/Cura/slice/__main__.py
@@ -26,7 +26,6 @@ def main():
 		profile.loadGlobalProfileFromString(options.profile)
 	options.output = fixUTF8(options.output)
 
-	print args
 	resultFile = open(options.output, "w")
 	for idx in xrange(0, len(args), 2):
 		position = map(float, args[0].split(','))