From c9e281f52e377fc51dc06c273eaa637aa75d2e61 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 20 Sep 2019 14:51:37 +0200 Subject: [PATCH 1/4] Add preference for general/restore_window_geometry See https://github.com/Ultimaker/Uranium/pull/523 --- resources/qml/Preferences/GeneralPage.qml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 4adb3e72d2..cdbe5d7e0e 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -94,6 +94,8 @@ UM.PreferencesPage zoomToMouseCheckbox.checked = boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) UM.Preferences.resetPreference("view/top_layer_count"); topLayerCountCheckbox.checked = boolCheck(UM.Preferences.getValue("view/top_layer_count")) + UM.Preferences.resetPreference("general/restore_window_geometry") + restoreWindowPositionCheckbox.checked = boolCheck(UM.Preferences.getValue("general/restore_window_geometry")) UM.Preferences.resetPreference("general/camera_perspective_mode") var defaultCameraMode = UM.Preferences.getValue("general/camera_perspective_mode") @@ -458,6 +460,21 @@ UM.PreferencesPage } } + UM.TooltipArea + { + width: childrenRect.width + height: childrenRect.height + text: catalog.i18nc("@info:tooltip", "Should Cura open at the location it was closed?") + + CheckBox + { + id: restoreWindowPositionCheckbox + text: catalog.i18nc("@option:check", "Restore window position on start") + checked: boolCheck(UM.Preferences.getValue("general/restore_window_geometry")) + onCheckedChanged: UM.Preferences.setValue("general/restore_window_geometry", checked) + } + } + UM.TooltipArea { width: childrenRect.width From f3f9a2393f26ec02d0d25aa64d37c8706bd20eb0 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 16 Oct 2019 20:24:50 +0100 Subject: [PATCH 2/4] Return early from _checkStackForErrors() if top container is empty. --- plugins/CuraEngineBackend/StartSliceJob.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index b973a0775a..06ef2d97b1 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -106,6 +106,10 @@ class StartSliceJob(Job): if stack is None: return False + # if there are no per-object settings we don't need to check the other settings here + if stack.getTop() == None or len(stack.getTop().getAllKeys()) == 0: + return False + for key in stack.getAllKeys(): validation_state = stack.getProperty(key, "validationState") if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError, ValidatorState.Invalid): From 82bd89991e7ee6f15da5ec1baa0d22111796842a Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Thu, 17 Oct 2019 16:42:43 +0100 Subject: [PATCH 3/4] Improve code style. --- plugins/CuraEngineBackend/StartSliceJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 06ef2d97b1..94f6d3edfa 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -107,7 +107,7 @@ class StartSliceJob(Job): return False # if there are no per-object settings we don't need to check the other settings here - if stack.getTop() == None or len(stack.getTop().getAllKeys()) == 0: + if stack.getTop() is None or not stack.getTop().getAllKeys(): return False for key in stack.getAllKeys(): From c7a6fa4a006eb8a56c48f9f2eeafddc6603c63c0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 18 Oct 2019 11:59:21 +0200 Subject: [PATCH 4/4] Remove fixed override of prime tower position Now it uses the calculated value from fdm_printer, which is way smarter about it --- resources/definitions/ultimaker_s5.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index dfa8da5397..7eb37d0614 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -70,8 +70,6 @@ "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, - "prime_tower_position_x": { "value": "345" }, - "prime_tower_position_y": { "value": "222.5" }, "prime_blob_enable": { "enabled": true, "default_value": false }, "speed_travel":