qtvcp -gcode editor: fix axis with space after highlighting

c-morley · c-morley · commit c13c034ab77a · 2025-09-27T13:13:40.000-07:00
Small improvement axis letter with a space after would not be colored
properly.
diff --git a/lib/python/qtvcp/widgets/gcode_editor.py b/lib/python/qtvcp/widgets/gcode_editor.py
@@ -117,7 +117,7 @@ def styleText(self, start, end):
             1: r"(?:[N]\d+|\(.*?\)|;.*)",                                       # LineNo and Comment
             2: r"[G]\d{1,2}\.\d|[G]\d{1,2}",                                    # Gcode
             3: r"[M]\d{1,3}",                                                   # Mcode
-            4: r"[XYZABCUVW]{1}(?:[+-]?[\d\.]+|\#\<.*\>|\[.*\]|\#\d+)",         # Axis
+            4: r"[XYZABCUVW]{1}(?:[+-]?[\d\.\s]+|\#\<.*\>|\[.*\]|\#\d+)",       # Axis
             5: r"[EFHIJKDQLRPST$]{1}(?:[+-]?[\d\.]+|\#\<.*\>|\[.*\]|\#\d+)",    # Other (feed,rpm,radius,etc)
             0: r"\s+|\w+|\W",                                                   # Default (fallback)
         }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ def styleText(self, start, end):`
`117`	`117`	`1: r"(?:[N]\d+\|\(.?\)\|;.)", # LineNo and Comment`
`118`	`118`	`2: r"[G]\d{1,2}\.\d\|[G]\d{1,2}", # Gcode`
`119`	`119`	`3: r"[M]\d{1,3}", # Mcode`
`120`		`- 4: r"[XYZABCUVW]{1}(?:[+-]?[\d\.]+\|\#\<.\>\|\[.\]\|\#\d+)", # Axis`
	`120`	`+ 4: r"[XYZABCUVW]{1}(?:[+-]?[\d\.\s]+\|\#\<.\>\|\[.\]\|\#\d+)", # Axis`
`121`	`121`	`5: r"[EFHIJKDQLRPST$]{1}(?:[+-]?[\d\.]+\|\#\<.\>\|\[.\]\|\#\d+)", # Other (feed,rpm,radius,etc)`
`122`	`122`	`0: r"\s+\|\w+\|\W", # Default (fallback)`
`123`	`123`	`}`