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

Explicitly create MachineManager

Browse source
This commit is contained in:
Lipu Fei 2018-02-26 19:33:16 +01:00
parent 12c51f4066
commit 0b8678d2ae
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -750,7 +750,7 @@ class CuraApplication(QtApplication):
self._quality_manager = QualityManager(container_registry, parent = self) self._quality_manager = QualityManager(container_registry, parent = self)
self._quality_manager.initialize() self._quality_manager.initialize()
self.getMachineManager() # ensure creation of machine manager self._machine_manager = MachineManager(self)
# Check if we should run as single instance or not # Check if we should run as single instance or not
self._setUpSingleInstanceServer() self._setUpSingleInstanceServer()
@ -845,7 +845,7 @@ class CuraApplication(QtApplication):
def getMachineManager(self, *args) -> MachineManager: def getMachineManager(self, *args) -> MachineManager:
if self._machine_manager is None: if self._machine_manager is None:
self._machine_manager = MachineManager.createMachineManager() self._machine_manager = MachineManager(self)
return self._machine_manager return self._machine_manager
def getExtruderManager(self, *args): def getExtruderManager(self, *args):

4
cura/Settings/MachineManager.py
View file

@ -760,10 +760,6 @@ class MachineManager(QObject):
# Signal that the global stack has changed # Signal that the global stack has changed
Application.getInstance().globalContainerStackChanged.emit() Application.getInstance().globalContainerStackChanged.emit()
@staticmethod
def createMachineManager():
return MachineManager()
@pyqtSlot(int, result = QObject) @pyqtSlot(int, result = QObject)
def getExtruder(self, position: int): def getExtruder(self, position: int):
extruder = None extruder = None