3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix project loading for single-extrusion machines

Browse source 
CURA-4617
This commit is contained in:
Lipu Fei 2017-11-28 11:15:48 +01:00
parent 9db8bff924
commit 6db06ea713
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -827,6 +827,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
preferred_quality_id = global_stack.getMetaDataEntry("preferred_quality", None) preferred_quality_id = global_stack.getMetaDataEntry("preferred_quality", None)
if preferred_quality_id is not None: if preferred_quality_id is not None:
definition_id = global_stack.definition.getId() definition_id = global_stack.definition.getId()
definition_id = global_stack.definition.getMetaDataEntry("quality_definition", definition_id)
if not parseBool(global_stack.getMetaDataEntry("has_machine_quality", "False")): if not parseBool(global_stack.getMetaDataEntry("has_machine_quality", "False")):
definition_id = "fdmprinter" definition_id = "fdmprinter"
@ -859,25 +860,14 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# be correct. For example, for UM2, the quality container can be "draft" while it should be "um2_draft" # be correct. For example, for UM2, the quality container can be "draft" while it should be "um2_draft"
# instead. # instead.
# In this code branch, we try to fix those incorrect quality containers. # In this code branch, we try to fix those incorrect quality containers.
search_criteria = {"type": "quality", #
"quality_type": global_stack.quality.getMetaDataEntry("quality_type")} # ***IMPORTANT***: We only do this fix for single-extrusion machines.
search_criteria["definition"] = global_stack.definition.getId() # We will first find the correct quality profile for the extruder, then apply the same
if not parseBool(global_stack.getMetaDataEntry("has_machine_quality", "False")): # quality profile for the global stack.
search_criteria["definition"] = "fdmprinter" #
if len(extruder_stacks) == 1:
extruder_stack = extruder_stacks[0]
containers = self._container_registry.findInstanceContainers(**search_criteria)
containers = [c for c in containers if not c.getMetaDataEntry("material", "")]
if not containers:
# cannot find machine-specific qualities, so just use fdmprinter to search again
search_criteria["definition"] = "fdmprinter"
containers = self._container_registry.findInstanceContainers(**search_criteria)
containers = [c for c in containers if not c.getMetaDataEntry("material", "")]
if containers:
new_quality_container = containers[0]
global_stack.quality = new_quality_container
for extruder_stack in extruder_stacks:
search_criteria = {"type": "quality", search_criteria = {"type": "quality",
"quality_type": global_stack.quality.getMetaDataEntry("quality_type")} "quality_type": global_stack.quality.getMetaDataEntry("quality_type")}
search_criteria["definition"] = global_stack.definition.getId() search_criteria["definition"] = global_stack.definition.getId()
@ -888,7 +878,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
search_criteria["material"] = extruder_stack.material.getId() search_criteria["material"] = extruder_stack.material.getId()
containers = self._container_registry.findInstanceContainers(**search_criteria) containers = self._container_registry.findInstanceContainers(**search_criteria)
if containers: if containers:
extruder_stack.quality = containers[0] new_quality_container = containers[0]
extruder_stack.quality = new_quality_container
global_stack.quality = new_quality_container
# Replacing the old containers if resolve is "new". # Replacing the old containers if resolve is "new".
# When resolve is "new", some containers will get renamed, so all the other containers that reference to those # When resolve is "new", some containers will get renamed, so all the other containers that reference to those