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

Don't break if current settings machine is unknown

Browse Source 
Currently it sets the user profile to 'empty', which is bad because empty is read-only. But it allows me to continue for now. I'll find a solution for that later.

Contributes to issue CURA-844.
This commit is contained in:
Ghostkeeper 2016-08-09 17:01:11 +02:00
parent 36b027b290
commit 9c7a28fa2d
No known key found for this signature in database
GPG Key ID: 701948C5954A7385
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py
View File

@ -79,9 +79,13 @@ class MachineInstance:
if self._type_name in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality(): #This machine now has machine-quality profiles.
active_profile += "_" + active_material #That means that the profile was split into multiple.
variant = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateVariant(self._variant_name, type_name)
if self._type_name in VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.machinesWithMachineQuality(): #The current settings profile is now machine-specific.
current_settings = "empty" #The profile didn't know the definition ID when it was upgraded, so it will have been invalid. Sorry, your current settings are lost now.
else:
current_settings = self._name + "_current_settings"
containers = [
self._name + "_current_settings",
current_settings,
active_profile,
active_material,
variant,

2
plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
View File

@ -99,7 +99,7 @@ class Profile:
translated_machine = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translatePrinter(self._machine_type_id)
config.set("general", "definition", translated_machine)
else:
config.set("general", "definition", "fdmprinter")
config.set("general", "definition", "fdmprinter") #In this case, the machine definition is unknown, and it might now have machine-specific profiles, in which case this will fail.
config.add_section("metadata")
if self._type: