3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' into cura_containerstack

Browse source
This commit is contained in:
Ghostkeeper 2017-05-03 15:21:01 +02:00
commit c42d092b0f
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
24 changed files with 1157 additions and 472 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cura/Settings/MachineManager.py
View file

@ -495,6 +495,17 @@ class MachineManager(QObject):
return result
@pyqtProperty("QVariantList", notify = activeVariantChanged)
def activeMaterialIds(self):
result = []
if ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks() is not None:
for stack in ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks():
variant_container = stack.findContainer({"type": "variant"})
if variant_container and variant_container != self._empty_variant_container:
result.append(variant_container.getId())
return result
@pyqtProperty("QVariantList", notify = activeMaterialChanged)
def activeMaterialNames(self):
result = []