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

Cleanup machine settings action - CURA-4482

Browse source
This commit is contained in:
ChrisTerBeke 2017-10-31 16:20:25 +01:00
parent cc6be48a79
commit c59e4bb3e1
1 changed files with 0 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

55
plugins/MachineSettingsAction/MachineSettingsAction.py
View file

@ -127,35 +127,6 @@ class MachineSettingsAction(MachineAction):
if extruder_count == previous_extruder_count: if extruder_count == previous_extruder_count:
return return
# extruder_material_id = None
# extruder_variant_id = None
# if extruder_count == 1:
# # Get the material and variant of the first extruder before setting the number extruders to 1
# if machine_manager.hasMaterials:
# extruder_material_id = machine_manager.allActiveMaterialIds[extruder_manager.extruderIds["0"]]
# if machine_manager.hasVariants:
# extruder_variant_id = machine_manager.allActiveVariantIds[extruder_manager.extruderIds["0"]]
#
# # Copy any settable_per_extruder setting value from the extruders to the global stack
# extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
# extruder_stacks.reverse() # make sure the first extruder is done last, so its settings override any higher extruder settings
#
# global_user_container = self._global_container_stack.getTop()
# for extruder_stack in extruder_stacks:
# extruder_index = extruder_stack.getMetaDataEntry("position")
# extruder_user_container = extruder_stack.getTop()
# for setting_instance in extruder_user_container.findInstances():
# setting_key = setting_instance.definition.key
# settable_per_extruder = self._global_container_stack.getProperty(setting_key, "settable_per_extruder")
#
# if settable_per_extruder:
# limit_to_extruder = self._global_container_stack.getProperty(setting_key, "limit_to_extruder")
#
# if limit_to_extruder == "-1" or limit_to_extruder == extruder_index:
# global_user_container.setProperty(setting_key, "value", extruder_user_container.getProperty(setting_key, "value"))
# extruder_user_container.removeInstance(setting_key)
# reset all extruder number settings whose value is no longer valid # reset all extruder number settings whose value is no longer valid
for setting_instance in self._global_container_stack.userChanges.findInstances(): for setting_instance in self._global_container_stack.userChanges.findInstances():
setting_key = setting_instance.definition.key setting_key = setting_instance.definition.key
@ -183,11 +154,8 @@ class MachineSettingsAction(MachineAction):
extruder_manager.setActiveExtruderIndex(0) extruder_manager.setActiveExtruderIndex(0)
# Move settable_per_extruder values out of the global container # Move settable_per_extruder values out of the global container
# extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStack()
global_user_container = self._global_container_stack.getTop() global_user_container = self._global_container_stack.getTop()
# if extruder_count > 1:
# Make sure one of the extruder stacks is active # Make sure one of the extruder stacks is active
extruder_manager.setActiveExtruderIndex(0) extruder_manager.setActiveExtruderIndex(0)
@ -207,29 +175,6 @@ class MachineSettingsAction(MachineAction):
extruder_stack.getTop().setProperty(setting_key, "value", global_user_container.getProperty(setting_key, "value")) extruder_stack.getTop().setProperty(setting_key, "value", global_user_container.getProperty(setting_key, "value"))
global_user_container.removeInstance(setting_key) global_user_container.removeInstance(setting_key)
# else:
# # Single extrusion
#
# # Make sure the machine stack is active
# if extruder_manager.activeExtruderIndex > -1:
# extruder_manager.setActiveExtruderIndex(-1)
#
# # Restore material and variant on global stack
# # MachineManager._onGlobalContainerChanged removes the global material and variant of multiextruder machines
# if extruder_material_id or extruder_variant_id:
# # Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes
# # The dialog is not relevant here, since we're restoring the previous situation as good as possible
# preferences = Preferences.getInstance()
# choice_on_profile_override = preferences.getValue("cura/choice_on_profile_override")
# preferences.setValue("cura/choice_on_profile_override", "always_keep")
#
# if extruder_material_id:
# machine_manager.setActiveMaterial(extruder_material_id)
# if extruder_variant_id:
# machine_manager.setActiveVariant(extruder_variant_id)
#
# preferences.setValue("cura/choice_on_profile_override", choice_on_profile_override)
self.forceUpdate() self.forceUpdate()
@pyqtSlot() @pyqtSlot()