Merge pull request #924 from Ultimaker/feature_machinesettings

Machine Settings plugin
This commit is contained in:
Jaime van Kessel 2016-08-17 09:34:11 +02:00 committed by GitHub
commit 6b4e0740a3
5 changed files with 614 additions and 4 deletions

View file

@ -240,9 +240,11 @@ class BuildVolume(SceneNode):
self._active_container_stack.propertyChanged.connect(self._onSettingPropertyChanged)
self._width = self._active_container_stack.getProperty("machine_width", "value")
machine_height = self._active_container_stack.getProperty("machine_height", "value")
if self._active_container_stack.getProperty("print_sequence", "value") == "one_at_a_time":
self._height = self._active_container_stack.getProperty("gantry_height", "value")
self._buildVolumeMessage()
self._height = min(self._active_container_stack.getProperty("gantry_height", "value"), machine_height)
if(self._height < machine_height):
self._buildVolumeMessage()
else:
self._height = self._active_container_stack.getProperty("machine_height", "value")
self._depth = self._active_container_stack.getProperty("machine_depth", "value")
@ -258,9 +260,11 @@ class BuildVolume(SceneNode):
rebuild_me = False
if setting_key == "print_sequence":
machine_height = self._active_container_stack.getProperty("machine_height", "value")
if Application.getInstance().getGlobalContainerStack().getProperty("print_sequence", "value") == "one_at_a_time":
self._height = self._active_container_stack.getProperty("gantry_height", "value")
self._buildVolumeMessage()
self._height = min(self._active_container_stack.getProperty("gantry_height", "value"), machine_height)
if(self._height < machine_height):
self._buildVolumeMessage()
else:
self._height = self._active_container_stack.getProperty("machine_height", "value")
rebuild_me = True