Fixed prime location due to definition -> stack change.

This commit is contained in:
Jack Ha 2016-07-19 11:04:29 +02:00
parent 0bf037a160
commit a9aa46e32b

View file

@ -19,6 +19,7 @@ from UM.View.GL.OpenGL import OpenGL
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")
import numpy import numpy
import copy
# Setting for clearance around the prime # Setting for clearance around the prime
@ -283,17 +284,16 @@ class BuildVolume(SceneNode):
if not self._active_container_stack: if not self._active_container_stack:
return return
disallowed_areas = self._active_container_stack.getProperty("machine_disallowed_areas", "value") disallowed_areas = copy.deepcopy(
self._active_container_stack.getProperty("machine_disallowed_areas", "value"))
areas = [] areas = []
# Add extruder prime locations as disallowed areas. # Add extruder prime locations as disallowed areas.
# Probably needs some rework after coordinate system change. # Probably needs some rework after coordinate system change.
machine_definition = self._active_container_stack.getBottom()
current_machine_id = machine_definition.getId()
extruder_manager = ExtruderManager.getInstance() extruder_manager = ExtruderManager.getInstance()
extruders = extruder_manager.getMachineExtruders(current_machine_id) extruders = extruder_manager.getMachineExtruders(self._active_container_stack.getId())
machine_width = machine_definition.getProperty("machine_width", "value") machine_width = self._active_container_stack.getProperty("machine_width", "value")
machine_depth = machine_definition.getProperty("machine_depth", "value") machine_depth = self._active_container_stack.getProperty("machine_depth", "value")
for single_extruder in extruders: for single_extruder in extruders:
extruder_prime_pos_x = single_extruder.getProperty("extruder_prime_pos_x", "value") extruder_prime_pos_x = single_extruder.getProperty("extruder_prime_pos_x", "value")
extruder_prime_pos_y = single_extruder.getProperty("extruder_prime_pos_y", "value") extruder_prime_pos_y = single_extruder.getProperty("extruder_prime_pos_y", "value")