GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 17:25:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16711 from Ultimaker/CURA-10915_open_projects_anyway

Browse Source 
Opening the value of setting only if they are not in missing packages
This commit is contained in:
Erwan MATHIEU 2023-09-15 11:47:12 +02:00 committed by GitHub
commit 40602591d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -1095,7 +1095,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if global_stack.getProperty(key, "settable_per_extruder"): if global_stack.getProperty(key, "settable_per_extruder"):
values_to_set_for_extruders[key] = value values_to_set_for_extruders[key] = value
else: else:
global_stack.definitionChanges.setProperty(key, "value", value) if not self._settingIsFromMissingPackage(key, value):
global_stack.definitionChanges.setProperty(key, "value", value)
for position, extruder_stack in extruder_stack_dict.items(): for position, extruder_stack in extruder_stack_dict.items():
if position not in self._machine_info.extruder_info_dict: if position not in self._machine_info.extruder_info_dict:
@ -1109,7 +1110,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
extruder_stack.definitionChanges.setProperty(key, "value", value) extruder_stack.definitionChanges.setProperty(key, "value", value)
if parser is not None: if parser is not None:
for key, value in parser["values"].items(): for key, value in parser["values"].items():
extruder_stack.definitionChanges.setProperty(key, "value", value) if not self._settingIsFromMissingPackage(key, value):
extruder_stack.definitionChanges.setProperty(key, "value", value)
def _applyUserChanges(self, global_stack, extruder_stack_dict): def _applyUserChanges(self, global_stack, extruder_stack_dict):
values_to_set_for_extruder_0 = {} values_to_set_for_extruder_0 = {}
@ -1119,7 +1121,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if global_stack.getProperty(key, "settable_per_extruder"): if global_stack.getProperty(key, "settable_per_extruder"):
values_to_set_for_extruder_0[key] = value values_to_set_for_extruder_0[key] = value
else: else:
global_stack.userChanges.setProperty(key, "value", value) if not self._settingIsFromMissingPackage(key, value):
global_stack.userChanges.setProperty(key, "value", value)
for position, extruder_stack in extruder_stack_dict.items(): for position, extruder_stack in extruder_stack_dict.items():
if position not in self._machine_info.extruder_info_dict: if position not in self._machine_info.extruder_info_dict:
@ -1133,7 +1136,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
extruder_stack.userChanges.setProperty(key, "value", value) extruder_stack.userChanges.setProperty(key, "value", value)
if parser is not None: if parser is not None:
for key, value in parser["values"].items(): for key, value in parser["values"].items():
extruder_stack.userChanges.setProperty(key, "value", value) if not self._settingIsFromMissingPackage(key, value):
extruder_stack.userChanges.setProperty(key, "value", value)
def _applyVariants(self, global_stack, extruder_stack_dict): def _applyVariants(self, global_stack, extruder_stack_dict):
machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()]
@ -1208,6 +1212,15 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if key not in _ignored_machine_network_metadata: if key not in _ignored_machine_network_metadata:
global_stack.setMetaDataEntry(key, value) global_stack.setMetaDataEntry(key, value)
def _settingIsFromMissingPackage(self, key, value):
# Check if the key and value pair is from the missing package
for package in self._dialog.missingPackages:
if value.startswith("PLUGIN::"):
if (package['id'] + "@" + package['package_version']) in value:
Logger.log("w", f"Ignoring {key} value {value} from missing package")
return True
return False
def _updateActiveMachine(self, global_stack): def _updateActiveMachine(self, global_stack):
# Actually change the active machine. # Actually change the active machine.
machine_manager = Application.getInstance().getMachineManager() machine_manager = Application.getInstance().getMachineManager()
@ -1327,3 +1340,4 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
missing_packages.append(package) missing_packages.append(package)
return missing_packages return missing_packages