GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 09:45:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-6590_continue_fix_diameter_reset'

Browse Source
This commit is contained in:
Ghostkeeper 2019-07-08 15:05:20 +02:00
commit 6941af0022
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/Settings/MachineManager.py
View File

@ -1112,9 +1112,17 @@ class MachineManager(QObject):
def _onRootMaterialChanged(self) -> None: def _onRootMaterialChanged(self) -> None:
self._current_root_material_id = {} self._current_root_material_id = {}
changed = False
if self._global_container_stack: if self._global_container_stack:
for position in self._global_container_stack.extruders: for position in self._global_container_stack.extruders:
self._current_root_material_id[position] = self._global_container_stack.extruders[position].material.getMetaDataEntry("base_file") material_id = self._global_container_stack.extruders[position].material.getMetaDataEntry("base_file")
if position not in self._current_root_material_id or material_id != self._current_root_material_id[position]:
changed = True
self._current_root_material_id[position] = material_id
if changed:
self.activeMaterialChanged.emit()
@pyqtProperty("QVariant", notify = rootMaterialChanged) @pyqtProperty("QVariant", notify = rootMaterialChanged)
def currentRootMaterialId(self) -> Dict[str, str]: def currentRootMaterialId(self) -> Dict[str, str]:

9
resources/qml/Preferences/Materials/MaterialsPage.qml
View File

@ -49,6 +49,15 @@ Item
// When loaded, try to select the active material in the tree // When loaded, try to select the active material in the tree
Component.onCompleted: resetExpandedActiveMaterial() Component.onCompleted: resetExpandedActiveMaterial()
Connections
{
target: Cura.MachineManager
onActiveMaterialChanged:
{
resetExpandedActiveMaterial()
}
}
// Every time the selected item has changed, notify to the details panel // Every time the selected item has changed, notify to the details panel
onCurrentItemChanged: onCurrentItemChanged:
{ {

2
resources/qml/Preferences/Materials/MaterialsSlot.qml
View File

@ -51,7 +51,7 @@ Rectangle
anchors.left: swatch.right anchors.left: swatch.right
anchors.verticalCenter: materialSlot.verticalCenter anchors.verticalCenter: materialSlot.verticalCenter
anchors.leftMargin: UM.Theme.getSize("narrow_margin").width anchors.leftMargin: UM.Theme.getSize("narrow_margin").width
font.italic: Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex] == material.root_material_id font.italic: material != null && Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex] == material.root_material_id
} }
MouseArea MouseArea
{ {