Index: share/axis/tcl/axis.tcl
===================================================================
RCS file: /cvs/emc2/share/axis/tcl/axis.tcl,v
retrieving revision 1.96
diff -u -p -r1.96 axis.tcl
--- share/axis/tcl/axis.tcl 26 Feb 2009 13:45:25 -0000 1.96
+++ share/axis/tcl/axis.tcl 7 Mar 2009 23:44:30 -0000
@@ -334,6 +334,11 @@ setup_menu_accel .menu.view end [_ "Show
setup_menu_accel .menu.view end [_ "Show _distance to go"]
.menu.view add checkbutton \
+ -variable show_spindle_speed \
+ -command toggle_show_spindle_speed
+setup_menu_accel .menu.view end [_ "Show spindle ra_te"]
+
+.menu.view add checkbutton \
-variable dro_large_font \
-command toggle_dro_large_font
setup_menu_accel .menu.view end [_ "La_rge coordinate font"]
Index: src/emc/usr_intf/axis/scripts/axis.py
===================================================================
RCS file: /cvs/emc2/src/emc/usr_intf/axis/scripts/axis.py,v
retrieving revision 1.235
diff -u -p -r1.235 axis.py
--- src/emc/usr_intf/axis/scripts/axis.py 26 Feb 2009 13:45:26
-0000 1.235
+++ src/emc/usr_intf/axis/scripts/axis.py 7 Mar 2009 23:44:30 -0000
@@ -1089,6 +1089,8 @@ class MyOpengl(Opengl):
if vars.metric.get():
dtg *= 25.4
posstrs.append(format % ("DTG", dtg))
+ if vars.show_spindle_speed.get():
+ posstrs.append(format % ("Spn", s.spindle_speed))
else:
# N.B. no conversion here because joint positions are unitless
posstrs = [" %s:% 9.4f" % i for i in
@@ -3008,6 +3009,9 @@ class TclCommands(nf.TclCommands):
def toggle_show_distance_to_go(*event):
ap.putpref("show_distance_to_go", vars.show_distance_to_go.get())
o.tkRedraw()
+ def toggle_show_spindle_speed(*event):
+ ap.putpref("show_spindle_speed", vars.show_spindle_speed.get())
+ o.tkRedraw()
def toggle_dro_large_font(*event):
ap.putpref("dro_large_font", vars.dro_large_font.get())
@@ -3306,6 +3310,7 @@ vars = nf.Variables(root_window,
("show_machine_limits", IntVar),
("show_machine_speed", IntVar),
("show_distance_to_go", IntVar),
+ ("show_spindle_speed", IntVar),
("dro_large_font", IntVar),
("show_rapids", IntVar),
("feedrate", IntVar),
@@ -3344,6 +3349,7 @@ vars.show_extents.set(ap.getpref("show_e
vars.show_machine_limits.set(ap.getpref("show_machine_limits", True))
vars.show_machine_speed.set(ap.getpref("show_machine_speed", True))
vars.show_distance_to_go.set(ap.getpref("show_distance_to_go", False))
+vars.show_spindle_speed.set(ap.getpref("show_spindle_speed", False))
vars.dro_large_font.set(ap.getpref("dro_large_font", False))
vars.block_delete.set(ap.getpref("block_delete", True))
vars.optional_stop.set(ap.getpref("optional_stop", True))
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
