From 233013c9469ca0fc7a507f73707ed6ec1ab58267 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 13 May 2019 13:23:10 +0200 Subject: [PATCH 1/4] Cache a lot of items in the list so there are no glitches --- resources/qml/WelcomePages/AddLocalPrinterScrollView.qml | 4 ++-- resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index cb0bad67ea..1be17adf7f 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -14,7 +14,7 @@ import Cura 1.0 as Cura // Item { - UM.I18nCatalog { id: catalog; name: "cura" } +// UM.I18nCatalog { id: catalog; name: "cura" } id: base height: childrenRect.height @@ -85,7 +85,7 @@ Item { id: machineList - cacheBuffer: 0 // Workaround for https://bugreports.qt.io/browse/QTBUG-49224 + cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item. model: UM.DefinitionContainersModel { diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 6d8f75c3f5..95eff0465a 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -72,7 +72,7 @@ Item section.criteria: ViewSection.FullString section.delegate: sectionHeading - cacheBuffer: 0 // Workaround for https://bugreports.qt.io/browse/QTBUG-49224 + cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item. Component.onCompleted: { From cac4b8b7f1935e45a87117ac978de4b6f3e59cdb Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 13 May 2019 13:34:13 +0200 Subject: [PATCH 2/4] Remove useless comment line --- resources/qml/WelcomePages/AddLocalPrinterScrollView.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index 1be17adf7f..3dd9e86ee9 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -14,8 +14,6 @@ import Cura 1.0 as Cura // Item { -// UM.I18nCatalog { id: catalog; name: "cura" } - id: base height: childrenRect.height From 36ddf2f018e18d9673922542bda646ed7bbf6ac9 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 13 May 2019 13:49:00 +0200 Subject: [PATCH 3/4] Do not allow the use of "weight" for third party printers Otherwise external contributors can manipulate the order in which they appear in the list --- resources/definitions/Mark2_for_Ultimaker2.def.json | 1 - .../definitions/structur3d_discov3ry1_complete_um2plus.def.json | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 5a6e13d27e..0fab42cab0 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -13,7 +13,6 @@ "has_machine_materials": false, "has_machine_quality": false, "has_variant_materials": false, - "weight": 2, "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 2d54555c15..b4f91d68d1 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -6,7 +6,6 @@ "author": "Andrew Finkle, CTO", "manufacturer": "Structur3d.io", "visible": true, - "weight": 1, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2Plusbackplate.png", From 2e93948c846f595fb2d370af8e7207e7ddb33b41 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 13 May 2019 17:10:51 +0200 Subject: [PATCH 4/4] Take minimum of all build volume temperature values According to the Materials and Processing team here, this is better because it guarantees that the coldest of your materials won't sag. Contributes to issue CURA-6514. --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9691819e48..5efe3d0a5d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2062,8 +2062,8 @@ "description": "The temperature used for build volume. If this is 0, the build volume temperature will not be adjusted.", "unit": "°C", "type": "float", - "default_value": 0, - "resolve": "max(extruderValues('build_volume_temperature'))", + "default_value": 35, + "resolve": "min(extruderValues('build_volume_temperature'))", "minimum_value": "-273.15", "minimum_value_warning": "0", "maximum_value_warning": "285",