From 7e194d34b6bf9b55b773426dc2771643c4b115d4 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Thu, 5 Jan 2023 14:33:20 +0100 Subject: [PATCH 1/9] dont allow minimum speed of zero Zero minimum speed results in infinite layer times, causing the speed factor to be NaN. CURA-10127 --- 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 bfec3e2e75..0f930b90b0 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4405,7 +4405,7 @@ "unit": "mm/s", "type": "float", "default_value": 10, - "minimum_value": "0", + "minimum_value": "1", "maximum_value_warning": "100", "settable_per_mesh": false, "settable_per_extruder": true From 17c020b3cda7d22978edd2cd66ca726f59ed91bb Mon Sep 17 00:00:00 2001 From: Asteroids <80862144+asteroids1975@users.noreply.github.com> Date: Sat, 4 Feb 2023 01:26:00 +0100 Subject: [PATCH 2/9] Fix decimals on heated bed temperature monitor (HeatedBedBox.qml) Round heated bed temperature values when printer sends them with decimal digits. Same roundings already exist on the extruder temperatures (see ExtruderBox.qml line 50 and 85) --- resources/qml/PrinterOutput/HeatedBedBox.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/PrinterOutput/HeatedBedBox.qml b/resources/qml/PrinterOutput/HeatedBedBox.qml index 8a1d13524f..172606c56d 100644 --- a/resources/qml/PrinterOutput/HeatedBedBox.qml +++ b/resources/qml/PrinterOutput/HeatedBedBox.qml @@ -32,7 +32,7 @@ Item UM.Label { id: bedTargetTemperature - text: printerModel != null ? printerModel.targetBedTemperature + "°C" : "" + text: printerModel != null ? Math.round(printerModel.targetBedTemperature) + "°C" : "" font: UM.Theme.getFont("default_bold") color: UM.Theme.getColor("text_inactive") anchors.right: parent.right @@ -66,7 +66,7 @@ Item UM.Label { id: bedCurrentTemperature - text: printerModel != null ? printerModel.bedTemperature + "°C" : "" + text: printerModel != null ? Math.round(printerModel.bedTemperature) + "°C" : "" font: UM.Theme.getFont("large_bold") anchors.right: bedTargetTemperature.left anchors.top: parent.top @@ -293,4 +293,4 @@ Item } } } -} \ No newline at end of file +} From ebbf4d3ca2d02b4490ee3d963009d1f2c3a63045 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 6 Mar 2023 16:50:13 +0100 Subject: [PATCH 3/9] add new skirt_height setting CURA-9826 --- resources/definitions/fdmprinter.def.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1c61afd13f..9642578545 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5677,6 +5677,20 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "skirt_height": + { + "label": "Skirt Height", + "description": "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt.", + "type": "int", + "default_value": 3, + "minimum_value": "1", + "maximum_value_warning": "10", + "maximum_value": "machine_height / layer_height", + "enabled": "resolveOrValue('adhesion_type') == 'skirt'", + "limit_to_extruder": "skirt_brim_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "skirt_gap": { "label": "Skirt Distance", From 8d13e79f31b764057d9075e37d043ac48e1304a0 Mon Sep 17 00:00:00 2001 From: jellespijker Date: Tue, 14 Mar 2023 17:27:58 +0000 Subject: [PATCH 4/9] update translations --- resources/i18n/cs_CZ/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/de_DE/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/es_ES/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/fdmprinter.def.json.pot | 12 +++++++++++- resources/i18n/fi_FI/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/fr_FR/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/hu_HU/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/it_IT/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/ja_JP/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/ko_KR/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/nl_NL/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/pl_PL/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/pt_BR/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/pt_PT/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/ru_RU/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/tr_TR/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/zh_CN/fdmprinter.def.json.po | 12 +++++++++++- resources/i18n/zh_TW/fdmprinter.def.json.po | 12 +++++++++++- 18 files changed, 198 insertions(+), 18 deletions(-) diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po index cf64029f9c..bcdf708789 100644 --- a/resources/i18n/cs_CZ/fdmprinter.def.json.po +++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: 2023-02-16 20:35+0100\n" "Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" @@ -3181,6 +3181,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Teplota při tisku první vrstvy" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3666,6 +3671,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Vzdálenost okraj" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 680c2a4f63..69f1832de8 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Drucktemperatur erste Schicht" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Skirt-Abstand" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 8753cc4765..62b8a91442 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Temperatura de impresión de la capa inicial" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Distancia de falda" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index 10fe46940a..d78071804e 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -4696,6 +4696,16 @@ msgctxt "skirt_line_count description" msgid "Multiple skirt lines help to prime your extrusion better for small models. Setting this to 0 will disable the skirt." msgstr "" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_gap label" msgid "Skirt Distance" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 34c7fed8e3..b8a9c9bc59 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: 2022-07-15 11:17+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -3176,6 +3176,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Alkukerroksen tulostuslämpötila" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3661,6 +3666,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Helman etäisyys" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 6a5ebd4969..62095fa98d 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Température d’impression couche initiale" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Distance de la jupe" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/hu_HU/fdmprinter.def.json.po b/resources/i18n/hu_HU/fdmprinter.def.json.po index 3d2db46bd4..fb480b8b75 100644 --- a/resources/i18n/hu_HU/fdmprinter.def.json.po +++ b/resources/i18n/hu_HU/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: 2020-03-24 09:43+0100\n" "Last-Translator: Nagy Attila \n" "Language-Team: AT-VLOG\n" @@ -3181,6 +3181,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Kezdő réteg nyomtatási hőmérséklete" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3666,6 +3671,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Szoknya távolság" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 887a300445..9c1ba18720 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Temperatura di stampa Strato iniziale" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Distanza dello skirt" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 2e1310d216..2650d37797 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "初期レイヤー印刷温度" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "スカート距離" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index f6c25c4ea7..3143ef376b 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3176,6 +3176,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "첫번째 레이어의 프린팅 온도" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3661,6 +3666,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "스커트 거리" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index f8cb910869..c2a409c6fd 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Printtemperatuur van de eerste laag" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Skirtafstand" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index 6f7b9514b8..bd3966e2ec 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: 2019-11-15 15:34+0100\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -3182,6 +3182,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Temp. Druku Początk. Warstwy" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3667,6 +3672,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Odległ. Obwódki" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index b13c2bb74e..b0e2fa21ae 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.0\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: 2023-02-17 16:31+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" @@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Temperatura de Impressão da Camada Inicial" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Distância do Skirt" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index d641ee1184..d896629b9f 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Temperatura Impressão Camada Inicial" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Distância Contorno" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index f6a01d2c95..3df929ab0a 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "Температура печати первого слоя" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Дистанция до юбки" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 2ebda91de1..59aeade419 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "İlk Katman Yazdırma Sıcaklığı" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Etek Mesafesi" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 725d488792..5288ef507c 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -3178,6 +3178,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "打印温度起始层" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3663,6 +3668,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "Skirt 距离" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index b92ec08996..c3e1691bfc 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: plugins@ultimaker.com\n" -"POT-Creation-Date: 2023-03-08 09:03+0000\n" +"POT-Creation-Date: 2023-03-14 17:27+0000\n" "PO-Revision-Date: 2022-01-02 20:24+0800\n" "Last-Translator: Valen Chang \n" "Language-Team: Valen Chang \n" @@ -3183,6 +3183,11 @@ msgctxt "material_print_temperature_layer_0 label" msgid "Printing Temperature Initial Layer" msgstr "列印溫度起始層" +#: fdmprinter.def.json +msgctxt "skirt_height description" +msgid "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt." +msgstr "" + #: fdmprinter.def.json msgctxt "alternate_extra_perimeter description" msgid "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints." @@ -3668,6 +3673,11 @@ msgctxt "skirt_gap label" msgid "Skirt Distance" msgstr "外圍間距" +#: fdmprinter.def.json +msgctxt "skirt_height label" +msgid "Skirt Height" +msgstr "" + #: fdmprinter.def.json msgctxt "skirt_line_count label" msgid "Skirt Line Count" From 035a6092777ca4f5333c8447c8eaec6dc9325265 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 14 Mar 2023 19:23:11 +0100 Subject: [PATCH 5/9] Boyscouting CURA-10374 --- .../MachineSettings/ComboBoxWithOptions.qml | 76 ++++++++----------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 7ba7c0f701..058ac6853f 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -65,32 +65,30 @@ UM.TooltipArea { id: defaultOptionsModel - function updateModel() - { - clear() + function updateModel() { + clear(); - if(!propertyProvider.properties.options) - { - return + if (!propertyProvider.properties.options) { + return; } - if (typeof propertyProvider.properties["options"] === "string") - { - return + if (typeof propertyProvider.properties["options"] === "string") { + return; } + let currentIndex = -1; + const keys = propertyProvider.properties["options"].keys(); + for (let index = 0; index < propertyProvider.properties["options"].keys().length; index ++) { + const key = propertyProvider.properties["options"].keys()[index]; + const value = propertyProvider.properties["options"][key]; - for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++) - { - var key = propertyProvider.properties["options"].keys()[i] - var value = propertyProvider.properties["options"][key] - append({ text: value, code: key }) - - if (propertyProvider.properties.value === key) - { - comboBox.currentIndex = i + if (propertyProvider.properties.value === key) { + currentIndex = index; } + defaultOptionsModel.append({ text: value, code: key }); } + + comboBox.currentIndex = currentIndex; } Component.onCompleted: updateModel() @@ -114,36 +112,28 @@ UM.TooltipArea model: defaultOptionsModel textRole: "text" - currentIndex: - { - var currentValue = propertyProvider.properties.value - var index = 0 - for (var i = 0; i < model.count; i++) - { - if (model.get(i).value == currentValue) - { - index = i - break + currentIndex: function () { + const currentValue = propertyProvider.properties.value + for (let i = 0; i < model.count; i ++) { + if (model.get(i).value === currentValue) { + return i; } } - return index + return -1; } - onActivated: - { - var newValue = model.get(index).value - if (propertyProvider.properties.value !== newValue && newValue !== undefined) - { - if (setValueFunction !== null) - { - setValueFunction(newValue) + onActivated: function (index) { + const key = propertyProvider.properties["options"].keys()[index]; + const newValue = model.get(index).value; + + if (propertyProvider.properties.value !== newValue && newValue !== undefined) { + if (setValueFunction !== null) { + setValueFunction(newValue); + } else { + propertyProvider.setPropertyValue("value", newValue); } - else - { - propertyProvider.setPropertyValue("value", newValue) - } - forceUpdateOnChangeFunction() - afterOnEditingFinishedFunction() + forceUpdateOnChangeFunction(); + afterOnEditingFinishedFunction(); } } } From 37f4271c9bfba35aa0da684157cb4f195a3f4b67 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 14 Mar 2023 19:24:47 +0100 Subject: [PATCH 6/9] Fix comboboxes not updating the accosiated value Was introduced by this commit: https://github.com/Ultimaker/Cura/commit/788ab7da1b61d5d002ba35914f57b5cc971d2fc9 CURA-10374 --- resources/qml/MachineSettings/ComboBoxWithOptions.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 058ac6853f..a25e165d2d 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -85,7 +85,7 @@ UM.TooltipArea if (propertyProvider.properties.value === key) { currentIndex = index; } - defaultOptionsModel.append({ text: value, code: key }); + defaultOptionsModel.append({ text: value, value: key }); } comboBox.currentIndex = currentIndex; From e965788b7bafc449dd142d1b1931a8a472897c2e Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Wed, 15 Mar 2023 09:08:33 +0100 Subject: [PATCH 7/9] add skirt height to settings visibility CURA-9826 --- resources/setting_visibility/expert.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 10760f39be..96331470d5 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -302,6 +302,7 @@ adhesion_extruder_nr raft_surface_extruder_nr skirt_line_count skirt_gap +skirt_height skirt_brim_minimal_length brim_width brim_gap From 84bb820e336bd293e7552b381df2bb9ea94391be Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 15 Mar 2023 10:42:07 +0100 Subject: [PATCH 8/9] Update copy in pause at height to reflect that the first layer is 0 CURA-10391 --- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 7f8d1d118a..54f555b4ae 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -46,7 +46,7 @@ class PauseAtHeight(Script): "pause_layer": { "label": "Pause Layer", - "description": "Enter the Number of the LAST layer you want to finish prior to the pause (from the Cura preview).", + "description": "Enter the Number of the LAST layer you want to finish prior to the pause. Note that 0 is the first layer printed.", "type": "int", "value": "math.floor((pause_height - 0.27) / 0.1) + 1", "minimum_value": "0", From 905a40dc390f4e092a13888ecf2787518bf1e00e Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 15 Mar 2023 11:15:31 +0100 Subject: [PATCH 9/9] Set height to 1 if skirt gap is 0 Contributes to CURA-9826 --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index bde14e57ba..c9eaf2790c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5685,6 +5685,7 @@ "description": "Printing the innermost skirt line with multiple layers makes it easy to remove the skirt.", "type": "int", "default_value": 3, + "value": "3 if resolveOrValue('skirt_gap') > 0.0 else 1", "minimum_value": "1", "maximum_value_warning": "10", "maximum_value": "machine_height / layer_height",