diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2016-12-16 15:29:51 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2016-12-16 15:29:51 +0300 |
| commit | f598a49c4bb833dbbe8f6507c54230568d0b30ea (patch) | |
| tree | b9d4cf9d570519b531883e6d922d102c1cf20e50 | |
| parent | ff18a314eff3bf81e44d233d78ec6af18ab28e2f (diff) | |
Order of extruders is now sorted by position
CURA-1263
| -rw-r--r-- | cura/Settings/ExtruderManager.py | 7 | ||||
| -rw-r--r-- | resources/qml/WorkspaceSummaryDialog.qml | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index a0db1bbf83..e98386a908 100644 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -395,7 +395,12 @@ class ExtruderManager(QObject): # \return \type{List[ContainerStack]} a list of def getActiveExtruderStacks(self): global_stack = UM.Application.getInstance().getGlobalContainerStack() - return list(self._extruder_trains[global_stack.getId()].values()) if global_stack else [] + + result = [] + if global_stack: + for extruder in sorted(self._extruder_trains[global_stack.getId()]): + result.append(self._extruder_trains[global_stack.getId()][extruder]) + return result def __globalContainerStackChanged(self): self._addCurrentMachineExtruders() diff --git a/resources/qml/WorkspaceSummaryDialog.qml b/resources/qml/WorkspaceSummaryDialog.qml index 61022ca3b4..1b73b276fd 100644 --- a/resources/qml/WorkspaceSummaryDialog.qml +++ b/resources/qml/WorkspaceSummaryDialog.qml @@ -127,6 +127,11 @@ UM.Dialog model: Cura.MachineManager.activeMaterialNames delegate: Column { + Item // Spacer + { + height: spacerHeight + width: height + } Label { text: catalog.i18nc("@action:label", "Extruder %1").arg(index+1) @@ -193,7 +198,7 @@ UM.Dialog } } - Item // Spacer + /*Item // Spacer { height: spacerHeight width: height @@ -223,8 +228,7 @@ UM.Dialog width: parent.width / 3 } } - } - + }*/ Item // Spacer { |