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

Saving a file no longer causes a re-slice

Browse source 
CURA-1933
This commit is contained in:
Jaime van Kessel 2016-07-25 15:44:16 +02:00
parent 6b3a25a491
commit 70242ba502
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/Settings/MachineManager.py
View file

@ -543,15 +543,10 @@ class MachineManager(QObject):
if containers: if containers:
new_name = self._createUniqueName("quality", "", containers[0].getName(), catalog.i18nc("@label", "Custom profile")) new_name = self._createUniqueName("quality", "", containers[0].getName(), catalog.i18nc("@label", "Custom profile"))
new_container = UM.Settings.InstanceContainer("") new_container = containers[0].duplicate(new_name, new_name)
## Copy all values
new_container.deserialize(containers[0].serialize())
new_container.setReadOnly(False)
new_container.setName(new_name)
new_container._id = new_name
UM.Settings.ContainerRegistry.getInstance().addContainer(new_container) UM.Settings.ContainerRegistry.getInstance().addContainer(new_container)
return new_name return new_name
return "" return ""

10
plugins/GCodeWriter/GCodeWriter.py
View file

@ -78,15 +78,19 @@ class GCodeWriter(MeshWriter):
# Duplicate the current quality profile and update it with any user settings. # Duplicate the current quality profile and update it with any user settings.
flat_quality_id = machine_manager.duplicateContainer(container_with_profile.getId()) flat_quality_id = machine_manager.duplicateContainer(container_with_profile.getId())
flat_quality = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = flat_quality_id)[0] flat_quality = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = flat_quality_id)[0]
user_settings = stack.getTop() user_settings = stack.getTop()
# We don't want to send out any signals, so disconnect them.
flat_quality.propertyChanged.disconnectAll()
for key in user_settings.getAllKeys(): for key in user_settings.getAllKeys():
flat_quality.setProperty(key, "value", user_settings.getProperty(key, "value")) flat_quality.setProperty(key, "value", user_settings.getProperty(key, "value"))
serialized = flat_quality.serialize() serialized = flat_quality.serialize()
data = {"global_quality": serialized} data = {"global_quality": serialized}
manager = ExtruderManager.getInstance() manager = ExtruderManager.getInstance()
for extruder in manager.getMachineExtruders(stack.getId()): for extruder in manager.getMachineExtruders(stack.getId()):
extruder_quality = extruder.findContainer({"type": "quality"}) extruder_quality = extruder.findContainer({"type": "quality"})
@ -94,6 +98,10 @@ class GCodeWriter(MeshWriter):
flat_extruder_quality_id = machine_manager.duplicateContainer(extruder_quality.getId()) flat_extruder_quality_id = machine_manager.duplicateContainer(extruder_quality.getId())
flat_extruder_quality = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=flat_extruder_quality_id)[0] flat_extruder_quality = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=flat_extruder_quality_id)[0]
extruder_user_settings = extruder.getTop() extruder_user_settings = extruder.getTop()
# We don't want to send out any signals, so disconnect them.
flat_extruder_quality.propertyChanged.disconnectAll()
for key in extruder_user_settings.getAllKeys(): for key in extruder_user_settings.getAllKeys():
flat_extruder_quality.setProperty(key, "value", extruder_user_settings.getProperty(key, "value")) flat_extruder_quality.setProperty(key, "value", extruder_user_settings.getProperty(key, "value"))