From f1417858c1a08aff6dad6be4099caa42e20a7288 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Sep 2015 09:49:53 +0200 Subject: [PATCH 1/4] Merged objects are no longer moved on platform plate Fixes Ultimaker/Cura#354 --- cura/CuraApplication.py | 2 +- cura/PlatformPhysics.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index ea23fbf092..fd9cbf1cb6 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -434,7 +434,7 @@ class CuraApplication(QtApplication): # Reset the position of each node for node in group_node.getChildren(): new_position = node.getMeshData().getCenterPosition() - new_position.setY(0) + #new_position.setY(0) node.setPosition(new_position) # Use the previously found center of the group bounding box as the new location of the group diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index 8b0b641b4e..53e803187f 100644 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -68,8 +68,9 @@ class PlatformPhysics: # Move it downwards if bottom is above platform move_vector = Vector() - if bbox.bottom > 0: - move_vector.setY(-bbox.bottom) + if not (node.getParent() and node.getParent().callDecoration("isGroup")): #If an object is grouped, don't move it down + if bbox.bottom > 0: + move_vector.setY(-bbox.bottom) #if not Float.fuzzyCompare(bbox.bottom, 0.0): # pass#move_vector.setY(-bbox.bottom) From 926ac69c71cdc241051f9f90fd12c94a4e777be2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Sep 2015 09:54:53 +0200 Subject: [PATCH 2/4] Added close button to changelog Fixes Ultimaker/Cura#350 --- plugins/ChangeLogPlugin/ChangeLog.qml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.qml b/plugins/ChangeLogPlugin/ChangeLog.qml index 74170721d1..d4dbc3e524 100644 --- a/plugins/ChangeLogPlugin/ChangeLog.qml +++ b/plugins/ChangeLogPlugin/ChangeLog.qml @@ -14,9 +14,11 @@ UM.Dialog width: 300 * Screen.devicePixelRatio; height: 500 * Screen.devicePixelRatio; title: "Changelog" + ScrollView { - anchors.fill:parent + width: parent.width + height: parent.height - 25 Text { text: manager.getChangeLogString() @@ -24,4 +26,11 @@ UM.Dialog wrapMode: Text.Wrap; } } + Button + { + anchors.bottom:parent.bottom + text: "close" + onClicked: base.hide() + anchors.horizontalCenter: parent.horizontalCenter + } } From 98ee8cab85d2d8318c496ba45a8939831bf6972a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Sep 2015 13:16:24 +0200 Subject: [PATCH 3/4] Pages are now reset when adding a new machine. Contributes to Ultimaker/Cura#353 --- resources/qml/WizardPages/AddMachine.qml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/qml/WizardPages/AddMachine.qml b/resources/qml/WizardPages/AddMachine.qml index a28c46ffd0..a89fa11a16 100644 --- a/resources/qml/WizardPages/AddMachine.qml +++ b/resources/qml/WizardPages/AddMachine.qml @@ -24,6 +24,12 @@ Item target: base.wizard onNextClicked: //You can add functions here that get triggered when the final button is clicked in the wizard-element { + var old_page_count = base.wizard.getPageCount() + // Delete old pages (if any) + for (var i = old_page_count - 1; i > 0; i--) + { + base.wizard.removePage(i) + } saveMachine() } onBackClicked: From 1401265fc1e448d431f912039a26a965c7d3786f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 9 Sep 2015 13:48:15 +0200 Subject: [PATCH 4/4] JSON bugfix: default support roof pattern --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 85f7d1b9f1..d3401e8299 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1231,7 +1231,7 @@ "concentric": "Concentric", "zigzag": "Zig Zag" }, - "default": "Concentric" + "default": "concentric" }, "support_use_towers": { "label": "Use towers.",