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

Refactoring: profile from Gcode

Browse Source 
CURA-4776
This commit is contained in:
Aleksei S 2018-01-10 11:19:19 +01:00
parent 33f0e8cb65
commit 95361bbeb2
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cura/Settings/CuraContainerRegistry.py
View File

@ -214,19 +214,7 @@ class CuraContainerRegistry(ContainerRegistry):
name_seed = os.path.splitext(os.path.basename(file_name))[0] name_seed = os.path.splitext(os.path.basename(file_name))[0]
new_name = self.uniqueName(name_seed) new_name = self.uniqueName(name_seed)
# if the loaded profile comes from g-code then the instance cointaners should be
# defined differently
file_extension = os.path.splitext(file_name)[1][1:]
if file_extension == "gcode":
for item in profile_or_list:
item.metaData["name"] = new_name
if item.getMetaDataEntry("extruder") is None:
temp_defintion = item.getMetaDataEntry("definition")
item.metaData["id"] = temp_defintion + "_" + new_name
elif item.getMetaDataEntry("extruder") is not None:
temp_extruder = item.getMetaDataEntry("extruder")
item.metaData["id"] = temp_extruder + "_" + new_name
# Ensure it is always a list of profiles # Ensure it is always a list of profiles
if type(profile_or_list) is not list: if type(profile_or_list) is not list:
@ -250,6 +238,16 @@ class CuraContainerRegistry(ContainerRegistry):
else: #More extruders in the imported file than in the machine. else: #More extruders in the imported file than in the machine.
continue #Delete the additional profiles. continue #Delete the additional profiles.
# if the loaded profile comes from g-code then the instance containers should be
# defined differently
if extension == "gcode":
if profile.getMetaDataEntry("extruder") is None:
temp_defintion = profile.getMetaDataEntry("definition")
profile.metaData["id"] = (temp_defintion + "_" + new_name).lower()
elif profile.getMetaDataEntry("extruder") is not None: # be sure that extruder data exist
temp_extruder = profile.getMetaDataEntry("extruder")
profile.metaData["id"] = (temp_extruder + "_" + new_name).lower()
result = self._configureProfile(profile, profile_id, new_name) result = self._configureProfile(profile, profile_id, new_name)
if result is not None: if result is not None:
return {"status": "error", "message": catalog.i18nc( return {"status": "error", "message": catalog.i18nc(