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

Don't make parent a common property

Browse source 
Instead we use properly-typed and appropriately-named variables in each of the sub classes.

Contributes to issue CURA-6600.
This commit is contained in:
Ghostkeeper 2019-08-06 16:31:57 +02:00
parent d3dc36c187
commit 8ec1c31b58
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
4 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cura/Machines/MaterialNode.py
View file

@ -16,8 +16,9 @@ if TYPE_CHECKING:
#
# Its subcontainers are quality profiles.
class MaterialNode(ContainerNode):
def __init__(self, container_id, parent: VariantNode) -> None:
super().__init__(container_id, parent)
def __init__(self, container_id, variant: VariantNode) -> None:
super().__init__(container_id)
self.variant = variant
self.qualities = {} # type: Dict[str, QualityNode] # Mapping container IDs to quality profiles.
container_registry = ContainerRegistry.getInstance()
my_metadata = container_registry.findContainersMetadata(id = container_id)[0]
@ -28,25 +29,25 @@ class MaterialNode(ContainerNode):
def _loadAll(self) -> None:
container_registry = ContainerRegistry.getInstance()
# Find all quality profiles that fit on this material.
if not self.parent.parent.has_machine_quality: # Need to find the global qualities.
if not self.variant.machine.has_machine_quality: # Need to find the global qualities.
qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter")
else:
qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.parent.parent.quality_definition, variant = self.parent.variant_name, material = self.base_file)
qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.base_file)
for quality in qualities:
quality_id = quality["id"]
if quality_id not in self.qualities:
self.qualities[quality_id] = QualityNode(quality_id, parent = self)
self.qualities[quality_id] = QualityNode(quality_id, material = self)
def _qualityAdded(self, container: ContainerInterface) -> None:
if container.getMetaDataEntry("type") != "quality":
return # Not interested.
if not self.parent.parent.has_machine_quality:
if not self.variant.machine.has_machine_quality:
if container.getMetaDataEntry("definition") != "fdmprinter":
return # Only want global qualities.
else:
if container.getMetaDataEntry("definition") != self.parent.parent.quality_definition or container.getMetaDataEntry("variant") != self.parent.variant_name or container.getMetaDataEntry("material") != self.base_file:
if container.getMetaDataEntry("definition") != self.variant.machine.quality_definition or container.getMetaDataEntry("variant") != self.variant.variant_name or container.getMetaDataEntry("material") != self.base_file:
return # Doesn't match our configuration.
quality_id = container.getId()
self.qualities[quality_id] = QualityNode(quality_id, parent = self)
self.qualities[quality_id] = QualityNode(quality_id, material = self)