3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Renamed active containerstack to global containerstac

Browse source 
Cura-1278
This commit is contained in:
Jaime van Kessel 2016-05-10 10:34:02 +02:00
parent c0c24f1f70
commit dbd2c911ce
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/BuildVolume.py
View file

@ -145,7 +145,7 @@ class BuildVolume(SceneNode):
skirt_size = 0.0 skirt_size = 0.0
container_stack = Application.getInstance().getActiveContainerStack() container_stack = Application.getInstance().getGlobalContainerStack()
if container_stack: if container_stack:
skirt_size = self._getSkirtSize(container_stack) skirt_size = self._getSkirtSize(container_stack)
@ -160,7 +160,7 @@ class BuildVolume(SceneNode):
Application.getInstance().getController().getScene()._maximum_bounds = scale_to_max_bounds Application.getInstance().getController().getScene()._maximum_bounds = scale_to_max_bounds
def _onActiveContainerStackChanged(self): def _onActiveContainerStackChanged(self):
self._active_container_stack = Application.getInstance().getActiveContainerStack() self._active_container_stack = Application.getInstance().getGlobalContainerStack()
if self._active_container_stack: if self._active_container_stack:
self._width = self._active_container_stack.getValue("machine_width") self._width = self._active_container_stack.getValue("machine_width")
@ -176,7 +176,7 @@ class BuildVolume(SceneNode):
def _onSettingValueChanged(self, setting_key): def _onSettingValueChanged(self, setting_key):
if setting_key == "print_sequence": if setting_key == "print_sequence":
if Application.getInstance().getActiveContainerStack().getValue("print_sequence") == "one_at_a_time": if Application.getInstance().getGlobalContainerStack().getValue("print_sequence") == "one_at_a_time":
self._height = self._active_container_stack.getValue("gantry_height") self._height = self._active_container_stack.getValue("gantry_height")
else: else:
self._height = self._active_container_stack.getValue("machine_depth") self._height = self._active_container_stack.getValue("machine_depth")

4
plugins/SolidView/SolidView.py
View file

@ -34,10 +34,10 @@ class SolidView(View):
self._disabled_shader.setUniformValue("u_diffuseColor", [0.68, 0.68, 0.68, 1.0]) self._disabled_shader.setUniformValue("u_diffuseColor", [0.68, 0.68, 0.68, 1.0])
self._disabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0))) self._disabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0)))
if Application.getInstance().getActiveContainerStack(): if Application.getInstance().getGlobalContainerStack():
if Preferences.getInstance().getValue("view/show_overhang"): if Preferences.getInstance().getValue("view/show_overhang"):
angle = Application.getInstance().getActiveContainerStack().getValue("support_angle") angle = Application.getInstance().getGlobalContainerStack().getValue("support_angle")
if angle is not None: if angle is not None:
self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(90 - angle))) self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(90 - angle)))
else: else: