mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06:00
Don't unnecessarily cast to a set
The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set. Contributes to issue CURA-5330.
This commit is contained in:
parent
b9727a33c6
commit
75e5a185d9
4 changed files with 8 additions and 8 deletions
|
@ -39,12 +39,12 @@ class SimpleModeSettingsManager(QObject):
|
||||||
global_stack = self._machine_manager.activeMachine
|
global_stack = self._machine_manager.activeMachine
|
||||||
|
|
||||||
# check user settings in the global stack
|
# check user settings in the global stack
|
||||||
user_setting_keys.update(set(global_stack.userChanges.getAllKeys()))
|
user_setting_keys.update(global_stack.userChanges.getAllKeys())
|
||||||
|
|
||||||
# check user settings in the extruder stacks
|
# check user settings in the extruder stacks
|
||||||
if global_stack.extruders:
|
if global_stack.extruders:
|
||||||
for extruder_stack in global_stack.extruders.values():
|
for extruder_stack in global_stack.extruders.values():
|
||||||
user_setting_keys.update(set(extruder_stack.userChanges.getAllKeys()))
|
user_setting_keys.update(extruder_stack.userChanges.getAllKeys())
|
||||||
|
|
||||||
# remove settings that are visible in recommended (we don't show the reset button for those)
|
# remove settings that are visible in recommended (we don't show the reset button for those)
|
||||||
for skip_key in self.__ignored_custom_setting_keys:
|
for skip_key in self.__ignored_custom_setting_keys:
|
||||||
|
@ -70,12 +70,12 @@ class SimpleModeSettingsManager(QObject):
|
||||||
global_stack = self._machine_manager.activeMachine
|
global_stack = self._machine_manager.activeMachine
|
||||||
|
|
||||||
# check quality changes settings in the global stack
|
# check quality changes settings in the global stack
|
||||||
quality_changes_keys.update(set(global_stack.qualityChanges.getAllKeys()))
|
quality_changes_keys.update(global_stack.qualityChanges.getAllKeys())
|
||||||
|
|
||||||
# check quality changes settings in the extruder stacks
|
# check quality changes settings in the extruder stacks
|
||||||
if global_stack.extruders:
|
if global_stack.extruders:
|
||||||
for extruder_stack in global_stack.extruders.values():
|
for extruder_stack in global_stack.extruders.values():
|
||||||
quality_changes_keys.update(set(extruder_stack.qualityChanges.getAllKeys()))
|
quality_changes_keys.update(extruder_stack.qualityChanges.getAllKeys())
|
||||||
|
|
||||||
# check if the qualityChanges container is not empty (meaning it is a user created profile)
|
# check if the qualityChanges container is not empty (meaning it is a user created profile)
|
||||||
has_quality_changes = len(quality_changes_keys) > 0
|
has_quality_changes = len(quality_changes_keys) > 0
|
||||||
|
|
|
@ -91,7 +91,7 @@ class ThreeMFWriter(MeshWriter):
|
||||||
# Handle per object settings (if any)
|
# Handle per object settings (if any)
|
||||||
stack = um_node.callDecoration("getStack")
|
stack = um_node.callDecoration("getStack")
|
||||||
if stack is not None:
|
if stack is not None:
|
||||||
changed_setting_keys = set(stack.getTop().getAllKeys())
|
changed_setting_keys = stack.getTop().getAllKeys()
|
||||||
|
|
||||||
# Ensure that we save the extruder used for this object in a multi-extrusion setup
|
# Ensure that we save the extruder used for this object in a multi-extrusion setup
|
||||||
if stack.getProperty("machine_extruder_count", "value") > 1:
|
if stack.getProperty("machine_extruder_count", "value") > 1:
|
||||||
|
|
|
@ -427,7 +427,7 @@ class StartSliceJob(Job):
|
||||||
|
|
||||||
# Check all settings for relations, so we can also calculate the correct values for dependent settings.
|
# Check all settings for relations, so we can also calculate the correct values for dependent settings.
|
||||||
top_of_stack = stack.getTop() # Cache for efficiency.
|
top_of_stack = stack.getTop() # Cache for efficiency.
|
||||||
changed_setting_keys = set(top_of_stack.getAllKeys())
|
changed_setting_keys = top_of_stack.getAllKeys()
|
||||||
|
|
||||||
# Add all relations to changed settings as well.
|
# Add all relations to changed settings as well.
|
||||||
for key in top_of_stack.getAllKeys():
|
for key in top_of_stack.getAllKeys():
|
||||||
|
|
|
@ -140,7 +140,7 @@ class GCodeWriter(MeshWriter):
|
||||||
serialized = flat_global_container.serialize()
|
serialized = flat_global_container.serialize()
|
||||||
data = {"global_quality": serialized}
|
data = {"global_quality": serialized}
|
||||||
|
|
||||||
all_setting_keys = set(flat_global_container.getAllKeys())
|
all_setting_keys = flat_global_container.getAllKeys()
|
||||||
for extruder in sorted(stack.extruders.values(), key = lambda k: int(k.getMetaDataEntry("position"))):
|
for extruder in sorted(stack.extruders.values(), key = lambda k: int(k.getMetaDataEntry("position"))):
|
||||||
extruder_quality = extruder.qualityChanges
|
extruder_quality = extruder.qualityChanges
|
||||||
if extruder_quality.getId() == "empty_quality_changes":
|
if extruder_quality.getId() == "empty_quality_changes":
|
||||||
|
@ -167,7 +167,7 @@ class GCodeWriter(MeshWriter):
|
||||||
extruder_serialized = flat_extruder_quality.serialize()
|
extruder_serialized = flat_extruder_quality.serialize()
|
||||||
data.setdefault("extruder_quality", []).append(extruder_serialized)
|
data.setdefault("extruder_quality", []).append(extruder_serialized)
|
||||||
|
|
||||||
all_setting_keys.update(set(flat_extruder_quality.getAllKeys()))
|
all_setting_keys.update(flat_extruder_quality.getAllKeys())
|
||||||
|
|
||||||
# Check if there is any profiles
|
# Check if there is any profiles
|
||||||
if not all_setting_keys:
|
if not all_setting_keys:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue