3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clarify some documentation in the PerObjectSettingVisibilityHandler

Browse source 
We often used shorthands for stack / instance / definition, but this made it
harder for people that are very familiar with the code to understand what is
going on.

Contributes to #11455
This commit is contained in:
Jaime van Kessel 2022-02-11 13:40:21 +01:00
parent d50a51396e
commit cfb0604067
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py
View file

@ -62,7 +62,7 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
all_instances = settings.findInstances() all_instances = settings.findInstances()
visibility_changed = False # Flag to check if at the end the signal needs to be emitted visibility_changed = False # Flag to check if at the end the signal needs to be emitted
# Remove all instances that are not in visibility list # Remove all SettingInstances that are not in visibility list
for instance in all_instances: for instance in all_instances:
# exceptionally skip setting # exceptionally skip setting
if instance.definition.key in self._skip_reset_setting_set: if instance.definition.key in self._skip_reset_setting_set:
@ -71,29 +71,30 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
settings.removeInstance(instance.definition.key) settings.removeInstance(instance.definition.key)
visibility_changed = True visibility_changed = True
# Add all instances that are not added, but are in visibility list # Add all SettingInstances that are not added, but are in visibility list
for item in visible: for item in visible:
if settings.getInstance(item) is not None: # Setting was added already. if settings.getInstance(item) is not None: # Setting was added already.
continue continue
definition = self._stack.getSettingDefinition(item) definition = self._stack.getSettingDefinition(item)
if not definition: if not definition:
Logger.log("w", f"Unable to add instance ({item}) to per-object visibility because we couldn't find the matching definition.") Logger.log("w", f"Unable to add SettingInstance ({item}) to the per-object visibility because we couldn't find the matching SettingDefinition.")
continue continue
new_instance = SettingInstance(definition, settings) new_instance = SettingInstance(definition, settings)
stack_nr = -1 stack_nr = -1
stack = None stack = None
# Check from what stack we should copy the raw property of the setting from. # Check from what ContainerStack we should copy the raw property of the setting from.
if self._stack.getProperty("machine_extruder_count", "value") > 1: if self._stack.getProperty("machine_extruder_count", "value") > 1:
if definition.limit_to_extruder != "-1": if definition.limit_to_extruder != "-1":
# A limit to extruder function was set and it's a multi extrusion machine. Check what stack we do need to use. # A limit_to_extruder function was set and it's a multi extrusion machine. Check what stack we
# do need to use.
stack_nr = str(int(round(float(self._stack.getProperty(item, "limit_to_extruder"))))) stack_nr = str(int(round(float(self._stack.getProperty(item, "limit_to_extruder")))))
# Check if the found stack_number is in the extruder list of extruders. # Check if the found stack_number is in the extruder list of extruders.
if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value") is not None: if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value") is not None:
stack_nr = -1 stack_nr = -1
# Use the found stack number to get the right stack to copy the value from. # Use the found stack_number to get the right ContainerStack to copy the value from.
if stack_nr in ExtruderManager.getInstance().extruderIds: if stack_nr in ExtruderManager.getInstance().extruderIds:
stack = ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0] stack = ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0]
else: else: