From 5fd476a2f73fabc403142146cf85f88572120094 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 8 Aug 2016 18:06:39 +0200 Subject: [PATCH] Update the has_materials metadata entry when changing gcode flavor --- MachineSettingsAction.py | 24 +++++++++++++++++++++++- MachineSettingsAction.qml | 6 +++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index a954d9f3db..130ce642c9 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -49,4 +49,26 @@ class MachineSettingsAction(MachineAction): def forceUpdate(self): # Force rebuilding the build volume by reloading the global container stack. # This is a bit of a hack, but it seems quick enough. - UM.Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file + UM.Application.getInstance().globalContainerStackChanged.emit() + + @pyqtSlot() + def updateHasMaterialsMetadata(self): + # Updates the has_materials metadata flag after switching gcode flavor + global_container_stack = UM.Application.getInstance().getGlobalContainerStack() + if global_container_stack: + definition = global_container_stack.getBottom() + if definition.getProperty("machine_gcode_flavor", "value") == "UltiGCode" and not definition.getMetaDataEntry("has_materials", False): + has_materials = global_container_stack.getProperty("machine_gcode_flavor", "value") != "UltiGCode" + + # NB: this metadata entry is stored in an ini, and ini files are parsed as strings only. + # because any non-empty string evaluates to a boolean True, we have to remove the entry to make it False. + if has_materials: + if "has_materials" in global_container_stack.getMetaData(): + global_container_stack.setMetaDataEntry("has_materials", True) + else: + global_container_stack.addMetaDataEntry("has_materials", True) + else: + if "has_materials" in global_container_stack.getMetaData(): + global_container_stack.removeMetaDataEntry("has_materials") + + UM.Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file diff --git a/MachineSettingsAction.qml b/MachineSettingsAction.qml index 4a8f85f57f..de831870a0 100644 --- a/MachineSettingsAction.qml +++ b/MachineSettingsAction.qml @@ -149,7 +149,11 @@ Cura.MachineAction { model: ["RepRap (Marlin/Sprinter)", "UltiGCode"] currentIndex: machineGCodeFlavorProvider.properties.value != model[1] ? 0 : 1 - onActivated: machineGCodeFlavorProvider.setPropertyValue("value", model[index]) + onActivated: + { + machineGCodeFlavorProvider.setPropertyValue("value", model[index]); + manager.updateHasMaterialsMetadata(); + } } } }