Refactor setting names for consistancy, migration script

2 files changed, 18 insertions, 7 deletions

diff --git a/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py
index 01c0eb7d06..ac195b3b6c 100644
--- a/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py
+++ b/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py
@@ -1,7 +1,7 @@
 # Cura PostProcessingPlugin
 # Author:   Mathias Lyngklip Kjeldgaard, Alexander Gee
 # Date:     July 31, 2019
-# Modified: May 13, 2020
+# Modified: May 22, 2020
 
 # Description:  This plugin displays progress on the LCD. It can output the estimated time remaining and the completion percentage.
 
@@ -17,20 +17,20 @@ class DisplayProgressOnLCD(Script):
 
     def getSettingDataString(self):
         return """{
-            "name":"Display Progress On LCD",
-            "key":"DisplayProgressOnLCD",
+            "name": "Display Progress On LCD",
+            "key": "DisplayProgressOnLCD",
             "metadata": {},
             "version": 2,
             "settings":
             {
-                "TimeRemaining":
+                "time_remaining":
                 {
                     "label": "Time Remaining",
                     "description": "When enabled, write Time Left: HHMMSS on the display using M117. This is updated every layer.",
                     "type": "bool",
                     "default_value": false
                 },
-                "Percentage":
+                "percentage":
                 {
                     "label": "Percentage",
                     "description": "When enabled, set the completion bar percentage on the LCD using Marlin's M73 command.",
@@ -56,8 +56,8 @@ class DisplayProgressOnLCD(Script):
         lines.insert(line_index, "M117 Time Left {}".format(current_time_string))
 
     def execute(self, data):
-        output_time = self.getSettingValueByKey("TimeRemaining")
-        output_percentage = self.getSettingValueByKey("Percentage")
+        output_time = self.getSettingValueByKey("time_remaining")
+        output_percentage = self.getSettingValueByKey("percentage")
         line_set = {}
         if (output_percentage or output_time) == True:
             total_time = -1
diff --git a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
index 7b328e10e6..9f99eeec79 100644
--- a/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
+++ b/plugins/VersionUpgrade/VersionUpgrade462to47/VersionUpgrade462to47.py
@@ -120,6 +120,17 @@ class VersionUpgrade462to47(VersionUpgrade):
                     if "redo_layers" in script_parser["PauseAtHeight"]:
                         script_parser["PauseAtHeight"]["redo_layer"] = str(int(script_parser["PauseAtHeight"]["redo_layers"]) > 0)
                         del script_parser["PauseAtHeight"]["redo_layers"]  # Has been renamed to without the S.
+
+                # Migrate DisplayCompleteOnLCD to DisplayProgressOnLCD
+                if script_id == "DisplayPercentCompleteOnLCD":
+                    script_settings = script_parser.items(script_id)
+                    script_parser.remove_section(script_id)
+
+                    script_id = "DisplayProgressOnLCD"
+                    script_parser.add_section(script_id)
+                    if (script_settings["TurnOn"] == "true"):
+                        script_parser.set(script_id, "time_remaining", "true")
+
                 script_io = io.StringIO()
                 script_parser.write(script_io)
                 script_str = script_io.getvalue()