Browse Source

CURA-4959 Add buildplate information to the summary when saving a
project file.
- The activeVariantNames now returns only the names of the variants in
the extruder stacks.

Diego Prado Gesto 7 years ago
parent
commit
85059882fe
2 changed files with 27 additions and 1 deletions
  1. 2 1
      cura/Settings/MachineManager.py
  2. 25 0
      resources/qml/WorkspaceSummaryDialog.qml

+ 2 - 1
cura/Settings/MachineManager.py

@@ -559,7 +559,8 @@ class MachineManager(QObject):
     def activeVariantNames(self) -> List[str]:
         result = []
 
-        active_stacks = ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks()
+        # Just return the variants in the extruder stack(s). For the variant in the global stack, use activeVariantBuildplateName
+        active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
         if active_stacks is not None:
             for stack in active_stacks:
                 variant_container = stack.variant

+ 25 - 0
resources/qml/WorkspaceSummaryDialog.qml

@@ -120,6 +120,31 @@ UM.Dialog
                     width: (parent.width / 3) | 0
                 }
             }
+            Column
+            {
+                width: parent.width
+                visible: Cura.MachineManager.hasVariantBuildplates
+                Item // Spacer
+                {
+                    height: spacerHeight
+                    width: height
+                }
+                Row
+                {
+                    width: parent.width
+                    height: childrenRect.height
+                    Label
+                    {
+                        text: catalog.i18nc("@action:label", "Build plate")
+                        width: (parent.width / 3) | 0
+                    }
+                    Label
+                    {
+                        text: Cura.MachineManager.activeVariantBuildplateName
+                        width: (parent.width / 3) | 0
+                    }
+                }
+            }
 
             Repeater
             {