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

CURA-4606 refactored activeMaterialNames

Browse source
This commit is contained in:
Jack Ha 2018-02-21 10:41:39 +01:00
parent c3349baf39
commit 471182333d
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/Settings/MachineManager.py
View file

@ -460,15 +460,7 @@ class MachineManager(QObject):
@pyqtProperty("QVariantList", notify = activeMaterialChanged) @pyqtProperty("QVariantList", notify = activeMaterialChanged)
def activeMaterialNames(self) -> List[str]: def activeMaterialNames(self) -> List[str]:
result = [] return list(self._current_root_material_name.values())
active_stacks = ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks()
if active_stacks is not None:
for stack in active_stacks:
material_container = stack.material
if material_container and material_container != self._empty_material_container:
result.append(material_container.getName())
return result
@pyqtProperty(str, notify=activeMaterialChanged) @pyqtProperty(str, notify=activeMaterialChanged)
def activeMaterialId(self) -> str: def activeMaterialId(self) -> str: