diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2018-07-11 11:57:55 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2018-07-11 11:57:57 +0300 |
| commit | 76417b7fb2069cca39f774c7fbf47c7120afa480 (patch) | |
| tree | 3b83f402eaec33e8d5315e6c55772ed2decb47a5 /cura/CuraPackageManager.py | |
| parent | 5255d6ca2a162a6637fdeaef89e798a16d380968 (diff) | |
Hide materials belong to a to-be-removed package
Diffstat (limited to 'cura/CuraPackageManager.py')
| -rw-r--r-- | cura/CuraPackageManager.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 95b381989f..363b8034ec 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -6,7 +6,6 @@ from cura.Settings.GlobalStack import GlobalStack from UM.PackageManager import PackageManager #The class we're extending. from UM.Resources import Resources #To find storage paths for some resource types. -from UM.Settings.ContainerRegistry import ContainerRegistry class CuraPackageManager(PackageManager): @@ -25,14 +24,14 @@ class CuraPackageManager(PackageManager): # The list consists of 3-tuples: (global_stack, extruder_nr, container_id) def getMachinesUsingPackage(self, package_id: str): ids = self.getPackageContainerIds(package_id) - container_stacks = ContainerRegistry.getInstance().findContainerStacks() + container_stacks = self._application.getContainerRegistry().findContainerStacks() global_stacks = [container_stack for container_stack in container_stacks if isinstance(container_stack, GlobalStack)] machine_with_materials = [] machine_with_qualities = [] for container_id in ids: for global_stack in global_stacks: for extruder_nr, extruder_stack in global_stack.extruders.items(): - if container_id == extruder_stack.material.getId() or container_id == extruder_stack.material.getMetaData().get("base_file"): + if container_id in (extruder_stack.material.getId(), extruder_stack.material.getMetaData().get("base_file")): machine_with_materials.append((global_stack, extruder_nr, container_id)) if container_id == extruder_stack.quality.getId(): machine_with_qualities.append((global_stack, extruder_nr, container_id)) |