From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Tue, 18 Aug 2015 21:06:30 +0000 (-0400)
Subject: Ignore object_sink setting when in simple mode.
X-Git-Tag: lulzbot-15.02.1-2.02~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4a4d8b94f463294a540b7d82c317ea6328ce43f4;p=cura.git

Ignore object_sink setting when in simple mode.

Fixes T200
---

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index d1356c03..7ab17037 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -634,9 +634,14 @@ class SceneView(openglGui.glGuiPanel):
 		self._scene.merge(self._selectedObj, self._focusObj)
 		self.sceneUpdated()
 
-	def sceneUpdated(self):
+	def getObjectSink(self):
+		if self._isSimpleMode:
+			return float(profile.settingsDictionary["object_sink"].getDefault())
+		else:
+			return profile.getProfileSettingFloat("object_sink")
 
-		objectSink = profile.getProfileSettingFloat("object_sink")
+	def sceneUpdated(self):
+		objectSink = self.getObjectSink()
 		if self._lastObjectSink != objectSink:
 			self._lastObjectSink = objectSink
 			self._scene.updateHeadSize()
@@ -1331,7 +1336,7 @@ class SceneView(openglGui.glGuiPanel):
 	def _renderObject(self, obj, brightness = 0, addSink = True):
 		glPushMatrix()
 		if addSink:
-			glTranslate(obj.getPosition()[0], obj.getPosition()[1], obj.getSize()[2] / 2 - profile.getProfileSettingFloat('object_sink'))
+			glTranslate(obj.getPosition()[0], obj.getPosition()[1], obj.getSize()[2] / 2 - self.getObjectSink())
 		else:
 			glTranslate(obj.getPosition()[0], obj.getPosition()[1], obj.getSize()[2] / 2)
 
@@ -1525,7 +1530,7 @@ class SceneView(openglGui.glGuiPanel):
 			return [0.0, 0.0, 0.0]
 		pos = self._selectedObj.getPosition()
 		size = self._selectedObj.getSize()
-		return [pos[0], pos[1], size[2]/2 - profile.getProfileSettingFloat('object_sink')]
+		return [pos[0], pos[1], size[2]/2 - self.getObjectSink()]
 
 	def getObjectBoundaryCircle(self):
 		if self._selectedObj is None:
diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index 2ad49b20..8ffedcba 100644
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -159,6 +159,8 @@ class Scene(object):
 		yMax = profile.getMachineSettingFloat('extruder_head_size_max_y')
 		gantryHeight = profile.getMachineSettingFloat('extruder_head_size_height')
 		objectSink = profile.getProfileSettingFloat("object_sink")
+		if profile.getPreference('startMode') == 'Simple':
+			objectSink = float(profile.settingsDictionary["object_sink"].getDefault())
 
 		self._leftToRight = xMin < xMax
 		self._frontToBack = yMin < yMax
@@ -287,6 +289,8 @@ class Scene(object):
 
 	def checkPlatform(self, obj):
 		objectSink = profile.getProfileSettingFloat("object_sink")
+		if profile.getPreference('startMode') == 'Simple':
+			objectSink = float(profile.settingsDictionary["object_sink"].getDefault())
 
 		area = obj._printAreaHull + obj.getPosition()
 		if obj.getSize()[2] - objectSink > self._machineSize[2]: