Browse Source

Merge branch 'master' of github.com:Ultimaker/Cura

Ghostkeeper 4 years ago
parent
commit
a2946b057a

+ 1 - 1
cura/CuraApplication.py

@@ -125,7 +125,7 @@ class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # changes of the settings.
-    SettingVersion = 14
+    SettingVersion = 15
 
     Created = False
 

+ 83 - 0
plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py

@@ -0,0 +1,83 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import configparser
+from typing import Tuple, List
+import io
+from UM.VersionUpgrade import VersionUpgrade
+
+class VersionUpgrade462to47(VersionUpgrade):
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades preferences to have the new version number.
+        :param serialized: The original contents of the preferences file.
+        :param filename: The file name of the preferences file.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "15"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades instance containers to have the new version number.
+
+        This changes the maximum deviation setting if that setting was present
+        in the profile.
+        :param serialized: The original contents of the instance container.
+        :param filename: The original file name of the instance container.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ())
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "15"
+
+        if "values" in parser:
+            # Maximum Deviation's effect was corrected. Previously the deviation
+            # ended up being only half of what the user had entered. This was
+            # fixed in Cura 4.7 so there we need to halve the deviation that the
+            # user had entered.
+            #
+            # This got accidentally merged in Cura 4.6.0. In 4.6.2 we removed
+            # that. In 4.7 it's not unmerged, so there we need to revert all
+            # that again.
+            if "meshfix_maximum_deviation" in parser["values"]:
+                maximum_deviation = parser["values"]["meshfix_maximum_deviation"]
+                if maximum_deviation.startswith("="):
+                    maximum_deviation = maximum_deviation[1:]
+                maximum_deviation = "=(" + maximum_deviation + ") / 2"
+                parser["values"]["meshfix_maximum_deviation"] = maximum_deviation
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        """
+        Upgrades stacks to have the new version number.
+        :param serialized: The original contents of the stack.
+        :param filename: The original file name of the stack.
+        :return: A list of new file names, and a list of the new contents for
+        those files.
+        """
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "15"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]

+ 59 - 0
plugins/VersionUpgrade/VersionUpgrade462to47/__init__.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2020 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from typing import Any, Dict, TYPE_CHECKING
+
+from . import VersionUpgrade462to47
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade462to47.VersionUpgrade462to47()
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 6000014):        ("preferences", 6000015,        upgrade.upgradePreferences),
+            ("machine_stack", 4000014):      ("machine_stack", 4000015,      upgrade.upgradeStack),
+            ("extruder_train", 4000014):     ("extruder_train", 4000015,     upgrade.upgradeStack),
+            ("definition_changes", 4000014): ("definition_changes", 4000015, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000014):    ("quality_changes", 4000015,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000014):            ("quality", 4000015,            upgrade.upgradeInstanceContainer),
+            ("user", 4000014):               ("user", 4000015,               upgrade.upgradeInstanceContainer),
+        },
+        "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
+            "machine_stack": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./machine_instances"}
+            },
+            "extruder_train": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./extruders"}
+            },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
+            "quality_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality_changes"}
+            },
+            "quality": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
+            }
+        }
+    }
+
+
+def register(app: "Application") -> Dict[str, Any]:
+    return {"version_upgrade": upgrade}

+ 8 - 0
plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json

@@ -0,0 +1,8 @@
+{
+    "name": "Version Upgrade 4.6.2 to 4.7",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.",
+    "api": "7.2.0",
+    "i18n-catalog": "cura"
+}

+ 1 - 1
resources/definitions/fdmextruder.def.json

@@ -6,7 +6,7 @@
         "type": "extruder",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
-        "setting_version": 14,
+        "setting_version": 15,
         "visible": false,
         "position": "0"
     },

+ 2 - 2
resources/definitions/fdmprinter.def.json

@@ -6,7 +6,7 @@
         "type": "machine",
         "author": "Ultimaker",
         "manufacturer": "Unknown",
-        "setting_version": 14,
+        "setting_version": 15,
         "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
         "visible": false,
         "has_materials": true,
@@ -5983,7 +5983,7 @@
                     "description": "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller. Maximum Deviation is a limit for Maximum Resolution, so if the two conflict the Maximum Deviation will always be held true.",
                     "type": "float",
                     "unit": "mm",
-                    "default_value": 0.05,
+                    "default_value": 0.025,
                     "minimum_value": "0.001",
                     "minimum_value_warning": "0.01",
                     "maximum_value_warning": "0.3",

+ 1 - 1
resources/definitions/hms434.def.json

@@ -172,7 +172,7 @@
 
         "meshfix_maximum_resolution":       {"value": 0.01 },
         "meshfix_maximum_travel_resolution":{"value": 0.1 },
-        "meshfix_maximum_deviation":        {"value": 0.01 },
+        "meshfix_maximum_deviation":        {"value": 0.005 },
 
         "minimum_polygon_circumference":    {"value": 0.05 },
         "coasting_enable":                  {"value": false},

+ 1 - 1
resources/definitions/peopoly_moai.def.json

@@ -171,7 +171,7 @@
             "value": "0.1"
         },
         "meshfix_maximum_deviation": {
-            "value": "0.003"
+            "value": "0.002"
         },
         "skin_outline_count": {
             "value": 0

+ 1 - 1
resources/definitions/skriware_2.def.json

@@ -591,7 +591,7 @@
             "value": "0.2"
         },
         "meshfix_maximum_deviation": {
-            "default_value": 0.005
+            "default_value": 0.003
         },
         "jerk_roofing": {
             "value": "10"

+ 1 - 1
resources/definitions/ultimaker_s3.def.json

@@ -155,7 +155,7 @@
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
-        "meshfix_maximum_deviation": { "value": "layer_height / 2" },
+        "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
         "retraction_combing": { "default_value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },

Some files were not shown because too many files changed in this diff