From cb4c1fd08c01d40cdc3e5608018a5db9b986a0c9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 22 Jul 2016 16:45:11 +0200 Subject: [PATCH] Rename skirt_speed to skirt_brim_speed Also updated the description. Because this concerns not only the skirt, but also the brim. Contributes to issue CURA-1678. --- .../VersionUpgrade21to22/VersionUpgrade21to22.py | 4 ++++ resources/definitions/bq_hephestos_2.def.json | 2 +- resources/definitions/bq_witbox_2.def.json | 2 +- resources/definitions/fdmprinter.def.json | 6 +++--- resources/definitions/maker_starter.def.json | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py b/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py index 2493e23405..7cf3d0915e 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py @@ -31,6 +31,7 @@ _setting_name_translations = { "remove_overlapping_walls_enabled": "travel_compensate_overlapping_walls_enabled", "remove_overlapping_walls_x_enabled": "travel_compensate_overlapping_walls_x_enabled", "retraction_hop": "retraction_hop_enabled", + "skirt_speed": "skirt_brim_speed", "speed_support_lines": "speed_support_infill" } @@ -157,6 +158,9 @@ class VersionUpgrade21to22(VersionUpgrade): elif key == "retraction_hop": #Setting key was changed. del settings[key] settings["retraction_hop_enabled"] = value + elif key == "skirt_speed": #Setting key was changed. + del settings[key] + settings["skirt_brim_speed"] = value elif key == "speed_support_lines": #Setting key was changed. del settings[key] settings["speed_support_infill"] = value diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index 51777ff83e..920c5f5e9b 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -38,7 +38,7 @@ "speed_wall_0": { "default_value": 30 }, "speed_infill": { "default_value": 80 }, "speed_topbottom": { "default_value": 35 }, - "skirt_speed": { "default_value": 35 }, + "skirt_brim_speed": { "default_value": 35 }, "skirt_line_count": { "default_value": 4 }, "skirt_minimal_length": { "default_value": 30 }, "skirt_gap": { "default_value": 6 }, diff --git a/resources/definitions/bq_witbox_2.def.json b/resources/definitions/bq_witbox_2.def.json index b9d9b497cd..73dff97eeb 100644 --- a/resources/definitions/bq_witbox_2.def.json +++ b/resources/definitions/bq_witbox_2.def.json @@ -89,7 +89,7 @@ "speed_topbottom": { "default_value": 35 }, - "skirt_speed": { + "skirt_brim_speed": { "default_value": 35 }, "skirt_line_count": { diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8f435c1e5c..e8831e27cd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1520,9 +1520,9 @@ "maximum_value_warning": "300", "settable_per_mesh": true }, - "skirt_speed": { - "label": "Skirt Speed", - "description": "The speed at which the skirt and brim are printed. Normally this is done at the initial layer speed, but sometimes you might want to print the skirt at a different speed.", + "skirt_brim_speed": { + "label": "Skirt/Brim Speed", + "description": "The speed at which the skirt and brim are printed. Normally this is done at the initial layer speed, but sometimes you might want to print the skirt or brim at a different speed.", "unit": "mm/s", "type": "float", "default_value": 30, diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index a26ca058f0..4d3f6e06b7 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -94,7 +94,7 @@ "speed_layer_0": { "default_value": 20 }, - "skirt_speed": { + "skirt_brim_speed": { "default_value": 15 }, "speed_slowdown_layers": {