GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 22:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed importing profiles for machines with inheritance

Browse Source
This commit is contained in:
Jaime van Kessel 2016-10-16 14:20:04 +02:00
parent 3afd813e5e
commit 95f2b84fb5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cura/Settings/CuraContainerRegistry.py
View File

@ -142,6 +142,7 @@ class CuraContainerRegistry(ContainerRegistry):
# \return \type{Dict} dict with a 'status' key containing the string 'ok' or 'error', and a 'message' key # \return \type{Dict} dict with a 'status' key containing the string 'ok' or 'error', and a 'message' key
# containing a message for the user # containing a message for the user
def importProfile(self, file_name): def importProfile(self, file_name):
Logger.log("d", "Attempting to import profile %s", file_name)
if not file_name: if not file_name:
return { "status": "error", "message": catalog.i18nc("@info:status", "Failed to import profile from <filename>{0}</filename>: <message>{1}</message>", file_name, "Invalid path")} return { "status": "error", "message": catalog.i18nc("@info:status", "Failed to import profile from <filename>{0}</filename>: <message>{1}</message>", file_name, "Invalid path")}
@ -181,7 +182,7 @@ class CuraContainerRegistry(ContainerRegistry):
for profile in profile_or_list: for profile in profile_or_list:
if profile_index >= 0: if profile_index >= 0:
if len(machine_extruders) > profile_index: if len(machine_extruders) > profile_index:
extruder_id = machine_extruders[profile_index].getBottom().getId() extruder_id = Application.getInstance().getMachineManager().getQualityDefinitionId(machine_extruders[profile_index].getBottom())
# Ensure the extruder profiles get non-conflicting names # Ensure the extruder profiles get non-conflicting names
# NB: these are not user-facing # NB: these are not user-facing
if "extruder" in profile.getMetaData(): if "extruder" in profile.getMetaData():