[Emc-commit] TRUNK emc2/src/emc/usr_intf/axis/scripts axis.py, 1.239, 1.240

[Jeff E. <cv...@cv...>]

Modified file emc2/src/emc/usr_intf/axis/scripts/axis.py

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/axis/scripts/axis.py?rev=1.240>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/axis/scripts/axis.py.diff?r1=1.239;r2=1.240>

Branch: TRUNK

Log:
revision 1.240
date: 2009/04/27 14:13:16;  author: jepler;  state: Exp;  lines: +8 -3
in lathe mode touch off, show diameter or radius if appropriate

--- axis.py	2009/04/27 13:09:59	1.239
+++ axis.py	2009/04/27 14:13:16	1.240
@@ -2346,9 +2346,14 @@
             if defaultsystem.startswith("T"): defaultsystem = systems[0]
         linear_axis = vars.current_axis.get() in "xyzuvw"
         if linear_axis:
-            if vars.metric.get(): unit_str = " mm"
-            else: unit_str = " in"
-        else: unit_str = u"\xb0"
+            if vars.metric.get(): unit_str = " " + _("mm")
+            else: unit_str = " " + _("in")
+            if lathe and vars.current_axis.get() == "x":
+                if 80 in s.gcodes:
+                    unit_str += _(" radius")
+                else:
+                    unit_str += _(" diameter")
+        else: unit_str = _(u"\xb0")
         _prompt_float.__init__(self, title, text, default, unit_str)
         t = self.t
         f = Frame(t)