From 5813aa2f57d30e8c254f937c2e338133d3ddc980 Mon Sep 17 00:00:00 2001 From: RFBomb Date: Mon, 25 Jan 2021 13:16:17 -0500 Subject: [PATCH 1/7] Adds checkbox for 'machine_use_extruder_offset_to_offset_coords' in printer settings page. --- .../MachineSettingsPrinterTab.qml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 758efd2e4e..176119bd68 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -330,6 +330,24 @@ Item } } + /* + - Proposed fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 + - Allows user to toggle if GCODE coordinates are affected by the extruder offset. + - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently. + - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab) + */ + Cura.SimpleCheckBox // "GCode Affected By Extruder Offsets" + { + id: ApplyExtruderOffsetsToGCodeCheckbox + containerStackId: machineStackId + settingKey: "machine_use_extruder_offset_to_offset_coords" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Apply Extruder offsets to GCode") + labelFont: base.labelFont + labelWidth: base.labelWidth + forceUpdateOnChangeFunction: forceUpdateFunction + } + /* The "Shared Heater" feature is temporarily disabled because its implementation is incomplete. Printers with multiple filaments going into one nozzle will keep the inactive filaments retracted at the From 322e4ac904c320f3323efd5fcc7237a35dcfffab Mon Sep 17 00:00:00 2001 From: RFBomb Date: Mon, 25 Jan 2021 23:06:32 -0500 Subject: [PATCH 2/7] Correct syntax error that prevented checkbox showing up --- .../MachineSettingsPrinterTab.qml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 176119bd68..49f58019d5 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -330,24 +330,25 @@ Item } } - /* - - Proposed fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 - - Allows user to toggle if GCODE coordinates are affected by the extruder offset. - - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently. - - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab) - */ + /* + - Proposed fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 + - Allows user to toggle if GCODE coordinates are affected by the extruder offset. + - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently. + - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab) + */ Cura.SimpleCheckBox // "GCode Affected By Extruder Offsets" { - id: ApplyExtruderOffsetsToGCodeCheckbox + id: applyExtruderOffsetsCheckbox containerStackId: machineStackId - settingKey: "machine_use_extruder_offset_to_offset_coords" + settingKey: "machine_use_extruder_offset_to_offset_coords" settingStoreIndex: propertyStoreIndex labelText: catalog.i18nc("@label", "Apply Extruder offsets to GCode") labelFont: base.labelFont labelWidth: base.labelWidth forceUpdateOnChangeFunction: forceUpdateFunction } - + + /* The "Shared Heater" feature is temporarily disabled because its implementation is incomplete. Printers with multiple filaments going into one nozzle will keep the inactive filaments retracted at the From 5130b5814dadf5e35067d09a11297ab610dd8080 Mon Sep 17 00:00:00 2001 From: RFBomb Date: Mon, 25 Jan 2021 23:08:35 -0500 Subject: [PATCH 3/7] correct spacing --- .../MachineSettingsPrinterTab.qml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 49f58019d5..4198cd6485 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -338,9 +338,9 @@ Item */ Cura.SimpleCheckBox // "GCode Affected By Extruder Offsets" { - id: applyExtruderOffsetsCheckbox + id: applyExtruderOffsetsCheckbox containerStackId: machineStackId - settingKey: "machine_use_extruder_offset_to_offset_coords" + settingKey: "machine_use_extruder_offset_to_offset_coords" settingStoreIndex: propertyStoreIndex labelText: catalog.i18nc("@label", "Apply Extruder offsets to GCode") labelFont: base.labelFont @@ -360,13 +360,13 @@ Item Cura.SimpleCheckBox // "Shared Heater" { id: sharedHeaterCheckBox - containerStackId: machineStackId - settingKey: "machine_extruders_share_heater" - settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Shared Heater") - labelFont: base.labelFont - labelWidth: base.labelWidth - forceUpdateOnChangeFunction: forceUpdateFunction + containerStackId: machineStackId + settingKey: "machine_extruders_share_heater" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Shared Heater") + labelFont: base.labelFont + labelWidth: base.labelWidth + forceUpdateOnChangeFunction: forceUpdateFunction } */ } From e6cb24cbbcbbe63905400a5a0f8f658e239f4d20 Mon Sep 17 00:00:00 2001 From: RFBomb Date: Mon, 25 Jan 2021 23:12:19 -0500 Subject: [PATCH 4/7] correct spacing again.... --- .../MachineSettingsPrinterTab.qml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 4198cd6485..184c6abc52 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -360,13 +360,13 @@ Item Cura.SimpleCheckBox // "Shared Heater" { id: sharedHeaterCheckBox - containerStackId: machineStackId - settingKey: "machine_extruders_share_heater" - settingStoreIndex: propertyStoreIndex - labelText: catalog.i18nc("@label", "Shared Heater") - labelFont: base.labelFont - labelWidth: base.labelWidth - forceUpdateOnChangeFunction: forceUpdateFunction + containerStackId: machineStackId + settingKey: "machine_extruders_share_heater" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Shared Heater") + labelFont: base.labelFont + labelWidth: base.labelWidth + forceUpdateOnChangeFunction: forceUpdateFunction } */ } From 79e92507152abe2394e0ddb2c50e0e6901003036 Mon Sep 17 00:00:00 2001 From: RFBomb Date: Mon, 25 Jan 2021 23:14:23 -0500 Subject: [PATCH 5/7] Update fdmprinter.def.json --- 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 63c7b25b0b..244e55dc8e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -485,7 +485,7 @@ "machine_use_extruder_offset_to_offset_coords": { "label": "Offset with Extruder", - "description": "Apply the extruder offset to the coordinate system.", + "description": "Apply the extruder offset to the coordinate system. Affects all extruders.", "type": "bool", "default_value": true, "settable_per_mesh": false, From 4c8c7ec162debd4782fae626a904463c8483c11e Mon Sep 17 00:00:00 2001 From: RFBomb Date: Mon, 25 Jan 2021 23:17:51 -0500 Subject: [PATCH 6/7] Correct comment spacing --- .../MachineSettingsPrinterTab.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 184c6abc52..8dc7492be3 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -330,12 +330,12 @@ Item } } - /* - - Proposed fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 - - Allows user to toggle if GCODE coordinates are affected by the extruder offset. - - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently. - - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab) - */ + /* + - Proposed fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 + - Allows user to toggle if GCODE coordinates are affected by the extruder offset. + - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently. + - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab) + */ Cura.SimpleCheckBox // "GCode Affected By Extruder Offsets" { id: applyExtruderOffsetsCheckbox From 8c85902c5fe706a6525d0591c0bdbd08ca422a97 Mon Sep 17 00:00:00 2001 From: Robert B Date: Sun, 31 Jan 2021 12:29:38 -0500 Subject: [PATCH 7/7] Update comment before Pull Request Functionality has been tested. --- plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 8dc7492be3..0b3eba66c2 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -331,10 +331,10 @@ Item } /* - - Proposed fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 + - Fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 - Allows user to toggle if GCODE coordinates are affected by the extruder offset. - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently. - - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab) + - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab. */ Cura.SimpleCheckBox // "GCode Affected By Extruder Offsets" {