Fix DRO alignment

This makes the default DRO format be just like the old non-configurable format, and fixes the spaces so the columns align again. Signed-off-by: Chris Radek <[email protected]>
LinuxCNC · Oct 20, 2016 · 3ffb2ec · 3ffb2ec
1 parent b6dc604
commit 3ffb2ec
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/python/rs274/glcanon.py b/lib/python/rs274/glcanon.py
@@ -421,8 +421,8 @@ def __init__(self, s, lp, g=None):
         self.no_joint_display = False
         self.kinstype = "UNKNOWN"
         self.trajcoordinates = "unknown"
-        self.dro_in = "% 6.4f"
-        self.dro_mm = "% 6.3f"
+        self.dro_in = "% 9.4f"
+        self.dro_mm = "% 9.3f"
         if os.environ["INI_FILE_NAME"]:
             self.inifile = linuxcnc.ini(os.environ["INI_FILE_NAME"])
             if self.inifile.find("DISPLAY", "DRO_FORMAT_IN"):
@@ -1513,12 +1513,12 @@ def dro_format(self,s,spd,dtg,limit,homed,positions,axisdtg,g5x_offset,g92_offse
             if self.get_show_metric():
                 format = "% 6s:" + self.dro_mm
                 droformat = " " + format + "  DTG %1s:" + self.dro_mm
-                offsetformat = "% 5s %1s:" + self.dro_mm + " G92 %1s:" + self.dro_mm
+                offsetformat = "% 5s %1s:" + self.dro_mm + "  G92 %1s:" + self.dro_mm
                 rotformat = "% 5s %1s:" + self.dro_mm
             else:
                 format = "% 6s:" + self.dro_in
                 droformat = " " + format + "  DTG %1s:" + self.dro_in
-                offsetformat = "% 5s %1s:" + self.dro_in + " G92 %1s:" + self.dro_in
+                offsetformat = "% 5s %1s:" + self.dro_in + "  G92 %1s:" + self.dro_in
                 rotformat = "% 5s %1s:" + self.dro_in
             diaformat = " " + format