From b9f1f8c400372bfe4782e7a2fd4d4e0cbefb527f Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Mon, 20 Aug 2018 09:48:59 +0100 Subject: [PATCH 1/5] Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder. --- resources/definitions/fdmextruder.def.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 3f84ed69a4..19c9e92d18 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -178,7 +178,19 @@ "maximum_value": "machine_height", "settable_per_mesh": false, "settable_per_extruder": true - } + }, + "machine_extruder_cooling_fan_number": + { + "label": "Extruder Print Cooling Fan", + "description": "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder.", + "type": "int", + "default_value": 0, + "minimum_value": "0", + "settable_per_mesh": false, + "settable_per_extruder": true, + "settable_per_meshgroup": false, + "setttable_globally": false + } } }, "platform_adhesion": From a0787a03ea11f149feb897c7d74d20c210cb50f8 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Mon, 20 Aug 2018 09:49:31 +0100 Subject: [PATCH 2/5] Added extruder setting field for cooling fan number. --- .../MachineSettingsAction/MachineSettingsAction.qml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index b12f8f8696..c9b47ba3c0 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -433,6 +433,18 @@ Cura.MachineAction property bool allowNegative: true } + Loader + { + id: extruderCoolingFanNumberField + sourceComponent: numericTextFieldWithUnit + property string settingKey: "machine_extruder_cooling_fan_number" + property string label: catalog.i18nc("@label", "Cooling Fan Number") + property string unit: catalog.i18nc("@label", "") + property bool isExtruderSetting: true + property bool forceUpdateOnChange: true + property bool allowNegative: false + } + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } Row From 254106bb264699174a8edcfc20e50e22c455ef32 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 3 Oct 2018 15:37:52 +0200 Subject: [PATCH 3/5] Format date strings to ISO YYYY/MM/DD in Toolbox CURA-5762 --- .../Toolbox/resources/qml/ToolboxDetailPage.qml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml index e9aaf39226..af08bbe288 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml @@ -125,11 +125,22 @@ Item { return "" } - var date = new Date(details.last_updated) - return date.toLocaleDateString(UM.Preferences.getValue("general/language")) + var date = new Date(details.last_updated); + var date_text = formatDateToISOString(date); + return date_text; } font: UM.Theme.getFont("very_small") color: UM.Theme.getColor("text") + + function formatDateToISOString(date) { + var day = String(date.getDate()); + day = (day.length < 2) ? "0" + day : day; + var month = String(date.getMonth()); + month = (month.length < 2) ? "0" + month : month; + var year = String(date.getFullYear()); + + return year + '/' + month + '/' + day; + } } Label { From e3721fe539cc2f94ca45270c909cc1ebb3c78a4d Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 3 Oct 2018 16:27:13 +0200 Subject: [PATCH 4/5] Revert "Format date strings to ISO YYYY/MM/DD in Toolbox" This reverts commit 254106bb264699174a8edcfc20e50e22c455ef32. --- .../Toolbox/resources/qml/ToolboxDetailPage.qml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml index af08bbe288..e9aaf39226 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml @@ -125,22 +125,11 @@ Item { return "" } - var date = new Date(details.last_updated); - var date_text = formatDateToISOString(date); - return date_text; + var date = new Date(details.last_updated) + return date.toLocaleDateString(UM.Preferences.getValue("general/language")) } font: UM.Theme.getFont("very_small") color: UM.Theme.getColor("text") - - function formatDateToISOString(date) { - var day = String(date.getDate()); - day = (day.length < 2) ? "0" + day : day; - var month = String(date.getMonth()); - month = (month.length < 2) ? "0" + month : month; - var year = String(date.getFullYear()); - - return year + '/' + month + '/' + day; - } } Label { From a4e02a6eaef9018ab714c7d8d2190252d325790a Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 3 Oct 2018 16:27:30 +0200 Subject: [PATCH 5/5] Revert "Update date format" This reverts commit 959f698b038a189238c59eff69035a446382d74a. --- plugins/Toolbox/resources/qml/ToolboxDetailPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml index e9aaf39226..cba55051f5 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml @@ -126,7 +126,7 @@ Item return "" } var date = new Date(details.last_updated) - return date.toLocaleDateString(UM.Preferences.getValue("general/language")) + return date.toLocaleString(UM.Preferences.getValue("general/language")) } font: UM.Theme.getFont("very_small") color: UM.Theme.getColor("text")