3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rename _getSettingProperty to _getSettingFromAdhesionExtruder

Browse source 
This opens up the way for other methods to get settings from different extruders.

Contributes to issue CURA-2407.
This commit is contained in:
Ghostkeeper 2016-09-29 12:31:22 +02:00
parent 2742a4ef65
commit 2e3937dd56
No known key found for this signature in database
GPG key ID: 701948C5954A7385
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cura/BuildVolume.py
View file

@ -474,7 +474,7 @@ class BuildVolume(SceneNode):
self._disallowed_areas = areas self._disallowed_areas = areas
## Private convenience function to get a setting from the adhesion extruder. ## Private convenience function to get a setting from the adhesion extruder.
def _getSettingProperty(self, setting_key, property = "value"): def _getSettingFromAdhesionExtruder(self, setting_key, property = "value"):
multi_extrusion = self._global_container_stack.getProperty("machine_extruder_count", "value") > 1 multi_extrusion = self._global_container_stack.getProperty("machine_extruder_count", "value") > 1
if not multi_extrusion: if not multi_extrusion:
@ -505,9 +505,9 @@ class BuildVolume(SceneNode):
adhesion_type = container_stack.getProperty("adhesion_type", "value") adhesion_type = container_stack.getProperty("adhesion_type", "value")
if adhesion_type == "skirt": if adhesion_type == "skirt":
skirt_distance = self._getSettingProperty("skirt_gap", "value") skirt_distance = self._getSettingFromAdhesionExtruder("skirt_gap", "value")
skirt_line_count = self._getSettingProperty("skirt_line_count", "value") skirt_line_count = self._getSettingFromAdhesionExtruder("skirt_line_count", "value")
bed_adhesion_size = skirt_distance + (skirt_line_count * self._getSettingProperty("skirt_brim_line_width", "value")) bed_adhesion_size = skirt_distance + (skirt_line_count * self._getSettingFromAdhesionExtruder("skirt_brim_line_width", "value"))
if self._global_container_stack.getProperty("machine_extruder_count", "value") > 1: if self._global_container_stack.getProperty("machine_extruder_count", "value") > 1:
adhesion_extruder_nr = int(self._global_container_stack.getProperty("adhesion_extruder_nr", "value")) adhesion_extruder_nr = int(self._global_container_stack.getProperty("adhesion_extruder_nr", "value"))
extruder_values = ExtruderManager.getInstance().getAllExtruderValues("skirt_brim_line_width") extruder_values = ExtruderManager.getInstance().getAllExtruderValues("skirt_brim_line_width")
@ -515,7 +515,7 @@ class BuildVolume(SceneNode):
for value in extruder_values: for value in extruder_values:
bed_adhesion_size += value bed_adhesion_size += value
elif adhesion_type == "brim": elif adhesion_type == "brim":
bed_adhesion_size = self._getSettingProperty("brim_line_count", "value") * self._getSettingProperty("skirt_brim_line_width", "value") bed_adhesion_size = self._getSettingFromAdhesionExtruder("brim_line_count", "value") * self._getSettingFromAdhesionExtruder("skirt_brim_line_width", "value")
if self._global_container_stack.getProperty("machine_extruder_count", "value") > 1: if self._global_container_stack.getProperty("machine_extruder_count", "value") > 1:
adhesion_extruder_nr = int(self._global_container_stack.getProperty("adhesion_extruder_nr", "value")) adhesion_extruder_nr = int(self._global_container_stack.getProperty("adhesion_extruder_nr", "value"))
extruder_values = ExtruderManager.getInstance().getAllExtruderValues("skirt_brim_line_width") extruder_values = ExtruderManager.getInstance().getAllExtruderValues("skirt_brim_line_width")
@ -523,7 +523,7 @@ class BuildVolume(SceneNode):
for value in extruder_values: for value in extruder_values:
bed_adhesion_size += value bed_adhesion_size += value
elif adhesion_type == "raft": elif adhesion_type == "raft":
bed_adhesion_size = self._getSettingProperty("raft_margin", "value") bed_adhesion_size = self._getSettingFromAdhesionExtruder("raft_margin", "value")
else: else:
raise Exception("Unknown bed adhesion type. Did you forget to update the build volume calculations for your new bed adhesion type?") raise Exception("Unknown bed adhesion type. Did you forget to update the build volume calculations for your new bed adhesion type?")
@ -534,10 +534,10 @@ class BuildVolume(SceneNode):
farthest_shield_distance = max(farthest_shield_distance, container_stack.getProperty("ooze_shield_dist", "value")) farthest_shield_distance = max(farthest_shield_distance, container_stack.getProperty("ooze_shield_dist", "value"))
move_from_wall_radius = 0 # Moves that start from outer wall. move_from_wall_radius = 0 # Moves that start from outer wall.
if self._getSettingProperty("infill_wipe_dist", "value"): if self._getSettingFromAdhesionExtruder("infill_wipe_dist", "value"):
move_from_wall_radius = max(move_from_wall_radius, self._getSettingProperty("infill_wipe_dist", "value")) move_from_wall_radius = max(move_from_wall_radius, self._getSettingFromAdhesionExtruder("infill_wipe_dist", "value"))
if self._getSettingProperty("travel_avoid_distance", "value"): if self._getSettingFromAdhesionExtruder("travel_avoid_distance", "value"):
move_from_wall_radius = max(move_from_wall_radius, self._getSettingProperty("travel_avoid_distance", "value")) move_from_wall_radius = max(move_from_wall_radius, self._getSettingFromAdhesionExtruder("travel_avoid_distance", "value"))
#Now combine our different pieces of data to get the final border size. #Now combine our different pieces of data to get the final border size.
border_size = max(farthest_shield_distance, move_from_wall_radius, bed_adhesion_size) border_size = max(farthest_shield_distance, move_from_wall_radius, bed_adhesion_size)