Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework

cura/CuraApplication.py

@@ -224,6 +224,7 @@ class CuraApplication(QtApplication):
     ##  Handle loading of all plugin types (and the backend explicitly)
     #   \sa PluginRegistery
     def _loadPlugins(self):
+        self._plugin_registry.addType("profile_reader", self._addProfileReader)
         self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib", "cura"))
         if not hasattr(sys, "frozen"):
             self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "plugins"))
@@ -711,3 +712,7 @@ class CuraApplication(QtApplication):
         job = ReadMeshJob(os.path.abspath(file))
         job.finished.connect(self._onFileLoaded)
         job.start()
+
+    def _addProfileReader(self, profile_reader):
+        # TODO: Add the profile reader to the list of plug-ins that can be used when importing profiles.
+        pass

cura/ProfileReader.py

@@ -0,0 +1,17 @@
+# Copyright (c) 2016 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+from UM.PluginObject import PluginObject
+
+##  A type of plug-ins that reads profiles from a file.
+#
+#   The profile is then stored as instance container of the type user profile.
+class ProfileReader(PluginObject):
+    def __init__(self):
+        super().__init__()
+
+    ##  Read profile data from a file and return a filled profile.
+    #
+    #   \return \type{Profile} The profile that was obtained from the file.
+    def read(self, file_name):
+        raise NotImplementedError("Profile reader plug-in was not correctly implemented. The read function was not implemented.")

plugins/LegacyProfileReader/LegacyProfileReader.py

@@ -9,8 +9,9 @@ import os.path #For concatenating the path to the plugin and the relative path t
 from UM.Application import Application #To get the machine manager to create the new profile in.
 from UM.Logger import Logger #Logging errors.
 from UM.PluginRegistry import PluginRegistry #For getting the path to this plugin's directory.
-from UM.Settings.Profile import Profile
+from UM.Settings.DefinitionContainer import DefinitionContainer #For getting the current machine's defaults.
-from UM.Settings.ProfileReader import ProfileReader
+from UM.Settings.InstanceContainer import InstanceContainer #The new profile to make.
+from cura.ProfileReader import ProfileReader #The plug-in type to implement.
 
 ##  A plugin that reads profile data from legacy Cura versions.
 #
@@ -66,7 +67,7 @@ class LegacyProfileReader(ProfileReader):
         if file_name.split(".")[-1] != "ini":
             return None
         Logger.log("i", "Importing legacy profile from file " + file_name + ".")
-        profile = Profile(machine_manager = Application.getInstance().getMachineManager(), read_only = False) #Create an empty profile.
+        profile = InstanceContainer("Imported Legacy Profile") #Create an empty profile.
 
         parser = configparser.ConfigParser(interpolation = None)
         try:
@@ -103,23 +104,24 @@ class LegacyProfileReader(ProfileReader):
         if "target_version" not in dict_of_doom:
             Logger.log("e", "Dictionary of Doom has no target version. Is it the correct JSON file?")
             return None
-        if Profile.ProfileVersion != dict_of_doom["target_version"]:
+        if InstanceContainer.Version != dict_of_doom["target_version"]:
-            Logger.log("e", "Dictionary of Doom of legacy profile reader (version %s) is not in sync with the profile version (version %s)!", dict_of_doom["target_version"], str(Profile.ProfileVersion))
+            Logger.log("e", "Dictionary of Doom of legacy profile reader (version %s) is not in sync with the current instance container version (version %s)!", dict_of_doom["target_version"], str(InstanceContainer.Version))
             return None
 
         if "translation" not in dict_of_doom:
             Logger.log("e", "Dictionary of Doom has no translation. Is it the correct JSON file?")
             return None
+        current_printer = Application.getInstance().getGlobalContainerStack().findContainer({ }, DefinitionContainer)
         for new_setting in dict_of_doom["translation"]: #Evaluate all new settings that would get a value from the translations.
             old_setting_expression = dict_of_doom["translation"][new_setting]
             compiled = compile(old_setting_expression, new_setting, "eval")
             try:
                 new_value = eval(compiled, {"math": math}, legacy_settings) #Pass the legacy settings as local variables to allow access to in the evaluation.
                 value_using_defaults = eval(compiled, {"math": math}, defaults) #Evaluate again using only the default values to try to see if they are default.
-            except Exception as e: #Probably some setting name that was missing or something else that went wrong in the ini file.
+            except Exception: #Probably some setting name that was missing or something else that went wrong in the ini file.
                 Logger.log("w", "Setting " + new_setting + " could not be set because the evaluation failed. Something is probably missing from the imported legacy profile.")
                 continue
-            if new_value != value_using_defaults and profile.getSettingValue(new_setting) != new_value: #Not equal to the default in the new Cura OR the default in the legacy Cura.
+            if new_value != value_using_defaults and current_printer.findDefinitions(key = new_setting).default_value != new_value: #Not equal to the default in the new Cura OR the default in the legacy Cura.
                 profile.setSettingValue(new_setting, new_value) #Store the setting in the profile!
 
         if len(profile.getChangedSettings()) == 0:

plugins/LegacyProfileReader/__init__.py

@@ -13,7 +13,7 @@ def getMetaData():
             "author": "Ultimaker",
             "version": "1.0",
             "description": catalog.i18nc("@info:whatsthis", "Provides support for importing profiles from legacy Cura versions."),
-            "api": 2
+            "api": 3
         },
         "profile_reader": [
             {

plugins/XRayView/__init__.py

@@ -13,7 +13,7 @@ def getMetaData():
             "author": "Ultimaker",
             "version": "1.0",
             "description": catalog.i18nc("@info:whatsthis", "Provides the X-Ray view."),
-            "api": 2
+            "api": 3
         },
         "view": {
             "name": catalog.i18nc("@item:inlistbox", "X-Ray"),