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

Rename skirt_size to border_size

Browse source 
It is not only about the skirt, but about other things like travel avoid distance as well.

Contributes to issue CURA-2407.
This commit is contained in:
Ghostkeeper 2016-09-27 15:26:12 +02:00
parent f7e8340235
commit c4d3fa7fc7
No known key found for this signature in database
GPG key ID: 701948C5954A7385
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cura/BuildVolume.py
View file

@ -478,7 +478,7 @@ class BuildVolume(SceneNode):
if not self._global_container_stack: if not self._global_container_stack:
return 0 return 0
container_stack = self._global_container_stack container_stack = self._global_container_stack
skirt_size = 0.0 border_size = 0.0
# If we are printing one at a time, we need to add the bed adhesion size to the disallowed areas of the objects # If we are printing one at a time, we need to add the bed adhesion size to the disallowed areas of the objects
if container_stack.getProperty("print_sequence", "value") == "one_at_a_time": if container_stack.getProperty("print_sequence", "value") == "one_at_a_time":
@ -488,50 +488,50 @@ class BuildVolume(SceneNode):
if adhesion_type == "skirt": if adhesion_type == "skirt":
skirt_distance = self._getSettingProperty("skirt_gap", "value") skirt_distance = self._getSettingProperty("skirt_gap", "value")
skirt_line_count = self._getSettingProperty("skirt_line_count", "value") skirt_line_count = self._getSettingProperty("skirt_line_count", "value")
skirt_size = skirt_distance + (skirt_line_count * self._getSettingProperty("skirt_brim_line_width", "value")) border_size = skirt_distance + (skirt_line_count * self._getSettingProperty("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")
del extruder_values[adhesion_extruder_nr] # Remove the value of the adhesion extruder nr. del extruder_values[adhesion_extruder_nr] # Remove the value of the adhesion extruder nr.
for value in extruder_values: for value in extruder_values:
skirt_size += value border_size += value
elif adhesion_type == "brim": elif adhesion_type == "brim":
skirt_size = self._getSettingProperty("brim_line_count", "value") * self._getSettingProperty("skirt_brim_line_width", "value") border_size = self._getSettingProperty("brim_line_count", "value") * self._getSettingProperty("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")
del extruder_values[adhesion_extruder_nr] # Remove the value of the adhesion extruder nr. del extruder_values[adhesion_extruder_nr] # Remove the value of the adhesion extruder nr.
for value in extruder_values: for value in extruder_values:
skirt_size += value border_size += value
elif adhesion_type == "raft": elif adhesion_type == "raft":
skirt_size = self._getSettingProperty("raft_margin", "value") border_size = self._getSettingProperty("raft_margin", "value")
if self._getSettingProperty("xy_offset", "value"): if self._getSettingProperty("xy_offset", "value"):
skirt_size += self._getSettingProperty("xy_offset", "value") border_size += self._getSettingProperty("xy_offset", "value")
if container_stack.getProperty("draft_shield_enabled", "value"): if container_stack.getProperty("draft_shield_enabled", "value"):
draft_shield_dist = container_stack.getProperty("draft_shield_dist", "value") draft_shield_dist = container_stack.getProperty("draft_shield_dist", "value")
if skirt_size < draft_shield_dist: if border_size < draft_shield_dist:
skirt_size = draft_shield_dist border_size = draft_shield_dist
if container_stack.getProperty("ooze_shield_enabled", "value"): if container_stack.getProperty("ooze_shield_enabled", "value"):
ooze_shield_dist = container_stack.getProperty("ooze_shield_dist", "value") ooze_shield_dist = container_stack.getProperty("ooze_shield_dist", "value")
if skirt_size < ooze_shield_dist: if border_size < ooze_shield_dist:
skirt_size = ooze_shield_dist border_size = ooze_shield_dist
if self._getSettingProperty("infill_wipe_dist", "value"): if self._getSettingProperty("infill_wipe_dist", "value"):
infill_wipe_distance = self._getSettingProperty("infill_wipe_dist", "value") infill_wipe_distance = self._getSettingProperty("infill_wipe_dist", "value")
if skirt_size < infill_wipe_distance: if border_size < infill_wipe_distance:
skirt_size = infill_wipe_distance border_size = infill_wipe_distance
if self._getSettingProperty("travel_avoid_distance", "value"): if self._getSettingProperty("travel_avoid_distance", "value"):
travel_avoid_distance = self._getSettingProperty("travel_avoid_distance", "value") travel_avoid_distance = self._getSettingProperty("travel_avoid_distance", "value")
if skirt_size < travel_avoid_distance: if border_size < travel_avoid_distance:
skirt_size = travel_avoid_distance border_size = travel_avoid_distance
return skirt_size return border_size
def _clamp(self, value, min_value, max_value): def _clamp(self, value, min_value, max_value):
return max(min(value, max_value), min_value) return max(min(value, max_value), min_value)