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

Remove part of hack for fixing extrudersCHanged signal at the wrong time.

Browse Source 
Other things rely on the extruders changed signal so it is better to just emit it again at the correct time.

CURA-9793
This commit is contained in:
Joey de l'Arago 2022-12-08 13:11:14 +01:00
parent 82fd34f168
commit e6f4055df5
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cura/Settings/ExtruderManager.py
View File

@ -49,11 +49,6 @@ class ExtruderManager(QObject):
Selection.selectionChanged.connect(self.resetSelectedObjectExtruders)
Application.getInstance().globalContainerStackChanged.connect(self.emitGlobalStackExtrudersChanged) # When the machine is swapped we must update the active machine extruders
# Don't use this unless you are reading from ExtruderManager.extruderIds when receiving the signal
globalStackExtrudersChanged = pyqtSignal()
# This signal actually emits before the global stacks extruders are updated, changing this behaviour breaks too many things
# Use globalStackExtrudersChanged = pyqtSignal() if you want a trigger when the extrduerIds property changes.
extrudersChanged = pyqtSignal(QVariant)
"""Signal to notify other components when the list of extruders for a machine definition changes."""
@ -62,14 +57,10 @@ class ExtruderManager(QObject):
def emitGlobalStackExtrudersChanged(self):
# The emit function can't be directly connected to another signal. This wrapper function is required.
self.globalStackExtrudersChanged.emit()
@pyqtProperty("QVariantMap", notify = globalStackExtrudersChanged)
def globalStackExtruderIds(self) -> Dict[str, str]:
# The extruderIds property notifys changed before the extruders are changed on switching machines
# trying to fix this broke to many things. This is a workaround. Don't use this unless you need to read
# extruderIds directly after a machine update.
return self.extruderIds
# The extrudersChanged signal is emitted early when changing machines. This triggers it a second time
# after the extruder have changed properly. This is important for any QML using ExtruderManager.extruderIds
# This is a hack, but other behaviour relys on the updating in this order.
self.extrudersChanged.emit(self._application.getGlobalContainerStack().getId())
@pyqtProperty(int, notify = extrudersChanged)
def enabledExtruderCount(self) -> int:

2
resources/qml/Widgets/SingleSettingComboBox.qml
View File

@ -66,7 +66,7 @@ Cura.ComboBox {
property UM.SettingPropertyProvider propertyProvider: UM.SettingPropertyProvider
{
id: propertyProvider
containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
watchedProperties: ["value" , "options"]
}

2
resources/qml/Widgets/SingleSettingSlider.qml
View File

@ -34,7 +34,7 @@ RowLayout
UM.SettingPropertyProvider
{
id: propertyProvider
containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
watchedProperties: ["value"]
storeIndex: 0
}

2
resources/qml/Widgets/SingleSettingTextField.qml
View File

@ -53,7 +53,7 @@ UM.TextField
{
id: propertyProvider
watchedProperties: ["value", "validationState", "resolve"]
containerStackId: updateAllExtruders ? Cura.ExtruderManager.globalStackExtruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
}
Connections