Settings are now obtained from right extruder

CURA-2407
This commit is contained in:
Jaime van Kessel 2016-09-27 09:36:04 +02:00
parent dccf18c4e7
commit 5ac609edc9

View file

@ -514,16 +514,16 @@ class BuildVolume(SceneNode):
if skirt_size < ooze_shield_dist:
skirt_size = ooze_shield_dist
if container_stack.getProperty("xy_offset", "value"):
skirt_size += container_stack.getProperty("xy_offset", "value")
if self._getSettingProperty("xy_offset", "value"):
skirt_size += self._getSettingProperty("xy_offset", "value")
if container_stack.getProperty("infill_wipe_distance", "value"):
infill_wipe_distance = container_stack.getProperty("infill_wipe_distance", "value")
if self._getSettingProperty("infill_wipe_dist", "value"):
infill_wipe_distance = self._getSettingProperty("infill_wipe_dist", "value")
if skirt_size < infill_wipe_distance:
skirt_size += infill_wipe_distance
if container_stack.getProperty("travel_avoid_distance", "value"):
travel_avoid_distance = container_stack.getProperty("travel_avoid_distance", "value")
if self._getSettingProperty("travel_avoid_distance", "value"):
travel_avoid_distance = self._getSettingProperty("travel_avoid_distance", "value")
if skirt_size < travel_avoid_distance:
skirt_size += travel_avoid_distance
@ -537,4 +537,4 @@ class BuildVolume(SceneNode):
_prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "extruder_prime_pos_z"]
_tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y"]
_ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"]
_distance_settings = ["infill_wipe_distance", "travel_avoid_distance"]
_distance_settings = ["infill_wipe_dist", "travel_avoid_distance"]