From 9223122fc8af07bf209eb85a947e351e0d617262 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 30 May 2018 09:13:25 +0200 Subject: [PATCH 1/5] Add CuraCloudAPIRoot into CuraVersion.py.in and CMakeLists.txt CURA-5357 --- CMakeLists.txt | 2 ++ cura/CuraVersion.py.in | 1 + 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96efd68a2f..079b44890a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ endif() set(CURA_VERSION "master" CACHE STRING "Version name of Cura") set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'") set(CURA_PACKAGES_VERSION "" CACHE STRING "Packages version of Cura") +set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative cloud API root of Cura") + configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY) configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) diff --git a/cura/CuraVersion.py.in b/cura/CuraVersion.py.in index f45a24cae9..3077ad5441 100644 --- a/cura/CuraVersion.py.in +++ b/cura/CuraVersion.py.in @@ -5,3 +5,4 @@ CuraVersion = "@CURA_VERSION@" CuraBuildType = "@CURA_BUILDTYPE@" CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False CuraPackagesVersion = "@CURA_PACKAGES_VERSION@" +CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@" From fae9bc838b4a9cb8d293b3785db5f5da4ce290c0 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 30 May 2018 09:18:43 +0200 Subject: [PATCH 2/5] Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt CURA-5357 --- CMakeLists.txt | 5 +++-- cura/CuraVersion.py.in | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 079b44890a..9e9bf4b538 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,9 @@ endif() set(CURA_VERSION "master" CACHE STRING "Version name of Cura") set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'") -set(CURA_PACKAGES_VERSION "" CACHE STRING "Packages version of Cura") -set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative cloud API root of Cura") +set(CURA_SDK_VERSION "" CACHE STRING "SDK version of Cura") +set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") +set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY) configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) diff --git a/cura/CuraVersion.py.in b/cura/CuraVersion.py.in index 3077ad5441..226b2183f2 100644 --- a/cura/CuraVersion.py.in +++ b/cura/CuraVersion.py.in @@ -4,5 +4,6 @@ CuraVersion = "@CURA_VERSION@" CuraBuildType = "@CURA_BUILDTYPE@" CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False -CuraPackagesVersion = "@CURA_PACKAGES_VERSION@" +CuraSDKVersion = "@CURA_SDK_VERSION@" CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@" +CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@" From f1bb0e58e725d884a1d56cf5d7eeffff3372d388 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 30 May 2018 09:20:00 +0200 Subject: [PATCH 3/5] Do not use CuraVersion data if strings are empty CURA-5357 --- plugins/Toolbox/src/Toolbox.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index b9e7f8f94d..b019dfccbe 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -175,6 +175,8 @@ class Toolbox(QObject, Extension): return self.DEFAULT_CLOUD_API_ROOT if not hasattr(cura.CuraVersion, "CuraCloudAPIRoot"): return self.DEFAULT_CLOUD_API_ROOT + if not cura.CuraVersion.CuraCloudAPIRoot: + return self.DEFAULT_CLOUD_API_ROOT return cura.CuraVersion.CuraCloudAPIRoot # Get the cloud API version from CuraVersion @@ -183,6 +185,8 @@ class Toolbox(QObject, Extension): return self.DEFAULT_CLOUD_API_VERSION if not hasattr(cura.CuraVersion, "CuraCloudAPIVersion"): return self.DEFAULT_CLOUD_API_VERSION + if not cura.CuraVersion.CuraCloudAPIVersion: + return self.DEFAULT_CLOUD_API_VERSION return cura.CuraVersion.CuraCloudAPIVersion # Get the packages version depending on Cura version settings. @@ -191,6 +195,8 @@ class Toolbox(QObject, Extension): return self._plugin_registry.APIVersion if not hasattr(cura.CuraVersion, "CuraSDKVersion"): return self._plugin_registry.APIVersion + if not cura.CuraVersion.CuraSDKVersion: + return self._plugin_registry.APIVersion return cura.CuraVersion.CuraSDKVersion @pyqtSlot() From 3395610b677e8be30f116a411e722a910b86a30a Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Wed, 30 May 2018 09:44:33 +0200 Subject: [PATCH 4/5] CURA-5357 fix boo boo, rename variable --- resources/qml/Cura.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index b8f289278c..dce106e219 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -338,7 +338,7 @@ UM.MainWindow } else { - others.push(filename); + nonPackages.push(filename); } } openDialog.handleOpenFileUrls(nonPackages); From 6ea5924c95f8b8a2d6521d35df3568b146c5f73f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 30 May 2018 10:35:50 +0200 Subject: [PATCH 5/5] Remove Try Multiple Line Thicknesses setting This setting is now always enabled, hard-coded in the engine. --- resources/definitions/fdmprinter.def.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index b3932de827..5ad478bfc3 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6678,14 +6678,6 @@ "type": "float", "enabled": "bridge_settings_enabled and bridge_enable_more_layers", "settable_per_mesh": true - }, - "wall_try_line_thickness": - { - "label": "Try Multiple Line Thicknesses", - "description": "When creating inner walls, try various line thicknesses to fit the wall lines better in narrow spaces. This reduces or increases the inner wall line width by up to 0.01mm.", - "default_value": false, - "type": "bool", - "settable_per_mesh": true } } },