mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-25 07:33:57 -06:00
Make ContainerTree singleton but construct in run() of application
We want to make sure that this tree is constructed during start-up after all containers have been registered, so we call getInstance() there once. If you need the tree before that, the tree will not yet have been filled and you won't get complete information, so you'd need to listen for updates. The singleton is there so you don't need to go via CuraApplication. Contributes to issue CURA-6600.
This commit is contained in:
parent
65360c31ef
commit
e106692165
2 changed files with 12 additions and 0 deletions
|
@ -70,6 +70,7 @@ from cura.Scene.CuraSceneNode import CuraSceneNode
|
||||||
from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator
|
from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator
|
||||||
from cura.Scene import ZOffsetDecorator
|
from cura.Scene import ZOffsetDecorator
|
||||||
|
|
||||||
|
from cura.Machines.ContainerTree import ContainerTree
|
||||||
from cura.Machines.MachineErrorChecker import MachineErrorChecker
|
from cura.Machines.MachineErrorChecker import MachineErrorChecker
|
||||||
import cura.Machines.MaterialManager #Imported like this to prevent circular imports.
|
import cura.Machines.MaterialManager #Imported like this to prevent circular imports.
|
||||||
import cura.Machines.QualityManager #Imported like this to prevent circular imports.
|
import cura.Machines.QualityManager #Imported like this to prevent circular imports.
|
||||||
|
@ -731,6 +732,9 @@ class CuraApplication(QtApplication):
|
||||||
def run(self):
|
def run(self):
|
||||||
super().run()
|
super().run()
|
||||||
|
|
||||||
|
Logger.log("i", "Building container tree.")
|
||||||
|
ContainerTree.getInstance()
|
||||||
|
|
||||||
Logger.log("i", "Initializing machine manager")
|
Logger.log("i", "Initializing machine manager")
|
||||||
self._machine_manager = MachineManager(self, parent = self)
|
self._machine_manager = MachineManager(self, parent = self)
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,14 @@ from typing import Dict
|
||||||
# The tree starts at the machine definitions. For every distinct definition
|
# The tree starts at the machine definitions. For every distinct definition
|
||||||
# there will be one machine node here.
|
# there will be one machine node here.
|
||||||
class ContainerTree:
|
class ContainerTree:
|
||||||
|
__instance = None
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def getInstance(cls):
|
||||||
|
if cls.__instance is None:
|
||||||
|
cls.__instance = ContainerTree()
|
||||||
|
return cls.__instance
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes.
|
self.machines = {} # type: Dict[str, MachineNode] # Mapping from definition ID to machine nodes.
|
||||||
container_registry = ContainerRegistry.getInstance()
|
container_registry = ContainerRegistry.getInstance()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue