jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gcode -> G-code also in src

Browse source 
Most prominently, AXIS used "gcode" in the File menu.
This commit is contained in:
Steffen Moeller 2022-08-27 21:12:33 +02:00
parent c3bd4206ca
commit 2272bfd60a
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
share/axis/tcl/axis.tcl
View file

@ -73,7 +73,7 @@ setup_menu_accel .menu.file end [_ "_Reload"]
.menu.file add command \ .menu.file add command \
-accelerator [_ "Ctrl-S"] \ -accelerator [_ "Ctrl-S"] \
-command save_gcode -command save_gcode
setup_menu_accel .menu.file end [_ "_Save gcode as..."] setup_menu_accel .menu.file end [_ "_Save G-code as..."]
.menu.file add command \ .menu.file add command \
-command gcode_properties -command gcode_properties
@ -384,7 +384,7 @@ setup_menu_accel .menu.view end [_ "_Clear live plot"]
-variable show_pyvcppanel \ -variable show_pyvcppanel \
-accelerator [_ "Ctrl-E"] \ -accelerator [_ "Ctrl-E"] \
-command toggle_show_pyvcppanel -command toggle_show_pyvcppanel
setup_menu_accel .menu.view end [_ "Show pyVCP pan_el"] setup_menu_accel .menu.view end [_ "Show PyVCP pan_el"]
.menu.view add separator .menu.view add separator

2
src/emc/motion/mot_priv.h
View file

@ -191,7 +191,7 @@ typedef struct {
hal_bit_t *eoffset_active; /* ext offsets active */ hal_bit_t *eoffset_active; /* ext offsets active */
hal_bit_t *eoffset_limited; /* ext offsets exceed limit */ hal_bit_t *eoffset_limited; /* ext offsets exceed limit */
hal_float_t *feed_upm; /* feed gcode units per minute*/ hal_float_t *feed_upm; /* feed G-code units per minute*/
hal_float_t *feed_inches_per_minute; /* feed inches per minute*/ hal_float_t *feed_inches_per_minute; /* feed inches per minute*/
hal_float_t *feed_inches_per_second; /* feed inches per second*/ hal_float_t *feed_inches_per_second; /* feed inches per second*/
hal_float_t *feed_mm_per_minute; /* feed mm per minute*/ hal_float_t *feed_mm_per_minute; /* feed mm per minute*/

2
src/emc/usr_intf/axis/scripts/axis.py
View file

@ -2035,7 +2035,7 @@ class TclCommands(nf.TclCommands):
size = os.stat(loaded_file).st_size size = os.stat(loaded_file).st_size
lines = int(widgets.text.index("end").split(".")[0])-2 lines = int(widgets.text.index("end").split(".")[0])-2
props['size'] = _("%(size)s bytes\n%(lines)s gcode lines") % {'size': size, 'lines': lines} props['size'] = _("%(size)s bytes\n%(lines)s G-code lines") % {'size': size, 'lines': lines}
if vars.metric.get(): if vars.metric.get():
conv = 1 conv = 1

4
src/emc/usr_intf/axis/scripts/image-to-gcode.py
View file

@ -511,8 +511,8 @@ def ui(im, nim, im_name):
app.tk.call("source", os.path.join(BASE, "share", "axis", "tcl", "combobox.tcl")) app.tk.call("source", os.path.join(BASE, "share", "axis", "tcl", "combobox.tcl"))
name = os.path.basename(im_name) name = os.path.basename(im_name)
app.wm_title(_("%s: Image to gcode") % name) app.wm_title(_("%s: Image to G-code") % name)
app.wm_iconname(_("Image to gcode")) app.wm_iconname(_("Image to G-code"))
w, h = im.size w, h = im.size
r1 = w / 300. r1 = w / 300.
r2 = h / 300. r2 = h / 300.

2
src/emc/usr_intf/gmoccapy/gmoccapy.py
View file

@ -5211,7 +5211,7 @@ class gmoccapy(object):
self.widgets.tbtn_setup.set_sensitive(False) self.widgets.tbtn_setup.set_sensitive(False)
def on_gcode_view_changed(self, widget, state): def on_gcode_view_changed(self, widget, state):
print("gcode view changed (modified: {})".format(state)) print("G-code view changed (modified: {})".format(state))
self.file_changed = state self.file_changed = state
# Search and replace handling in edit mode # Search and replace handling in edit mode