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

Fix project loading for version upgrade

Browse source 
CURA-5054
This commit is contained in:
Lipu Fei 2018-03-09 19:35:21 +01:00
parent e09325bf82
commit 7312ed8e3c
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -306,12 +306,16 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if container_type == "quality_changes": if container_type == "quality_changes":
quality_changes_info_list.append(container_info) quality_changes_info_list.append(container_info)
if not parser.has_option("metadata", "extruder"): if not parser.has_option("metadata", "position"):
self._machine_info.quality_changes_info.name = parser["general"]["name"] self._machine_info.quality_changes_info.name = parser["general"]["name"]
self._machine_info.quality_changes_info.global_info = container_info self._machine_info.quality_changes_info.global_info = container_info
else:
position = parser["metadata"]["position"]
self._machine_info.quality_changes_info.extruder_info_dict[position] = container_info
quality_name = parser["general"]["name"] quality_name = parser["general"]["name"]
num_settings_overriden_by_quality_changes += len(parser.get("values", {})) values = parser["values"] if parser.has_section("values") else dict()
num_settings_overriden_by_quality_changes += len(values)
# Check if quality changes already exists. # Check if quality changes already exists.
quality_changes = self._container_registry.findInstanceContainers(id = container_id) quality_changes = self._container_registry.findInstanceContainers(id = container_id)
if quality_changes: if quality_changes:
@ -444,15 +448,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
machine_conflict = True machine_conflict = True
break break
if self._machine_info.quality_changes_info is not None:
for quality_changes_info in quality_changes_info_list:
if not quality_changes_info.parser.has_option("metadata", "extruder"):
continue
extruder_definition_id = quality_changes_info.parser["metadata"]["extruder"]
extruder_definition_metadata = self._container_registry.findDefinitionContainersMetadata(id = extruder_definition_id)[0]
position = extruder_definition_metadata["position"]
self._machine_info.quality_changes_info.extruder_info_dict[position] = quality_changes_info
num_visible_settings = 0 num_visible_settings = 0
try: try:
temp_preferences = Preferences() temp_preferences = Preferences()