From 769ff84c15f0e8d31576fe680e17f6278679ea4d Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 14 Oct 2015 17:57:00 +0200 Subject: [PATCH 1/5] Delay showing the main window a little so we do not get garbage on the window CURA-160 #Start-Review --- resources/qml/Cura.qml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 93bc311da1..25b6cf534c 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -670,18 +670,22 @@ UM.MainWindow Component.onCompleted: { UM.Theme.load(UM.Resources.getPath(UM.Resources.Themes, "cura")) - visible = true; - addMachineTimer.start(); } Timer { - id: addMachineTimer; + id: startupTimer; interval: 100; repeat: false; + running: true; onTriggered: { - if(UM.MachineManager.activeMachineInstance == "") + if(!base.visible) + { + base.visible = true; + restart(); + } + else if(UM.MachineManager.activeMachineInstance == "") { addMachineWizard.firstRun = true; addMachineWizard.open(); From e42ffb23cae1edb90c6c36cfe263dbd514ae435c Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Thu, 15 Oct 2015 01:04:32 +0200 Subject: [PATCH 2/5] Move the infill pattern and infill overlap settings back as children of infill_density This makes the inherit functions work properly --- resources/machines/fdmprinter.json | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 9ca44a7e86..577181a63a 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -455,32 +455,32 @@ "visible": false, "inherit_function": "0 if parent_value == 0 else (infill_line_width * 100) / parent_value" } - } - }, - "infill_pattern": { - "label": "Infill Pattern", - "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.", - "type": "enum", - "visible": false, - "options": { - "grid": "Grid", - "lines": "Lines", - "concentric": "Concentric", - "zigzag": "Zig Zag" }, - "default": "grid", - "inherit_function": "'lines' if parent_value > 25 else 'grid'" - }, - "infill_overlap": { - "label": "Infill Overlap", - "description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.", - "unit": "%", - "type": "float", - "default": 10, - "min_value": "0", - "max_value": "100", - "inherit_function": "10 if infill_sparse_density < 95 else 0", - "visible": false + "infill_pattern": { + "label": "Infill Pattern", + "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.", + "type": "enum", + "visible": false, + "options": { + "grid": "Grid", + "lines": "Lines", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default": "grid", + "inherit_function": "'lines' if parent_value > 25 else 'grid'" + }, + "infill_overlap": { + "label": "Infill Overlap", + "description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "%", + "type": "float", + "default": 10, + "min_value": "0", + "max_value": "100", + "inherit_function": "10 if infill_sparse_density < 95 else 0", + "visible": false + } }, "infill_wipe_dist": { "label": "Infill Wipe Distance", From 0b9047f6ca4e73ce3ea157b000251cbf16f7c4a5 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Thu, 15 Oct 2015 09:42:52 +0200 Subject: [PATCH 3/5] Properly set the current folder on file open This makes sure the next time the file dialog is opened the last folder used is openend. CURA-246 #Start-Review --- resources/qml/Cura.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 25b6cf534c..8d42bce562 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -636,6 +636,11 @@ UM.MainWindow onAccepted: { + //Because several implementations of the file dialog only update the folder + //when it is explicitly set. + var f = folder; + folder = f; + UM.MeshFileHandler.readLocalFile(fileUrl) openDialog.sendMeshName(fileUrl.toString()) } From 6effacb1deaa7d9e2b166b97f5e2f3970175874f Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Fri, 16 Oct 2015 10:15:01 +0200 Subject: [PATCH 4/5] Change infill settings back to not being children of infill density For some reason, making them children causes them to disappear --- resources/machines/fdmprinter.json | 53 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 577181a63a..98bed779b1 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -275,7 +275,8 @@ "description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.", "type": "boolean", "default": false, - "visible": false + "visible": false, + "inherit": false }, "top_bottom_thickness": { "label": "Bottom/Top Thickness", @@ -455,33 +456,33 @@ "visible": false, "inherit_function": "0 if parent_value == 0 else (infill_line_width * 100) / parent_value" } - }, - "infill_pattern": { - "label": "Infill Pattern", - "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.", - "type": "enum", - "visible": false, - "options": { - "grid": "Grid", - "lines": "Lines", - "concentric": "Concentric", - "zigzag": "Zig Zag" - }, - "default": "grid", - "inherit_function": "'lines' if parent_value > 25 else 'grid'" - }, - "infill_overlap": { - "label": "Infill Overlap", - "description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.", - "unit": "%", - "type": "float", - "default": 10, - "min_value": "0", - "max_value": "100", - "inherit_function": "10 if infill_sparse_density < 95 else 0", - "visible": false } }, + "infill_pattern": { + "label": "Infill Pattern", + "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.", + "type": "enum", + "visible": false, + "options": { + "grid": "Grid", + "lines": "Lines", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default": "grid", + "inherit_function": "'lines' if infill_sparse_density > 25 else 'grid'" + }, + "infill_overlap": { + "label": "Infill Overlap", + "description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.", + "unit": "%", + "type": "float", + "default": 10, + "min_value": "0", + "max_value": "100", + "inherit_function": "10 if infill_sparse_density < 95 else 0", + "visible": false + }, "infill_wipe_dist": { "label": "Infill Wipe Distance", "description": "Distance of a travel move inserted after every infill line, to make the infill stick to the walls better. This option is imilar to infill overlap, but without extrusion and only on one end of the infill line.", From 509cb4627e49e6df2ef628a9f43c7fb07e547d07 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 16 Oct 2015 10:30:45 +0200 Subject: [PATCH 5/5] JSON: update raft defaults --- resources/machines/fdmprinter.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 9ca44a7e86..3fd8c972af 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1379,7 +1379,7 @@ "description": "The gap between the final raft layer and the first layer of the object. Only the first layer is raised by this amount to lower the bonding between the raft layer and the object. Makes it easier to peel off the raft.", "unit": "mm", "type": "float", - "default": 0.22, + "default": 0.35, "enabled": "adhesion_type == \"raft\"" }, "raft_surface_layers": { @@ -1435,7 +1435,7 @@ "description": "The distance between the raft lines for the interface raft layer. The spacing of the interface should be quite wide, while being dense enough to support the surface raft layers.", "unit": "mm", "type": "float", - "default": 2, + "default": 1.0, "enabled": "adhesion_type == \"raft\"" }, "raft_base_thickness": { @@ -1459,7 +1459,7 @@ "description": "The distance between the raft lines for the base raft layer. Wide spacing makes for easy removal of the raft from the build plate.", "unit": "mm", "type": "float", - "default": 5, + "default": 3.0, "enabled": "adhesion_type == \"raft\"" }, "raft_speed": {