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

Deprecated the allActiveMaterialIds and replaced the single location where it was used

Browse Source 
CURA-6600
This commit is contained in:
Jaime van Kessel 2019-08-21 17:08:35 +02:00
parent 7979fcd633
commit e7609fadf4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/Settings/MachineManager.py
View File

@ -602,6 +602,7 @@ class MachineManager(QObject):
# #
# \return The material ids in all stacks # \return The material ids in all stacks
@pyqtProperty("QVariantMap", notify = activeMaterialChanged) @pyqtProperty("QVariantMap", notify = activeMaterialChanged)
@deprecated("use Cura.MachineManager.activeStack.extruders instead.", "4.3")
def allActiveMaterialIds(self) -> Dict[str, str]: def allActiveMaterialIds(self) -> Dict[str, str]:
result = {} result = {}

3
resources/qml/Menus/MaterialMenu.qml
View File

@ -14,7 +14,8 @@ Menu
property int extruderIndex: 0 property int extruderIndex: 0
property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex]
property string activeMaterialId: Cura.MachineManager.allActiveMaterialIds[Cura.ExtruderManager.extruderIds[extruderIndex]]
property string activeMaterialId: Cura.MachineManager.activeMachine.extruders[extruderIndex].material.id
property bool updateModels: true property bool updateModels: true
Cura.FavoriteMaterialsModel Cura.FavoriteMaterialsModel
{ {