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

Properly fix machinemanager access

Browse source 
Contributes to CURA-2006
This commit is contained in:
Arjen Hiemstra 2016-08-04 18:04:32 +02:00
parent 324d1415d7
commit 7b9c982c62
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/Settings/ContainerManager.py
View file

@ -362,7 +362,7 @@ class ContainerManager(QObject):
UM.Logger.log("e", "Could not update quality of a nonexistant or read only quality profile") UM.Logger.log("e", "Could not update quality of a nonexistant or read only quality profile")
return False return False
cura.Settings.MachineManager.getInstance().blurSettings.emit() UM.Application.getInstance().getMachineManager().blurSettings.emit()
containers_to_merge.append((global_quality_changes, global_stack.getTop())) containers_to_merge.append((global_quality_changes, global_stack.getTop()))
@ -377,13 +377,13 @@ class ContainerManager(QObject):
for merge_into, merge in containers_to_merge: for merge_into, merge in containers_to_merge:
self._performMerge(merge_into, merge) self._performMerge(merge_into, merge)
cura.Settings.MachineManager.getInstance().activeQualityChanged.emit() UM.Application.getInstance().getMachineManager().activeQualityChanged.emit()
@pyqtSlot() @pyqtSlot()
def clearUserContainers(self): def clearUserContainers(self):
global_stack = UM.Application.getInstance().getGlobalContainerStack() global_stack = UM.Application.getInstance().getGlobalContainerStack()
cura.Settings.MachineManager.getInstance().blurSettings.emit() UM.Application.getInstance().getMachineManager().blurSettings.emit()
for extruder in cura.Settings.ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()): for extruder in cura.Settings.ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):
extruder.getTop().clear() extruder.getTop().clear()
@ -401,7 +401,7 @@ class ContainerManager(QObject):
UM.Logger.log("w", "No quality container found in stack %s, cannot create profile", global_stack.getId()) UM.Logger.log("w", "No quality container found in stack %s, cannot create profile", global_stack.getId())
return False return False
cura.Settings.MachineManager.getInstance().blurSettings.emit() UM.Application.getInstance().getMachineManager().blurSettings.emit()
unique_name = UM.Settings.ContainerRegistry.getInstance().uniqueName(quality_container.getName()) unique_name = UM.Settings.ContainerRegistry.getInstance().uniqueName(quality_container.getName())
unique_id = unique_name.lower() unique_id = unique_name.lower()
@ -434,7 +434,7 @@ class ContainerManager(QObject):
stack.replaceContainer(stack.getContainerIndex(quality_changes_container), new_quality_changes) stack.replaceContainer(stack.getContainerIndex(quality_changes_container), new_quality_changes)
stack.getTop().clear() stack.getTop().clear()
cura.Settings.MachineManager.getInstance().activeQualityChanged.emit() UM.Application.getInstance().getMachineManager().activeQualityChanged.emit()
return True return True
# Factory function, used by QML # Factory function, used by QML