Merge pull request #15866 from GregValiant/DisplayInfoOnLCD

Display Info on LCD
Ultimaker · Nov 24, 2023 · 4f0840d · 4f0840d
2 parents 4ce0928 + ad9b11a
commit 4f0840d
Show file tree

Hide file tree

Showing 3 changed files with 468 additions and 250 deletions.
diff --git a/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py
@@ -3,21 +3,16 @@
 # Date:     August 28, 2018
 # Modified: November 16, 2018 by Joshua Pope-Lewis
 
-# Description:  This plugin shows custom messages about your print on the Status bar...
-#               Please look at the 5 options
-#               - Scrolling (SCROLL_LONG_FILENAMES) if enabled in Marlin and you aren't printing a small item select this option.
-#               - Name: By default it will use the name generated by Cura (EG: TT_Test_Cube) - Type a custom name in here
-#               - Start Num: Choose which number you prefer for the initial layer, 0 or 1
-#               - Max Layer: Enabling this will show how many layers are in the entire print (EG: Layer 1 of 265!)
-#               - Add prefix 'Printing': Enabling this will add the prefix 'Printing'
+# Description:  This plugin is now an option in 'Display Info on LCD'
 
 from ..Script import Script
 from UM.Application import Application
+from UM.Message import Message
 
 class DisplayFilenameAndLayerOnLCD(Script):
-    def __init__(self):
-        super().__init__()
-
+    def initialize(self) -> None:
+        Message(title = "[Display Filename and Layer on LCD]", text = "This script is now an option in 'Display Info on LCD'.  This post processor no longer works.").show()
+    
     def getSettingDataString(self):
         return """{
             "name": "Display Filename And Layer On LCD",
@@ -26,84 +21,17 @@ def getSettingDataString(self):
             "version": 2,
             "settings":
             {
-                "scroll":
-                {
-                    "label": "Scroll enabled/Small layers?",
-                    "description": "If SCROLL_LONG_FILENAMES is enabled select this setting however, if the model is small disable this setting!",
-                    "type": "bool",
-                    "default_value": false
-                },
-                "name":
-                {
-                    "label": "Text to display:",
-                    "description": "By default the current filename will be displayed on the LCD. Enter text here to override the filename and display something else.",
-                    "type": "str",
-                    "default_value": ""
-                },
-                "startNum":
-                {
-                    "label": "Initial layer number:",
-                    "description": "Choose which number you prefer for the initial layer, 0 or 1",
-                    "type": "int",
-                    "default_value": 0,
-                    "minimum_value": 0,
-                    "maximum_value": 1                    
-                },
-                "maxlayer":
+                "enable_script":
                 {
-                    "label": "Display max layer?:",
-                    "description": "Display how many layers are in the entire print on status bar?",
-                    "type": "bool",
-                    "default_value": true
-                },
-                "addPrefixPrinting":
-                {
-                    "label": "Add prefix 'Printing'?",
-                    "description": "This will add the prefix 'Printing'",
+                    "label": "Deprecated/Obsolete",
+                    "description": "This script is now included in 'Display Info on LCD'.",
                     "type": "bool",
                     "default_value": true
                 }
             }
         }"""
 
     def execute(self, data):
-        max_layer = 0
-        lcd_text = "M117 "
-        if self.getSettingValueByKey("name") != "":
-            name = self.getSettingValueByKey("name")
-        else:
-            name = Application.getInstance().getPrintInformation().jobName
-        if self.getSettingValueByKey("addPrefixPrinting"):
-            lcd_text += "Printing "
-        if not self.getSettingValueByKey("scroll"):
-            lcd_text += "Layer "
-        else:
-            lcd_text += name + " - Layer "
-        i = self.getSettingValueByKey("startNum")
-        for layer in data:
-            display_text = lcd_text + str(i)
-            layer_index = data.index(layer)
-            lines = layer.split("\n")
-            for line in lines:
-                if line.startswith(";LAYER_COUNT:"):
-                    max_layer = line
-                    max_layer = max_layer.split(":")[1]
-                    if self.getSettingValueByKey("startNum") == 0:
-                        max_layer = str(int(max_layer) - 1)
-                if line.startswith(";LAYER:"):
-                    if self.getSettingValueByKey("maxlayer"):
-                        display_text = display_text + " of " + max_layer
-                        if not self.getSettingValueByKey("scroll"):
-                            display_text = display_text + " " + name
-                    else:
-                        if not self.getSettingValueByKey("scroll"):
-                            display_text = display_text + " " + name + "!"
-                        else:
-                            display_text = display_text + "!"
-                    line_index = lines.index(line)
-                    lines.insert(line_index + 1, display_text)
-                    i += 1
-            final_lines = "\n".join(lines)
-            data[layer_index] = final_lines
-
+        Message(title = "[Display Filename and Layer on LCD]", text = "This post is now included in 'Display Info on LCD'.  This script will exit.").show()
+        data[0] += ";  [Display Filename and Layer on LCD]  Did not run.  It is now included in 'Display Info on LCD'.\n"
         return data