Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6151-Notify-updates-from-marketplace

2025-04-28 23:04:34 +08:00 · 2019-03-27 12:56:02 +01:00 · 2019-03-27 12:56:02 +01:00 · 1e02a20745
commit 1e02a20745
parent e3f2c06542 79c13ce35c
16 changed files with 35 additions and 31 deletions
--- a/cura/Operations/PlatformPhysicsOperation.py
+++ b/cura/Operations/PlatformPhysicsOperation.py
@ -29,4 +29,4 @@ class PlatformPhysicsOperation(Operation):
        return group

    def __repr__(self):
-        return "PlatformPhysicsOperation(translation = {0})".format(self._translation)
+        return "PlatformPhysicsOp.(trans.={0})".format(self._translation)
--- a/cura/Scene/CuraSceneNode.py
+++ b/cura/Scene/CuraSceneNode.py
@ -112,21 +112,21 @@ class CuraSceneNode(SceneNode):

    ##  Override of SceneNode._calculateAABB to exclude non-printing-meshes from bounding box
    def _calculateAABB(self) -> None:
+        self._aabb = None
        if self._mesh_data:
-            aabb = self._mesh_data.getExtents(self.getWorldTransformation())
-        else:  # If there is no mesh_data, use a boundingbox that encompasses the local (0,0,0)
-            position = self.getWorldPosition()
-            aabb = AxisAlignedBox(minimum = position, maximum = position)
+            self._aabb = self._mesh_data.getExtents(self.getWorldTransformation())

        for child in self._children:
            if child.callDecoration("isNonPrintingMesh"):
                # Non-printing-meshes inside a group should not affect push apart or drop to build plate
                continue
-            if aabb is None:
-                aabb = child.getBoundingBox()
+            if not child._mesh_data:
+                # Nodes without mesh data should not affect bounding boxes of their parents.
+                continue
+            if self._aabb is None:
+                self._aabb = child.getBoundingBox()
            else:
-                aabb = aabb + child.getBoundingBox()
-        self._aabb = aabb
+                self._aabb = self._aabb + child.getBoundingBox()

    ##  Taken from SceneNode, but replaced SceneNode with CuraSceneNode
    def __deepcopy__(self, memo: Dict[int, object]) -> "CuraSceneNode":
--- a/cura_app.py
+++ b/cura_app.py
@ -23,7 +23,10 @@ known_args = vars(parser.parse_known_args()[0])
 if not known_args["debug"]:
    def get_cura_dir_path():
        if Platform.isWindows():
-            return os.path.expanduser("~/AppData/Roaming/" + CuraAppName)
+            appdata_path = os.getenv("APPDATA")
+            if not appdata_path: #Defensive against the environment variable missing (should never happen).
+                appdata_path = "."
+            return os.path.join(appdata_path, CuraAppName)
        elif Platform.isLinux():
            return os.path.expanduser("~/.local/share/" + CuraAppName)
        elif Platform.isOSX():
--- a/plugins/ImageReader/ConfigUI.qml
+++ b/plugins/ImageReader/ConfigUI.qml
@ -123,7 +123,7 @@ UM.Dialog
        UM.TooltipArea {
            Layout.fillWidth:true
            height: childrenRect.height
-            text: catalog.i18nc("@info:tooltip","By default, white pixels represent high points on the mesh and black pixels represent low points on the mesh. Change this option to reverse the behavior such that black pixels represent high points on the mesh and white pixels represent low points on the mesh.")
+            text: catalog.i18nc("@info:tooltip","For lithophanes dark pixels should correspond to thicker locations in order to block more light coming through. For height maps lighter pixels signify higher terrain, so lighter pixels should correspond to thicker locations in the generated 3D model.")
            Row {
                width: parent.width

@ -134,9 +134,9 @@ UM.Dialog
                    anchors.verticalCenter: parent.verticalCenter
                }
                ComboBox {
-                    id: image_color_invert
-                    objectName: "Image_Color_Invert"
-                    model: [ catalog.i18nc("@item:inlistbox","Lighter is higher"), catalog.i18nc("@item:inlistbox","Darker is higher") ]
+                    id: lighter_is_higher
+                    objectName: "Lighter_Is_Higher"
+                    model: [ catalog.i18nc("@item:inlistbox","Darker is higher"), catalog.i18nc("@item:inlistbox","Lighter is higher") ]
                    width: 180 * screenScaleFactor
                    onCurrentIndexChanged: { manager.onImageColorInvertChanged(currentIndex) }
                }
--- a/plugins/ImageReader/ImageReader.py
+++ b/plugins/ImageReader/ImageReader.py
@ -46,9 +46,9 @@ class ImageReader(MeshReader):

    def _read(self, file_name):
        size = max(self._ui.getWidth(), self._ui.getDepth())
-        return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.image_color_invert)
+        return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.lighter_is_higher)

-    def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, image_color_invert):
+    def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, lighter_is_higher):
        scene_node = SceneNode()

        mesh = MeshBuilder()
@ -104,7 +104,7 @@ class ImageReader(MeshReader):

        Job.yieldThread()

-        if image_color_invert:
+        if not lighter_is_higher:
            height_data = 1 - height_data

        for _ in range(0, blur_iterations):
--- a/plugins/ImageReader/ImageReaderUI.py
+++ b/plugins/ImageReader/ImageReaderUI.py
@ -30,10 +30,10 @@ class ImageReaderUI(QObject):
        self._width = self.default_width
        self._depth = self.default_depth

-        self.base_height = 1
-        self.peak_height = 10
+        self.base_height = 0.4
+        self.peak_height = 2.5
        self.smoothing = 1
-        self.image_color_invert = False;
+        self.lighter_is_higher = False;

        self._ui_lock = threading.Lock()
        self._cancelled = False
@ -143,4 +143,4 @@ class ImageReaderUI(QObject):

    @pyqtSlot(int)
    def onImageColorInvertChanged(self, value):
-        self.image_color_invert = (value == 1)
+        self.lighter_is_higher = (value == 1)
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
@ -76,7 +76,7 @@ Item
            height: (parent.height * 0.4) | 0
            anchors
            {
-                bottom: parent.bottomcommi
+                bottom: parent.bottom
                right: parent.right
            }
            sourceSize.height: height
--- a/plugins/UM3NetworkPrinting/src/Cloud/CloudProgressMessage.py
+++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudProgressMessage.py
@ -11,8 +11,8 @@ I18N_CATALOG = i18nCatalog("cura")
 class CloudProgressMessage(Message):
    def __init__(self):
        super().__init__(
-            text = I18N_CATALOG.i18nc("@info:status", "Sending data to remote cluster"),
-            title = I18N_CATALOG.i18nc("@info:status", "Sending data to remote cluster"),
+            title = I18N_CATALOG.i18nc("@info:status", "Sending Print Job"),
+            text = I18N_CATALOG.i18nc("@info:status", "Uploading via Ultimaker Cloud"),
            progress = -1,
            lifetime = 0,
            dismissable = False,
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@ -14,7 +14,6 @@
        "has_materials": false,
        "has_machine_quality": true,
        "preferred_variant_name": "0.4 mm",
-        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
        "first_start_actions": ["UM2UpgradeSelection"],
        "supported_actions":["UM2UpgradeSelection"],
        "machine_extruder_trains":
--- a/resources/definitions/ultimaker2_plus.def.json
+++ b/resources/definitions/ultimaker2_plus.def.json
@ -14,6 +14,7 @@
        "has_materials": true,
        "has_machine_materials": true,
        "has_machine_quality": true,
+        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ],
        "first_start_actions": [],
        "supported_actions": [],
        "machine_extruder_trains":
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@ -14,6 +14,7 @@
        "has_materials": true,
        "has_machine_materials": true,
        "has_variants": true,
+        "exclude_materials": [ "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ],
        "preferred_variant_name": "AA 0.4",
        "preferred_quality_type": "normal",
        "variants_name": "Print core",
--- a/resources/definitions/ultimaker3_extended.def.json
+++ b/resources/definitions/ultimaker3_extended.def.json
@ -28,8 +28,7 @@
            "id": 9511,
            "check_urls":
            [
-                "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources",
-                "http://software.ultimaker.com/releases/firmware/9511/stable/version.txt"
+                "http://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
            ],
            "update_url": "https://ultimaker.com/firmware"
        }
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@ -11,7 +11,7 @@
        "platform": "ultimaker_platform.stl",
        "has_materials": true,
        "has_machine_quality": true,
-        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
+        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ],
        "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
        "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
        "machine_extruder_trains":
--- a/resources/definitions/ultimaker_original_dual.def.json
+++ b/resources/definitions/ultimaker_original_dual.def.json
@ -12,7 +12,7 @@
        "has_materials": true,
        "has_machine_quality": true,
        "quality_definition": "ultimaker_original",
-        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
+        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ],
        "machine_extruder_trains":
        {
            "0": "ultimaker_original_dual_1st",
--- a/resources/qml/PrintSetupSelector/PrintSetupSelector.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelector.qml
@ -16,7 +16,7 @@ Cura.ExpandableComponent
    contentPadding: UM.Theme.getSize("default_lining").width
    contentHeaderTitle: catalog.i18nc("@label", "Print settings")
    enabled: !preSlicedData
-    disabledText: catalog.i18nc("@label shown when we load a Gcode file", "Print setup disabled. G code file can not be modified.")
+    disabledText: catalog.i18nc("@label shown when we load a Gcode file", "Print setup disabled. G-code file can not be modified.")

    UM.I18nCatalog
    {
@ -32,4 +32,4 @@ Cura.ExpandableComponent

    onExpandedChanged: UM.Preferences.setValue("view/settings_visible", expanded)
    Component.onCompleted: expanded = UM.Preferences.getValue("view/settings_visible")
-}
+}
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@ -114,6 +114,7 @@ Cura.ExpandablePopup

            MachineSelectorList
            {
+                id: machineSelectorList
                // Can't use parent.width since the parent is the flickable component and not the ScrollView
                width: scroll.width - scroll.leftPadding - scroll.rightPadding
                property real maximumHeight: UM.Theme.getSize("machine_selector_widget_content").height - buttonRow.height