diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2017-08-10 13:24:51 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2017-08-10 13:24:51 +0300 |
| commit | def2e1f203146a202ef5671bc4b08778de6b5ae1 (patch) | |
| tree | c787cd046d39d16f05def8d14e05256be67998b6 /cura | |
| parent | 0a76e5c38f600ed8d797b492566681c617244d29 (diff) | |
| parent | 4bac499c221ebf70bff3f114ab2f9b18e0b5f0f2 (diff) | |
Merge branch '2.7'
Diffstat (limited to 'cura')
| -rw-r--r-- | cura/Settings/CuraContainerRegistry.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 52760d7782..c991c8f9ca 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -292,10 +292,18 @@ class CuraContainerRegistry(ContainerRegistry): profile.setDefinition(ContainerRegistry.getInstance().findDefinitionContainers(id="fdmprinter")[0])
quality_type_criteria["definition"] = "fdmprinter"
+ machine_definition = Application.getInstance().getGlobalContainerStack().getBottom()
+ del quality_type_criteria["definition"]
+ materials = None
+ if "material" in quality_type_criteria:
+ materials = ContainerRegistry.getInstance().findInstanceContainers(id = quality_type_criteria["material"])
+ del quality_type_criteria["material"]
+
# Check to make sure the imported profile actually makes sense in context of the current configuration.
# This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as
# successfully imported but then fail to show up.
- qualities = self.findInstanceContainers(**quality_type_criteria)
+ from cura.QualityManager import QualityManager
+ qualities = QualityManager.getInstance()._getFilteredContainersForStack(machine_definition, materials, **quality_type_criteria)
if not qualities:
return catalog.i18nc("@info:status", "Could not find a quality type {0} for the current configuration.", quality_type)
|