Merge branch 'master' of github.com:Ultimaker/Cura

plugins/3MFReader/ThreeMFWorkspaceReader.py

@@ -352,7 +352,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
         # Get quality_changes and user profiles saved in the workspace
         instance_container_files = [name for name in cura_file_names if name.endswith(self._instance_container_suffix)]
         user_instance_containers = []
-        quality_changes_instance_containers = []
+        quality_and_definition_changes_instance_containers = []
         for instance_container_file in instance_container_files:
             container_id = self._stripFileToId(instance_container_file)
             instance_container = InstanceContainer(container_id)
@@ -387,18 +387,18 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                             instance_container.setMetaDataEntry("machine", self.getNewId(machine_id))
                             containers_to_add.append(instance_container)
                 user_instance_containers.append(instance_container)
-            elif container_type == "quality_changes":
+            elif container_type in ("quality_changes", "definition_changes"):
                 # Check if quality changes already exists.
-                quality_changes = self._container_registry.findInstanceContainers(id = container_id)
+                changes_containers = self._container_registry.findInstanceContainers(id = container_id)
-                if not quality_changes:
+                if not changes_containers:
                     containers_to_add.append(instance_container)
                 else:
-                    if self._resolve_strategies["quality_changes"] == "override":
+                    if self._resolve_strategies[container_type] == "override":
-                        quality_changes[0].deserialize(archive.open(instance_container_file).read().decode("utf-8"))
+                        changes_containers[0].deserialize(archive.open(instance_container_file).read().decode("utf-8"))
-                    elif self._resolve_strategies["quality_changes"] is None:
+                    elif self._resolve_strategies[container_type] is None:
                         # The ID already exists, but nothing in the values changed, so do nothing.
                         pass
-                quality_changes_instance_containers.append(instance_container)
+                quality_and_definition_changes_instance_containers.append(instance_container)
             else:
                 existing_container = self._container_registry.findInstanceContainers(id = container_id)
                 if not existing_container:
@@ -411,10 +411,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
         # Get the stack(s) saved in the workspace.
         Logger.log("d", "Workspace loading is checking stacks containers...")
-        global_stack_file, extruder_stack_files = self._determineGlobalAndExtruderStackFiles(file_name,
+        global_stack_file, extruder_stack_files = self._determineGlobalAndExtruderStackFiles(file_name, cura_file_names)
-                                                                                                 cura_file_names)
 
         global_stack = None
+        old_extruder_stacks = Application.getInstance().getGlobalContainerStack().extruders
         extruder_stacks = []
         extruder_stacks_added = []
         container_stacks_added = []
@@ -535,29 +535,30 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                         global_stack.replaceContainer(0, container)
                         continue
 
-        if self._resolve_strategies["quality_changes"] == "new":
+        for container_type in ("quality_changes", "definition_changes"):
-            # Quality changes needs to get a new ID, added to registry and to the right stacks
+            if self._resolve_strategies[container_type] == "new":
-            for container in quality_changes_instance_containers:
+                # Quality changes needs to get a new ID, added to registry and to the right stacks
-                old_id = container.getId()
+                for container in quality_and_definition_changes_instance_containers:
-                container.setName(self._container_registry.uniqueName(container.getName()))
+                    old_id = container.getId()
-                # We're not really supposed to change the ID in normal cases, but this is an exception.
+                    container.setName(self._container_registry.uniqueName(container.getName()))
-                container._id = self.getNewId(container.getId())
+                    # We're not really supposed to change the ID in normal cases, but this is an exception.
+                    container._id = self.getNewId(container.getId())
 
-                # The container was not added yet, as it didn't have an unique ID. It does now, so add it.
+                    # The container was not added yet, as it didn't have an unique ID. It does now, so add it.
-                self._container_registry.addContainer(container)
+                    self._container_registry.addContainer(container)
 
-                # Replace the quality changes container
+                    # Replace the quality/definition changes container
-                old_container = global_stack.findContainer({"type": "quality_changes"})
+                    old_container = global_stack.findContainer({"type": container_type})
-                if old_container.getId() == old_id:
-                    quality_changes_index = global_stack.getContainerIndex(old_container)
-                    global_stack.replaceContainer(quality_changes_index, container)
-                    continue
-
-                for stack in extruder_stacks:
-                    old_container = stack.findContainer({"type": "quality_changes"})
                     if old_container.getId() == old_id:
-                        quality_changes_index = stack.getContainerIndex(old_container)
+                        changes_index = global_stack.getContainerIndex(old_container)
-                        stack.replaceContainer(quality_changes_index, container)
+                        global_stack.replaceContainer(changes_index, container)
+                        continue
+
+                    for stack in extruder_stacks:
+                        old_container = stack.findContainer({"type": container_type})
+                        if old_container.getId() == old_id:
+                            changes_index = stack.getContainerIndex(old_container)
+                            stack.replaceContainer(changes_index, container)
 
         if self._resolve_strategies["material"] == "new":
             for material in material_containers:
@@ -587,10 +588,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
 
         # if we are reusing an existing global stack, it can already have extruders associated, so we need to remove
         # them first
-        if global_stack.extruders:
+        for extruder_stack in old_extruder_stacks:
-            for extruder_stack in global_stack.extruders:
+            if extruder_stack not in extruder_stacks:  # skip new ones
-                if extruder_stack not in extruder_stacks_added:  # skip new ones
+                self._container_registry.removeContainer(extruder_stack.getId())
-                    self._container_registry.removeContainer(extruder_stack.getId())
 
         for stack in extruder_stacks:
             stack.setNextStack(global_stack)

plugins/3MFReader/WorkspaceDialog.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2016 Ultimaker B.V.
 # Cura is released under the terms of the AGPLv3 or higher.
 
-from PyQt5.QtCore import Qt, QUrl, pyqtSignal, QObject, pyqtProperty, QCoreApplication
+from PyQt5.QtCore import QUrl, pyqtSignal, QObject, pyqtProperty, QCoreApplication
 from UM.FlameProfiler import pyqtSlot
 from PyQt5.QtQml import QQmlComponent, QQmlContext
 from UM.PluginRegistry import PluginRegistry
@@ -29,11 +29,13 @@ class WorkspaceDialog(QObject):
         self._default_strategy = "override"
         self._result = {"machine": self._default_strategy,
                         "quality_changes": self._default_strategy,
+                        "definition_changes": self._default_strategy,
                         "material": self._default_strategy}
         self._visible = False
         self.showDialogSignal.connect(self.__show)
 
         self._has_quality_changes_conflict = False
+        self._has_definition_changes_conflict = False
         self._has_machine_conflict = False
         self._has_material_conflict = False
         self._num_visible_settings = 0
@@ -51,6 +53,7 @@ class WorkspaceDialog(QObject):
 
     machineConflictChanged = pyqtSignal()
     qualityChangesConflictChanged = pyqtSignal()
+    definitionChangesConflictChanged = pyqtSignal()
     materialConflictChanged = pyqtSignal()
     numVisibleSettingsChanged = pyqtSignal()
     activeModeChanged = pyqtSignal()
@@ -185,6 +188,10 @@ class WorkspaceDialog(QObject):
     def qualityChangesConflict(self):
         return self._has_quality_changes_conflict
 
+    @pyqtProperty(bool, notify=definitionChangesConflictChanged)
+    def definitionChangesConflict(self):
+        return self._has_definition_changes_conflict
+
     @pyqtProperty(bool, notify=materialConflictChanged)
     def materialConflict(self):
         return self._has_material_conflict
@@ -214,11 +221,18 @@ class WorkspaceDialog(QObject):
             self._has_quality_changes_conflict = quality_changes_conflict
             self.qualityChangesConflictChanged.emit()
 
+    def setDefinitionChangesConflict(self, definition_changes_conflict):
+        if self._has_definition_changes_conflict != definition_changes_conflict:
+            self._has_definition_changes_conflict = definition_changes_conflict
+            self.definitionChangesConflictChanged.emit()
+
     def getResult(self):
         if "machine" in self._result and not self._has_machine_conflict:
             self._result["machine"] = None
         if "quality_changes" in self._result and not self._has_quality_changes_conflict:
             self._result["quality_changes"] = None
+        if "definition_changes" in self._result and not self._has_definition_changes_conflict:
+            self._result["definition_changes"] = None
         if "material" in self._result and not self._has_material_conflict:
             self._result["material"] = None
         return self._result
@@ -240,6 +254,7 @@ class WorkspaceDialog(QObject):
         # Reset the result
         self._result = {"machine": self._default_strategy,
                         "quality_changes": self._default_strategy,
+                        "definition_changes": self._default_strategy,
                         "material": self._default_strategy}
         self._visible = True
         self.showDialogSignal.emit()

resources/definitions/maker_starter.def.json

@@ -4,6 +4,7 @@
     "name": "3DMaker Starter",
     "inherits": "fdmprinter",
     "metadata": {
+        "visible": true,
         "author": "tvlgiao",
         "manufacturer": "3DMaker",
         "category": "Other",