Merge branch '3.0'

cura/Settings/ExtruderManager.py

@@ -16,6 +16,7 @@ from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Settings.SettingFunction import SettingFunction
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.Interfaces import DefinitionContainerInterface
+from UM.Settings.PropertyEvaluationContext import PropertyEvaluationContext
 from typing import Optional, List, TYPE_CHECKING, Union
 
 if TYPE_CHECKING:
@@ -587,6 +588,46 @@ class ExtruderManager(QObject):
 
         return result
 
+    ##  Get all extruder values for a certain setting. This function will skip the user settings container.
+    #
+    #   This is exposed to SettingFunction so it can be used in value functions.
+    #
+    #   \param key The key of the setting to retrieve values for.
+    #
+    #   \return A list of values for all extruders. If an extruder does not have a value, it will not be in the list.
+    #           If no extruder has the value, the list will contain the global value.
+    @staticmethod
+    def getDefaultExtruderValues(key):
+        global_stack = Application.getInstance().getGlobalContainerStack()
+        context = PropertyEvaluationContext(global_stack)
+        context.context["evaluate_from_container_index"] = 1  # skip the user settings container
+        context.context["override_operators"] = {
+            "extruderValue": ExtruderManager.getDefaultExtruderValue,
+            "extruderValues": ExtruderManager.getDefaultExtruderValues,
+            "resolveOrValue": ExtruderManager.getDefaultResolveOrValue
+        }
+
+        result = []
+        for extruder in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):
+            # only include values from extruders that are "active" for the current machine instance
+            if int(extruder.getMetaDataEntry("position")) >= global_stack.getProperty("machine_extruder_count", "value", context = context):
+                continue
+
+            value = extruder.getRawProperty(key, "value", context = context)
+
+            if value is None:
+                continue
+
+            if isinstance(value, SettingFunction):
+                value = value(extruder, context = context)
+
+            result.append(value)
+
+        if not result:
+            result.append(global_stack.getProperty(key, "value", context = context))
+
+        return result
+
     ##  Get all extruder values for a certain setting.
     #
     #   This is exposed to qml for display purposes
@@ -620,6 +661,35 @@ class ExtruderManager(QObject):
 
         return value
 
+    ##  Get the default value from the given extruder. This function will skip the user settings container.
+    #
+    #   This is exposed to SettingFunction to use in value functions.
+    #
+    #   \param extruder_index The index of the extruder to get the value from.
+    #   \param key The key of the setting to get the value of.
+    #
+    #   \return The value of the setting for the specified extruder or for the
+    #   global stack if not found.
+    @staticmethod
+    def getDefaultExtruderValue(extruder_index, key):
+        extruder = ExtruderManager.getInstance().getExtruderStack(extruder_index)
+        context = PropertyEvaluationContext(extruder)
+        context.context["evaluate_from_container_index"] = 1  # skip the user settings container
+        context.context["override_operators"] = {
+            "extruderValue": ExtruderManager.getDefaultExtruderValue,
+            "extruderValues": ExtruderManager.getDefaultExtruderValues,
+            "resolveOrValue": ExtruderManager.getDefaultResolveOrValue
+        }
+
+        if extruder:
+            value = extruder.getRawProperty(key, "value", context = context)
+            if isinstance(value, SettingFunction):
+                value = value(extruder, context = context)
+        else:  # Just a value from global.
+            value = Application.getInstance().getGlobalContainerStack().getProperty(key, "value", context = context)
+
+        return value
+
     ##  Get the resolve value or value for a given key
     #
     #   This is the effective value for a given key, it is used for values in the global stack.
@@ -633,3 +703,25 @@ class ExtruderManager(QObject):
         resolved_value = global_stack.getProperty(key, "value")
 
         return resolved_value
+
+    ##  Get the resolve value or value for a given key without looking the first container (user container)
+    #
+    #   This is the effective value for a given key, it is used for values in the global stack.
+    #   This is exposed to SettingFunction to use in value functions.
+    #   \param key The key of the setting to get the value of.
+    #
+    #   \return The effective value
+    @staticmethod
+    def getDefaultResolveOrValue(key):
+        global_stack = Application.getInstance().getGlobalContainerStack()
+        context = PropertyEvaluationContext(global_stack)
+        context.context["evaluate_from_container_index"] = 1  # skip the user settings container
+        context.context["override_operators"] = {
+            "extruderValue": ExtruderManager.getDefaultExtruderValue,
+            "extruderValues": ExtruderManager.getDefaultExtruderValues,
+            "resolveOrValue": ExtruderManager.getDefaultResolveOrValue
+        }
+
+        resolved_value = global_stack.getProperty(key, "value", context = context)
+
+        return resolved_value

cura/Settings/GlobalStack.py

@@ -96,18 +96,18 @@ class GlobalStack(CuraContainerStack):
         if not self.definition.findDefinitions(key = key):
             return None
 
+        if context is None:
+            context = PropertyEvaluationContext()
+        context.pushContainer(self)
+
         # Handle the "resolve" property.
-        if self._shouldResolve(key, property_name):
+        if self._shouldResolve(key, property_name, context):
             self._resolving_settings.add(key)
             resolve = super().getProperty(key, "resolve", context)
             self._resolving_settings.remove(key)
             if resolve is not None:
                 return resolve
 
-        if context is None:
-            context = PropertyEvaluationContext()
-        context.pushContainer(self)
-
         # Handle the "limit_to_extruder" property.
         limit_to_extruder = super().getProperty(key, "limit_to_extruder", context)
         if limit_to_extruder is not None:
@@ -151,7 +151,7 @@ class GlobalStack(CuraContainerStack):
 
     # Determine whether or not we should try to get the "resolve" property instead of the
     # requested property.
-    def _shouldResolve(self, key: str, property_name: str) -> bool:
+    def _shouldResolve(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None) -> bool:
         if property_name is not "value":
             # Do not try to resolve anything but the "value" property
             return False
@@ -163,7 +163,7 @@ class GlobalStack(CuraContainerStack):
             # track all settings that are being resolved.
             return False
 
-        setting_state = super().getProperty(key, "state")
+        setting_state = super().getProperty(key, "state", context = context)
         if setting_state is not None and setting_state != InstanceState.Default:
             # When the user has explicitly set a value, we should ignore any resolve and
             # just return that value.

cura/Settings/MachineManager.py

@@ -1132,7 +1132,7 @@ class MachineManager(QObject):
             machine_stacks = ContainerRegistry.getInstance().findContainerStacks(type = "machine")
             other_machine_stacks = [s for s in machine_stacks if s.getId() != machine_id]
             if other_machine_stacks:
-                Application.getInstance().setGlobalContainerStack(other_machine_stacks[0])
+                self.setActiveMachine(other_machine_stacks[0].getId())
 
         ExtruderManager.getInstance().removeMachineExtruders(machine_id)
         containers = ContainerRegistry.getInstance().findInstanceContainers(type = "user", machine = machine_id)

cura/Settings/UserChangesModel.py

@@ -6,6 +6,7 @@ from cura.Settings.ExtruderManager import ExtruderManager
 from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.i18n import i18nCatalog
 from UM.Settings.SettingFunction import SettingFunction
+from UM.Settings.PropertyEvaluationContext import PropertyEvaluationContext
 
 from collections import OrderedDict
 import os
@@ -66,8 +67,15 @@ class UserChangesModel(ListModel):
                 containers.extend(latest_stack.getContainers())
                 latest_stack = latest_stack.getNextStack()
 
-            # Drop the user container.
+            # Override "getExtruderValue" with "getDefaultExtruderValue" so we can get the default values
             user_changes = containers.pop(0)
+            default_value_resolve_context = PropertyEvaluationContext(stack)
+            default_value_resolve_context.context["evaluate_from_container_index"] = 1  # skip the user settings container
+            default_value_resolve_context.context["override_operators"] = {
+                "extruderValue": ExtruderManager.getDefaultExtruderValue,
+                "extruderValues": ExtruderManager.getDefaultExtruderValues,
+                "resolveOrValue": ExtruderManager.getDefaultResolveOrValue
+            }
 
             for setting_key in user_changes.getAllKeys():
                 original_value = None
@@ -90,16 +98,16 @@ class UserChangesModel(ListModel):
 
                 for container in containers:
                     if stack == global_stack:
-                        resolve = global_stack.getProperty(setting_key, "resolve")
+                        resolve = global_stack.getProperty(setting_key, "resolve", default_value_resolve_context)
                         if resolve is not None:
                             original_value = resolve
                             break
 
-                    original_value = container.getProperty(setting_key, "value")
+                    original_value = container.getProperty(setting_key, "value", default_value_resolve_context)
 
                     # If a value is a function, ensure it's called with the stack it's in.
                     if isinstance(original_value, SettingFunction):
-                        original_value = original_value(stack)
+                        original_value = original_value(stack, default_value_resolve_context)
 
                     if original_value is not None:
                         break

resources/qml/Cura.qml

@@ -16,7 +16,7 @@ UM.MainWindow
 {
     id: base
     //: Cura application window title
-    title: catalog.i18nc("@title:window","Cura");
+    title: catalog.i18nc("@title:window","Ultimaker Cura");
     viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
     property bool showPrintMonitor: false