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

Remove usage of some deprecated functions

Browse source
This commit is contained in:
Jaime van Kessel 2019-05-16 14:49:53 +02:00
parent 2eb8203c70
commit a0c705e900
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/qml/Settings/SettingView.qml
View file

@ -271,6 +271,8 @@ Item
property var globalPropertyProvider: inheritStackProvider
property var externalResetHandler: false
property string activeMachineId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id : ""
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
//causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
@ -314,16 +316,15 @@ Item
when: model.settable_per_extruder || (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0);
value:
{
// associate this binding with Cura.MachineManager.activeMachineId in the beginning so this
// Associate this binding with Cura.MachineManager.activeMachine.id in the beginning so this
// binding will be triggered when activeMachineId is changed too.
// Otherwise, if this value only depends on the extruderIds, it won't get updated when the
// machine gets changed.
var activeMachineId = Cura.MachineManager.activeMachineId;
if (!model.settable_per_extruder)
{
//Not settable per extruder or there only is global, so we must pick global.
return activeMachineId;
return delegate.activeMachineId
}
if (inheritStackProvider.properties.limit_to_extruder != null && inheritStackProvider.properties.limit_to_extruder >= 0)
{
@ -336,7 +337,7 @@ Item
return Cura.ExtruderManager.activeExtruderStackId;
}
//No extruder tab is selected. Pick the global stack. Shouldn't happen any more since we removed the global tab.
return activeMachineId;
return delegate.activeMachineId
}
}
@ -345,7 +346,7 @@ Item
UM.SettingPropertyProvider
{
id: inheritStackProvider
containerStackId: Cura.MachineManager.activeMachineId
containerStackId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id: ""
key: model.key
watchedProperties: [ "limit_to_extruder" ]
}
@ -354,7 +355,7 @@ Item
{
id: provider
containerStackId: Cura.MachineManager.activeMachineId
containerStackId: delegate.activeMachineId
key: model.key ? model.key : ""
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
storeIndex: 0
@ -564,7 +565,7 @@ Item
{
id: machineExtruderCount
containerStackId: Cura.MachineManager.activeMachineId
containerStackId: delegate.activeMachineId
key: "machine_extruder_count"
watchedProperties: [ "value" ]
storeIndex: 0