Merge branch 'master' into CURA-6329_add_crystallinity_setting

plugins/CuraProfileReader/CuraProfileReader.py

@@ -1,11 +1,14 @@
-# Copyright (c) 2018 Ultimaker B.V.
+# Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+
 import configparser
+from typing import List, Optional, Tuple
 
 from UM.PluginRegistry import PluginRegistry
 from UM.Logger import Logger
 from UM.Settings.ContainerFormatError import ContainerFormatError
 from UM.Settings.InstanceContainer import InstanceContainer  # The new profile to make.
+from cura.CuraApplication import CuraApplication #To get the current setting version.
 from cura.ReaderWriters.ProfileReader import ProfileReader
 
 import zipfile
@@ -17,39 +20,43 @@ import zipfile
 class CuraProfileReader(ProfileReader):
     ##  Initialises the cura profile reader.
     #   This does nothing since the only other function is basically stateless.
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
 
     ##  Reads a cura profile from a file and returns it.
     #
     #   \param file_name The file to read the cura profile from.
-    #   \return The cura profile that was in the file, if any. If the file could
-    #   not be read or didn't contain a valid profile, \code None \endcode is
+    #   \return The cura profiles that were in the file, if any. If the file
+    #   could not be read or didn't contain a valid profile, ``None`` is
     #   returned.
-    def read(self, file_name):
+    def read(self, file_name: str) -> List[Optional[InstanceContainer]]:
         try:
             with zipfile.ZipFile(file_name, "r") as archive:
-                results = []
+                results = [] #type: List[Optional[InstanceContainer]]
                 for profile_id in archive.namelist():
                     with archive.open(profile_id) as f:
                         serialized = f.read()
-                    profile = self._loadProfile(serialized.decode("utf-8"), profile_id)
-                    if profile is not None:
-                        results.append(profile)
+                    upgraded_profiles = self._upgradeProfile(serialized.decode("utf-8"), profile_id) #After upgrading it may split into multiple profiles.
+                    for upgraded_profile in upgraded_profiles:
+                        serialization, new_id = upgraded_profile
+                        profile = self._loadProfile(serialization, new_id)
+                        if profile is not None:
+                            results.append(profile)
                 return results
 
         except zipfile.BadZipFile:
             # It must be an older profile from Cura 2.1.
             with open(file_name, encoding = "utf-8") as fhandle:
-                serialized = fhandle.read()
-            return [self._loadProfile(serialized, profile_id) for serialized, profile_id in self._upgradeProfile(serialized, file_name)]
+                serialized_bytes = fhandle.read()
+            return [self._loadProfile(serialized, profile_id) for serialized, profile_id in self._upgradeProfile(serialized_bytes, file_name)]
 
     ##  Convert a profile from an old Cura to this Cura if needed.
     #
-    #   \param serialized \type{str} The profile data to convert in the serialized on-disk format.
-    #   \param profile_id \type{str} The name of the profile.
-    #   \return \type{List[Tuple[str,str]]} List of serialized profile strings and matching profile names.
-    def _upgradeProfile(self, serialized, profile_id):
+    #   \param serialized The profile data to convert in the serialized on-disk
+    #   format.
+    #   \param profile_id The name of the profile.
+    #   \return List of serialized profile strings and matching profile names.
+    def _upgradeProfile(self, serialized: str, profile_id: str) -> List[Tuple[str, str]]:
         parser = configparser.ConfigParser(interpolation = None)
         parser.read_string(serialized)
 
@@ -61,7 +68,7 @@ class CuraProfileReader(ProfileReader):
             return []
 
         version = int(parser["general"]["version"])
-        if InstanceContainer.Version != version:
+        if InstanceContainer.Version != version or "metadata" not in parser or "setting_version" not in parser["metadata"] or parser["metadata"]["setting_version"] != str(CuraApplication.SettingVersion):
             name = parser["general"]["name"]
             return self._upgradeProfileVersion(serialized, name, version)
         else:
@@ -69,10 +76,10 @@ class CuraProfileReader(ProfileReader):
 
     ##  Load a profile from a serialized string.
     #
-    #   \param serialized \type{str} The profile data to read.
-    #   \param profile_id \type{str} The name of the profile.
-    #   \return \type{InstanceContainer|None}
-    def _loadProfile(self, serialized, profile_id):
+    #   \param serialized The profile data to read.
+    #   \param profile_id The name of the profile.
+    #   \return The profile that was stored in the string.
+    def _loadProfile(self, serialized: str, profile_id: str) -> Optional[InstanceContainer]:
         # Create an empty profile.
         profile = InstanceContainer(profile_id)
         profile.setMetaDataEntry("type", "quality_changes")
@@ -88,12 +95,12 @@ class CuraProfileReader(ProfileReader):
 
     ##  Upgrade a serialized profile to the current profile format.
     #
-    #   \param serialized \type{str} The profile data to convert.
-    #   \param profile_id \type{str} The name of the profile.
-    #   \param source_version \type{int} The profile version of 'serialized'.
-    #   \return \type{List[Tuple[str,str]]} List of serialized profile strings and matching profile names.
-    def _upgradeProfileVersion(self, serialized, profile_id, source_version):
-        converter_plugins = PluginRegistry.getInstance().getAllMetaData(filter={"version_upgrade": {} }, active_only=True)
+    #   \param serialized The profile data to convert.
+    #   \param profile_id The name of the profile.
+    #   \param source_version The profile version of 'serialized'.
+    #   \return List of serialized profile strings and matching profile names.
+    def _upgradeProfileVersion(self, serialized: str, profile_id: str, source_version: int) -> List[Tuple[str, str]]:
+        converter_plugins = PluginRegistry.getInstance().getAllMetaData(filter = {"version_upgrade": {} }, active_only = True)
 
         source_format = ("profile", source_version)
         profile_convert_funcs = [plugin["version_upgrade"][source_format][2] for plugin in converter_plugins

plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -104,7 +104,7 @@ class FirmwareUpdateCheckerJob(Job):
                 # because the new version of Cura will be release before the firmware and we don't want to
                 # notify the user when no new firmware version is available.
                 if (checked_version != "") and (checked_version != current_version):
-                    Logger.log("i", "SHOWING FIRMWARE UPDATE MESSAGE")
+                    Logger.log("i", "Showing firmware update message for new version: {version}".format(current_version))
                     message = FirmwareUpdateCheckerMessage(machine_id, self._machine_name,
                                                            self._lookups.getRedirectUserUrl())
                     message.actionTriggered.connect(self._callback)

plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml

@@ -107,6 +107,7 @@ Item
                 labelWidth: base.labelWidth
                 controlWidth: base.controlWidth
                 unitText: catalog.i18nc("@label", "mm")
+                allowNegativeValue: true
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
 
@@ -121,6 +122,7 @@ Item
                 labelWidth: base.labelWidth
                 controlWidth: base.controlWidth
                 unitText: catalog.i18nc("@label", "mm")
+                allowNegativeValue: true
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
 

plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml

@@ -20,14 +20,14 @@ Item
     anchors.right: parent.right
     anchors.top: parent.top
 
-    property int labelWidth: 120 * screenScaleFactor
-    property int controlWidth: (UM.Theme.getSize("setting_control").width * 3 / 4) | 0
-    property var labelFont: UM.Theme.getFont("default")
-
     property int columnWidth: ((parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2) | 0
     property int columnSpacing: 3 * screenScaleFactor
     property int propertyStoreIndex: manager ? manager.storeContainerIndex : 1  // definition_changes
 
+    property int labelWidth: (columnWidth * 2 / 3 - UM.Theme.getSize("default_margin").width * 2) | 0
+    property int controlWidth: (columnWidth / 3) | 0
+    property var labelFont: UM.Theme.getFont("default")
+
     property string machineStackId: Cura.MachineManager.activeMachineId
 
     property var forceUpdateFunction: manager.forceUpdate
@@ -59,6 +59,8 @@ Item
                 font: UM.Theme.getFont("medium_bold")
                 color: UM.Theme.getColor("text")
                 renderType: Text.NativeRendering
+                width: parent.width
+                elide: Text.ElideRight
             }
 
             Cura.NumericTextFieldWithUnit  // "X (Width)"
@@ -175,6 +177,8 @@ Item
                 font: UM.Theme.getFont("medium_bold")
                 color: UM.Theme.getColor("text")
                 renderType: Text.NativeRendering
+                width: parent.width
+                elide: Text.ElideRight
             }
 
             Cura.PrintHeadMinMaxTextField  // "X min"
@@ -191,6 +195,7 @@ Item
 
                 axisName: "x"
                 axisMinOrMax: "min"
+                allowNegativeValue: true
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
@@ -209,6 +214,7 @@ Item
 
                 axisName: "y"
                 axisMinOrMax: "min"
+                allowNegativeValue: true
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
@@ -227,6 +233,7 @@ Item
 
                 axisName: "x"
                 axisMinOrMax: "max"
+                allowNegativeValue: true
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }
@@ -247,6 +254,7 @@ Item
 
                 axisName: "y"
                 axisMinOrMax: "max"
+                allowNegativeValue: true
 
                 forceUpdateOnChangeFunction: forceUpdateFunction
             }

plugins/PostProcessingPlugin/scripts/FilamentChange.py

@@ -92,8 +92,11 @@ class FilamentChange(Script):
         layer_targets = layer_nums.split(",")
         if len(layer_targets) > 0:
             for layer_num in layer_targets:
-                layer_num = int(layer_num.strip()) + 1
-                if layer_num <= len(data):
+                try:
+                    layer_num = int(layer_num.strip()) + 1 #Needs +1 because the 1st layer is reserved for start g-code.
+                except ValueError: #Layer number is not an integer.
+                    continue
+                if 0 < layer_num < len(data):
                     data[layer_num] = color_change + data[layer_num]
 
         return data

plugins/PostProcessingPlugin/scripts/Stretch.py

@@ -145,6 +145,7 @@ class Stretcher():
                     current.readStep(line)
                     onestep = GCodeStep(-1, in_relative_movement)
                     onestep.copyPosFrom(current)
+                    onestep.comment = line
                 else:
                     onestep = GCodeStep(-1, in_relative_movement)
                     onestep.copyPosFrom(current)

plugins/SupportEraser/SupportEraser.py

@@ -98,8 +98,10 @@ class SupportEraser(Tool):
 
         node.setName("Eraser")
         node.setSelectable(True)
+        node.setCalculateBoundingBox(True)
         mesh = self._createCube(10)
         node.setMeshData(mesh.build())
+        node.calculateBoundingBoxMesh()
 
         active_build_plate = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate
         node.addDecorator(BuildPlateDecorator(active_build_plate))

plugins/Toolbox/resources/qml/ToolboxDetailPage.qml

@@ -89,6 +89,7 @@ Item
             Label
             {
                 text: catalog.i18nc("@label", "Your rating") + ":"
+                visible: details.type == "plugin"
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text_medium")
                 renderType: Text.NativeRendering

plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml

@@ -78,7 +78,7 @@ Cura.MachineAction
             width: parent.width
             wrapMode: Text.WordWrap
             renderType: Text.NativeRendering
-            text: catalog.i18nc("@label", "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.\n\nSelect your printer from the list below:")
+            text: catalog.i18nc("@label", "To print directly to your printer over the network, please make sure your printer is connected to the network using a network cable or by connecting your printer to your WIFI network. If you don't connect Cura with your printer, you can still use a USB drive to transfer g-code files to your printer.") + "\n\n" + catalog.i18nc("@label", "Select your printer from the list below:")
         }
 
         Row

plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py

@@ -236,10 +236,6 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
                 self._application.callLater(manual_printer_request.callback, False, address)
 
     def addManualDevice(self, address: str, callback: Optional[Callable[[bool, str], None]] = None) -> None:
-        if address in self._manual_instances:
-            Logger.log("i", "Manual printer with address [%s] has already been added, do nothing", address)
-            return
-
         self._manual_instances[address] = ManualPrinterRequest(address, callback = callback)
         self._preferences.setValue("um3networkprinting/manual_instances", ",".join(self._manual_instances.keys()))
 

plugins/VersionUpgrade/VersionUpgrade40to41/__init__.py

@@ -14,7 +14,7 @@ def getMetaData() -> Dict[str, Any]:
     return {
         "version_upgrade": {
             # From                           To                              Upgrade function
-            ("preferences", 6000006):        ("preferences", 6000007, upgrade.upgradePreferences),
+            ("preferences", 6000006):        ("preferences", 6000007,        upgrade.upgradePreferences),
             ("machine_stack", 4000006):      ("machine_stack", 4000007,      upgrade.upgradeStack),
             ("extruder_train", 4000006):     ("extruder_train", 4000007,     upgrade.upgradeStack),
             ("definition_changes", 4000006): ("definition_changes", 4000007, upgrade.upgradeInstanceContainer),

plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py

@@ -0,0 +1,100 @@
+# Copyright (c) 2019 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import configparser
+import io
+from typing import Dict, List, Tuple
+
+from UM.VersionUpgrade import VersionUpgrade
+
+_renamed_settings = {
+    "support_minimal_diameter": "support_tower_maximum_supported_diameter"
+} #type: Dict[str, str]
+_removed_settings = ["prime_tower_circular"]  # type: List[str]
+
+
+##  Upgrades configurations from the state they were in at version 4.1 to the
+#   state they should be in at version 4.2.
+class VersionUpgrade41to42(VersionUpgrade):
+    ##  Gets the version number from a CFG file in Uranium's 4.1 format.
+    #
+    #   Since the format may change, this is implemented for the 4.1 format only
+    #   and needs to be included in the version upgrade system rather than
+    #   globally in Uranium.
+    #
+    #   \param serialised The serialised form of a CFG file.
+    #   \return The version number stored in the CFG file.
+    #   \raises ValueError The format of the version number in the file is
+    #   incorrect.
+    #   \raises KeyError The format of the file is incorrect.
+    def getCfgVersion(self, serialised: str) -> int:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+        format_version = int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised.
+        setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
+        return format_version * 1000000 + setting_version
+
+    ##  Upgrades instance containers to have the new version
+    #   number.
+    #
+    #   This renames the renamed settings in the containers.
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        #Update version number.
+        parser["metadata"]["setting_version"] = "8"
+
+        #Rename settings.
+        if "values" in parser:
+            for old_name, new_name in _renamed_settings.items():
+                if old_name in parser["values"]:
+                    parser["values"][new_name] = parser["values"][old_name]
+                    del parser["values"][old_name]
+            #Remove settings.
+            for key in _removed_settings:
+                if key in parser["values"]:
+                    del parser["values"][key]
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    ##  Upgrades Preferences to have the new version number.
+    #
+    #   This renames the renamed settings in the list of visible settings.
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        #Update version number.
+        parser["metadata"]["setting_version"] = "8"
+
+        #Renamed settings.
+        if "visible_settings" in parser["general"]:
+            visible_settings = parser["general"]["visible_settings"]
+            visible_setting_set = set(visible_settings.split(";"))
+            for old_name, new_name in _renamed_settings.items():
+                if old_name in visible_setting_set:
+                    visible_setting_set.remove(old_name)
+                    visible_setting_set.add(new_name)
+            for removed_key in _removed_settings:
+                if removed_key in visible_setting_set:
+                    visible_setting_set.remove(removed_key)
+            parser["general"]["visible_settings"] = ";".join(visible_setting_set)
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    ##  Upgrades stacks to have the new version number.
+    def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        #Update version number.
+        parser["metadata"]["setting_version"] = "8"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]

plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2019 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from typing import Any, Dict, TYPE_CHECKING
+
+from . import VersionUpgrade41to42
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade41to42.VersionUpgrade41to42()
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 6000007):        ("preferences", 6000008,        upgrade.upgradePreferences),
+            ("machine_stack", 4000007):      ("machine_stack", 4000008,      upgrade.upgradeStack),
+            ("extruder_train", 4000007):     ("extruder_train", 4000008,     upgrade.upgradeStack),
+            ("definition_changes", 4000007): ("definition_changes", 4000008, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000007):    ("quality_changes", 4000008,    upgrade.upgradeInstanceContainer),
+            ("quality", 4000007):            ("quality", 4000008,            upgrade.upgradeInstanceContainer),
+            ("user", 4000007):               ("user", 4000008,               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 }

plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json

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