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

CURA-4606 Cleanup WorkspaceSummaryDialog and prepare for single extrusion mode

Browse source
This commit is contained in:
Jack Ha 2018-02-21 11:13:35 +01:00
parent 471182333d
commit 2e3e01ff95
2 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

41
cura/Settings/MachineManager.py
View file

@ -444,24 +444,6 @@ class MachineManager(QObject):
return "" return ""
@pyqtProperty("QVariantList", notify=activeVariantChanged)
def activeVariantNames(self) -> List[str]:
result = []
# Just return the variants in the extruder stack(s). For the variant in the global stack, use activeVariantBuildplateName
active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
if active_stacks is not None:
for stack in active_stacks:
variant_container = stack.variant
if variant_container and variant_container != self._empty_variant_container:
result.append(variant_container.getName())
return result
@pyqtProperty("QVariantList", notify = activeMaterialChanged)
def activeMaterialNames(self) -> List[str]:
return list(self._current_root_material_name.values())
@pyqtProperty(str, notify=activeMaterialChanged) @pyqtProperty(str, notify=activeMaterialChanged)
def activeMaterialId(self) -> str: def activeMaterialId(self) -> str:
if self._active_container_stack: if self._active_container_stack:
@ -898,6 +880,12 @@ class MachineManager(QObject):
# #
# New # New
# #
# We not fetch it from _current_root_material_id, but later we can get it from somewhere else
@pyqtProperty("QVariantList", notify = rootMaterialChanged)
def currentExtruderPositions(self):
return sorted(list(self._current_root_material_id.keys()))
@pyqtProperty("QVariant", notify = rootMaterialChanged) @pyqtProperty("QVariant", notify = rootMaterialChanged)
def currentRootMaterialId(self): def currentRootMaterialId(self):
# initial filling the current_root_material_id # initial filling the current_root_material_id
@ -909,12 +897,29 @@ class MachineManager(QObject):
@pyqtProperty("QVariant", notify = rootMaterialChanged) @pyqtProperty("QVariant", notify = rootMaterialChanged)
def currentRootMaterialName(self): def currentRootMaterialName(self):
# initial filling the current_root_material_name # initial filling the current_root_material_name
if self._global_container_stack:
for position in self._global_container_stack.extruders: for position in self._global_container_stack.extruders:
if position not in self._current_root_material_name: if position not in self._current_root_material_name:
material = self._global_container_stack.extruders[position].material material = self._global_container_stack.extruders[position].material
self._current_root_material_name[position] = material.getName() self._current_root_material_name[position] = material.getName()
return self._current_root_material_name return self._current_root_material_name
## Return the variant names in the extruder stack(s).
## For the variant in the global stack, use activeVariantBuildplateName
@pyqtProperty("QVariant", notify = activeVariantChanged)
def activeVariantNames(self):
result = {}
active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
if active_stacks is not None:
for stack in active_stacks:
variant_container = stack.variant
position = stack.getMetaDataEntry("position")
if variant_container and variant_container != self._empty_variant_container:
result[position] = variant_container.getName()
return result
def _setEmptyQuality(self): def _setEmptyQuality(self):
self._current_quality_group = None self._current_quality_group = None
self._current_quality_changes_group = None self._current_quality_changes_group = None

6
resources/qml/WorkspaceSummaryDialog.qml
View file

@ -148,7 +148,7 @@ UM.Dialog
Repeater Repeater
{ {
model: Cura.MachineManager.activeMaterialNames model: Cura.MachineManager.currentExtruderPositions
delegate: Column delegate: Column
{ {
Item // Spacer Item // Spacer
@ -158,7 +158,7 @@ UM.Dialog
} }
Label Label
{ {
text: catalog.i18nc("@action:label", "Extruder %1").arg(index+1) text: catalog.i18nc("@action:label", "Extruder %1").arg(modelData)
} }
height: childrenRect.height height: childrenRect.height
width: parent.width width: parent.width
@ -173,7 +173,7 @@ UM.Dialog
} }
Label Label
{ {
text: Cura.MachineManager.activeVariantNames[index] + ", " + modelData text: Cura.MachineManager.activeVariantNames[modelData] + ", " + Cura.MachineManager.currentRootMaterialName[modelData]
width: (parent.width / 3) | 0 width: (parent.width / 3) | 0
} }
} }