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

comments fix and clean code

Browse source 
CURA-18869
This commit is contained in:
saumya.jain 2023-09-15 10:56:48 +02:00
parent 863f6fd43b
commit f3829c3ebe
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
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,14 +1136,7 @@ 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():
value_not_in_missing_package = True if not self._settingIsFromMissingPackage(key, value):
if "PLUGIN" in value:
for package in self._dialog.missingPackages:
if (package['id']+"@"+package['package_version']) in value:
value_not_in_missing_package = False
Logger.log("w", f"Ignoring {key} value {value} from missing package")
if value_not_in_missing_package :
extruder_stack.userChanges.setProperty(key, "value", value) extruder_stack.userChanges.setProperty(key, "value", value)
def _applyVariants(self, global_stack, extruder_stack_dict): def _applyVariants(self, global_stack, extruder_stack_dict):
@ -1216,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()
@ -1335,3 +1340,4 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
missing_packages.append(package) missing_packages.append(package)
return missing_packages return missing_packages