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

Now the right extruder is actually used (instead of randomly mixing it up)

Browse source 
CURA-1758
This commit is contained in:
Jaime van Kessel 2016-07-21 21:42:02 +02:00
parent 568d30d17b
commit 87b9b17f98
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/ExtruderManager.py
View file

@ -47,9 +47,12 @@ class ExtruderManager(QObject):
return 0 # No active machine, so no extruders. return 0 # No active machine, so no extruders.
return len(self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getId()]) return len(self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getId()])
@pyqtProperty("QVariantList", notify=extrudersChanged) @pyqtProperty("QVariantMap", notify=extrudersChanged)
def extruderIds(self): def extruderIds(self):
return [self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getId()][extruder].getId() for extruder in self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getId()]] map = {}
for position in self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getId()]:
map[position] = self._extruder_trains[UM.Application.getInstance().getGlobalContainerStack().getId()][position].getId()
return map
## The instance of the singleton pattern. ## The instance of the singleton pattern.
# #

2
resources/qml/Settings/SettingView.qml
View file

@ -111,7 +111,7 @@ ScrollView
return Cura.MachineManager.activeMachineId return Cura.MachineManager.activeMachineId
} }
} }
return ExtruderManager.extruderIds[inheritStackProvider.properties.global_inherits_stack] return ExtruderManager.extruderIds[String(inheritStackProvider.properties.global_inherits_stack)]
} }
} }