3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Order of extruders is now sorted by position

Browse source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-12-16 13:29:51 +01:00
parent ff18a314ef
commit f598a49c4b
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/ExtruderManager.py
View file

@ -395,7 +395,12 @@ class ExtruderManager(QObject):
# \return \type{List[ContainerStack]} a list of # \return \type{List[ContainerStack]} a list of
def getActiveExtruderStacks(self): def getActiveExtruderStacks(self):
global_stack = UM.Application.getInstance().getGlobalContainerStack() 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): def __globalContainerStackChanged(self):
self._addCurrentMachineExtruders() self._addCurrentMachineExtruders()

10
resources/qml/WorkspaceSummaryDialog.qml
View file

@ -127,6 +127,11 @@ UM.Dialog
model: Cura.MachineManager.activeMaterialNames model: Cura.MachineManager.activeMaterialNames
delegate: Column delegate: Column
{ {
Item // Spacer
{
height: spacerHeight
width: height
}
Label Label
{ {
text: catalog.i18nc("@action:label", "Extruder %1").arg(index+1) text: catalog.i18nc("@action:label", "Extruder %1").arg(index+1)
@ -193,7 +198,7 @@ UM.Dialog
} }
} }
Item // Spacer /*Item // Spacer
{ {
height: spacerHeight height: spacerHeight
width: height width: height
@ -223,8 +228,7 @@ UM.Dialog
width: parent.width / 3 width: parent.width / 3
} }
} }
} }*/
Item // Spacer Item // Spacer
{ {