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

Use globalContainer stack instead of activeInstance

Browse Source 
CURA-1278
This commit is contained in:
Jaime van Kessel 2016-05-10 11:40:36 +02:00
parent 93227c0b56
commit 170df747b3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/CuraApplication.py
View File

@ -101,8 +101,6 @@ class CuraApplication(QtApplication):
self._camera_animation = None self._camera_animation = None
self._cura_actions = None self._cura_actions = None
#self.getMachineManager().activeMachineInstanceChanged.connect(self._onGlobalContainerStackChanged)
#self.getMachineManager().addMachineRequested.connect(self._onAddMachineRequested)
self.getController().getScene().sceneChanged.connect(self.updatePlatformActivity) self.getController().getScene().sceneChanged.connect(self.updatePlatformActivity)
self.getController().toolOperationStopped.connect(self._onToolOperationStopped) self.getController().toolOperationStopped.connect(self._onToolOperationStopped)

2
cura/PrintInformation.py
View File

@ -63,6 +63,6 @@ class PrintInformation(QObject):
self.currentPrintTimeChanged.emit() self.currentPrintTimeChanged.emit()
# Material amount is sent as an amount of mm^3, so calculate length from that # Material amount is sent as an amount of mm^3, so calculate length from that
r = Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("material_diameter") / 2 r = Application.getInstance().getGlobalContainerStack().getValue("material_diameter") / 2
self._material_amount = round((amount / (math.pi * r ** 2)) / 1000, 2) self._material_amount = round((amount / (math.pi * r ** 2)) / 1000, 2)
self.materialAmountChanged.emit() self.materialAmountChanged.emit()