From d1211e395135bde93ca54fc330bf89e3fa33750e Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 26 Jun 2017 15:16:26 +0200 Subject: [PATCH 1/4] Add a setting for Horizontal Expansion for the first layer --- resources/definitions/fdmprinter.def.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 40f224a98a..88cbc6dd48 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1136,6 +1136,19 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, + "xy_offset_layer_0": + { + "label": "Initial Layer Horizontal Expansion", + "description": "Amount of offset applied to all polygons in the first layer. A negative value can compensate for elephants foot.", + "unit": "mm", + "type": "float", + "minimum_value_warning": "-1", + "maximum_value_warning": "1", + "default_value": 0, + "value": "xy_offset", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, "z_seam_type": { "label": "Z Seam Alignment", From 39cb68bd303e4c55585a9f115f6a3804dc11a3eb Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 28 Jun 2017 11:41:51 +0200 Subject: [PATCH 2/4] Update convex hull to account for first layer horizontal expansion --- cura/ConvexHullDecorator.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index 51b22755dd..70f77d9712 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -257,7 +257,11 @@ class ConvexHullDecorator(SceneNodeDecorator): # \return New Polygon instance that is offset with everything that # influences the collision area. def _offsetHull(self, convex_hull): - horizontal_expansion = self._getSettingProperty("xy_offset", "value") + horizontal_expansion = max( + self._getSettingProperty("xy_offset", "value"), + self._getSettingProperty("xy_offset_layer_0", "value") + ) + mold_width = 0 if self._getSettingProperty("mold_enabled", "value"): mold_width = self._getSettingProperty("mold_width", "value") @@ -332,4 +336,4 @@ class ConvexHullDecorator(SceneNodeDecorator): ## Settings that change the convex hull. # # If these settings change, the convex hull should be recalculated. - _influencing_settings = {"xy_offset", "mold_enabled", "mold_width"} + _influencing_settings = {"xy_offset", "xy_offset_layer_0", "mold_enabled", "mold_width"} From 20b2a3dc81a0eef118e041e1689eeff3e838ee59 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 28 Jun 2017 11:48:16 +0200 Subject: [PATCH 3/4] Improve description for xy_offset_layer_0 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 88cbc6dd48..04091194f6 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1139,7 +1139,7 @@ "xy_offset_layer_0": { "label": "Initial Layer Horizontal Expansion", - "description": "Amount of offset applied to all polygons in the first layer. A negative value can compensate for elephants foot.", + "description": "Amount of offset applied to all polygons in the first layer. A negative value can compensate for squishing of the first layer known as \"elephant's foot\".", "unit": "mm", "type": "float", "minimum_value_warning": "-1", From e9d2434c419ff3f546802f24bb4e1317bfde945e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 28 Jun 2017 15:35:13 +0200 Subject: [PATCH 4/4] Simplify text generaton for download button CURA-3856 --- plugins/PluginBrowser/PluginBrowser.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PluginBrowser/PluginBrowser.qml b/plugins/PluginBrowser/PluginBrowser.qml index be44ab854a..841a1828a2 100644 --- a/plugins/PluginBrowser/PluginBrowser.qml +++ b/plugins/PluginBrowser/PluginBrowser.qml @@ -88,7 +88,7 @@ UM.Dialog Button { id: downloadButton - text: !model.already_installed ? catalog.i18nc("@action:button", "Download") : model.can_upgrade ? catalog.i18nc("@action:button", "Upgrade") : catalog.i18nc("@action:button", "Download") + text: (model.already_installed && model.can_upgrade) ? catalog.i18nc("@action:button", "Upgrade") : catalog.i18nc("@action:button", "Download") onClicked: manager.downloadAndInstallPlugin(model.file_location) anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width