From 93186dedd009327905dba1837403a937cc8f049f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 4 Oct 2016 14:02:34 +0200 Subject: [PATCH 1/2] JSON fix: disable prime position by default for each machine (CURA-2521) --- resources/definitions/fdmextruder.def.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 16f18d3b2e..7c594e3eda 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -177,7 +177,8 @@ "minimum_value_warning": "machine_nozzle_offset_x", "maximum_value": "machine_width", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "enabled": false }, "extruder_prime_pos_y": { @@ -189,7 +190,8 @@ "minimum_value_warning": "machine_nozzle_offset_y", "maximum_value_warning": "machine_depth", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "enabled": false } } } From ff12f999be7e8abf3a4ac38213d7d87b1fcd2bea Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 4 Oct 2016 14:05:55 +0200 Subject: [PATCH 2/2] Fixed error when duplicating protected profiles CURA-2478 --- cura/Settings/ContainerManager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 8625e78e09..b49f0997c9 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -643,9 +643,8 @@ class ContainerManager(QObject): # Handle the global stack first. global_changes = self._createQualityChanges(quality_container, new_name, machine_definition, None) - new_changes.addMetaDataEntry("global_profile", global_changes.getId()) new_change_instances.append(global_changes) - self._container_registry.addContainer(new_changes) + self._container_registry.addContainer(global_changes) # Handle the extruders if present. extruders = machine_definition.getMetaDataEntry("machine_extruder_trains") @@ -714,7 +713,7 @@ class ContainerManager(QObject): # Factory function, used by QML @staticmethod def createContainerManager(engine, js_engine): - return ContainerManager() + return self.getInstance() def _performMerge(self, merge_into, merge): assert isinstance(merge, type(merge_into))