From 326e0b2fbd3130468d04e8d1a5be888178960e69 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 23 Aug 2017 11:28:58 +0100 Subject: [PATCH 1/8] Add relative_extrusion setting to special modes category. Default value is true for RepRap firmware, otherwise false. --- resources/definitions/fdmprinter.def.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 21de5524cf..6b2f3d9c90 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4919,6 +4919,16 @@ "enabled": "magic_spiralize", "settable_per_mesh": false, "settable_per_extruder": false + }, + "relative_extrusion": + { + "label": "Use Relative Extrusion", + "description": "Use relative extrusion rather than absolute extrusion. Before, Cura always used absolute extrusion. Most printers can cope with either relative or absolute extrusion.", + "type": "bool", + "default_value": "machine_gcode_flavor==\"RepRap (RepRap)\"", + "enabled": true, + "settable_per_mesh": false, + "settable_per_extruder": false } } }, From d536630501d0f7f73c7005f6667fe0b78049f55a Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 23 Aug 2017 11:45:35 +0100 Subject: [PATCH 2/8] Fix initial value for relative_extrusion. --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6b2f3d9c90..b20c43be83 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4925,7 +4925,8 @@ "label": "Use Relative Extrusion", "description": "Use relative extrusion rather than absolute extrusion. Before, Cura always used absolute extrusion. Most printers can cope with either relative or absolute extrusion.", "type": "bool", - "default_value": "machine_gcode_flavor==\"RepRap (RepRap)\"", + "default_value": false, + "value": "machine_gcode_flavor==\"RepRap (RepRap)\"", "enabled": true, "settable_per_mesh": false, "settable_per_extruder": false From 2e60a4a5899e836e687307eb2cb41d4bde40cab6 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Wed, 23 Aug 2017 13:57:46 +0100 Subject: [PATCH 3/8] Tweak relative_extrusion label and blurb. --- 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 b20c43be83..6386e20c91 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4922,8 +4922,8 @@ }, "relative_extrusion": { - "label": "Use Relative Extrusion", - "description": "Use relative extrusion rather than absolute extrusion. Before, Cura always used absolute extrusion. Most printers can cope with either relative or absolute extrusion.", + "label": "Relative Extrusion", + "description": "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the Gcode. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps.", "type": "bool", "default_value": false, "value": "machine_gcode_flavor==\"RepRap (RepRap)\"", From 58e2d07cbd2ae4857eb8c9925b39eb688f17e8f8 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Thu, 31 Aug 2017 10:55:52 +0100 Subject: [PATCH 4/8] Add comment that absolute extrusion mode will always be set before start and end gcode. --- 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 6386e20c91..a4e3511688 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4923,7 +4923,7 @@ "relative_extrusion": { "label": "Relative Extrusion", - "description": "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the Gcode. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps.", + "description": "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the Gcode. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before the start and end Gcode are output.", "type": "bool", "default_value": false, "value": "machine_gcode_flavor==\"RepRap (RepRap)\"", From 125dc75a0fd46ab84a9942f9a8f9a93cc9d869d6 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Fri, 1 Sep 2017 07:54:56 +0100 Subject: [PATCH 5/8] Now blurb for relative_extrusion says absolute extrusion mode will be set before any gcode script is output. --- 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 a4e3511688..7f0aea874c 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4923,7 +4923,7 @@ "relative_extrusion": { "label": "Relative Extrusion", - "description": "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the Gcode. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before the start and end Gcode are output.", + "description": "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the Gcode. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any Gcode script is output.", "type": "bool", "default_value": false, "value": "machine_gcode_flavor==\"RepRap (RepRap)\"", From f50255f1c95eda418310421a99bab6b96509ffd8 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Sep 2017 10:21:34 +0200 Subject: [PATCH 6/8] Disable relative_extrusion for UMs CURA-4219 --- resources/definitions/ultimaker.def.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index b11a84164a..797a05e324 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -31,6 +31,11 @@ { "minimum_value": "0", "maximum_value": "machine_width" + }, + "relative_extrusion": + { + "value": false, + "enabled": false } } } From 327c84d9ef07eac7b7bbb965a4314e3f45c74001 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Sep 2017 10:48:31 +0200 Subject: [PATCH 7/8] Change tool panel and checkbox text colours CURA-4148 - Change tool panel background colour to white - Change checkbox text colour to almost black --- resources/themes/cura-light/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 9cf736aa34..328a65e633 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -197,7 +197,7 @@ "checkbox_border": [64, 69, 72, 255], "checkbox_border_hover": [12, 169, 227, 255], "checkbox_mark": [119, 122, 124, 255], - "checkbox_text": [166, 168, 169, 255], + "checkbox_text": [27, 27, 27, 255], "mode_switch": [255, 255, 255, 255], "mode_switch_hover": [255, 255, 255, 255], @@ -225,7 +225,7 @@ "message_progressbar_background": [255, 255, 255, 255], "message_progressbar_control": [12, 169, 227, 255], - "tool_panel_background": [31, 36, 39, 255], + "tool_panel_background": [255, 255, 255, 255], "status_offline": [0, 0, 0, 255], "status_ready": [0, 205, 0, 255], From 09bb090cd99c5374c8f1bb69638a9981a0a3c38f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 11 Sep 2017 10:53:17 +0200 Subject: [PATCH 8/8] Change setting_control_text to almost black colour CURA-4148 --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 328a65e633..46bf343bed 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -166,7 +166,7 @@ "setting_control_highlight": [255, 255, 255, 0], "setting_control_border": [127, 127, 127, 255], "setting_control_border_highlight": [12, 169, 227, 255], - "setting_control_text": [127, 127, 127, 255], + "setting_control_text": [27, 27, 27, 255], "setting_control_depth_line": [127, 127, 127, 255], "setting_control_button": [127, 127, 127, 255], "setting_control_button_hover": [70, 84, 113, 255],