Commit graph

41 commits

Author SHA1 Message Date
Dewey Garrett
f5deb99314 pyngcgui.py: handle absent [DISPLAY]PROGRAM_PREFIX 2022-10-16 17:52:38 -07:00
Steffen Moeller
2dc8a0d348 src: s/ini/INI/
s/ini/INI/ - smallish correction

Update lib/python/gladevcp/hal_gremlin.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/gremlin_view.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/qtvcp/widgets/adjustment_bar.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update src/hal/user_comps/vfs11_vfd/vfs11_vfd.c

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/qtvcp/widgets/adjustment_bar.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

More 'ini' -> 'INI' in src

ini -> INI to sync tests

Update lib/python/gremlin_view.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update lib/python/qtvcp/widgets/offset_tool_button.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

s/modbus/Modbus/

Update lib/python/qtvcp/widgets/offset_tool_button.py

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update scripts/linuxcnc.in

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update src/emc/rs274ngc/interp_namedparams.cc

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

Update src/emc/usr_intf/emcsh.cc

Co-authored-by: Jérémie Tarot <silopolis@gmail.com>

docs: inifile -> INI file, etc
2022-10-11 19:04:38 +02:00
luz paz
09a439ab21 lib/python: fix various typos
Found via `codespell -q 3 -S *.po,*.pot,*.ts,./.git/logs,./share,./docs/man/es,./configs/attic,*_fr.*,*_es.*,README_es -L ans,ba,bulle,componentes,doubleclick,dout,dum,fo,halp,ihs,inout,parm,parms,ro,ser,te,ue,wille,wonte`
2022-07-27 00:20:58 -04:00
Dewey Garrett
c25f67b9a5 pyngcgui.py Gtk.FileChooserDialog gtk3 update 2021-09-05 19:50:02 -07:00
0c8a0058bf use python3 in all #!python lines 2021-09-02 18:32:58 -05:00
Dewey Garrett
ecd2e54923 pyngcgui gtk3 updates
nonworking items marked 'wip: gtk3 notworking'

wip: numerous messages to stderr from gladevcp app:
(gladevcp:*): Gtk-CRITICAL ...
(gladevcp:*): Gtk-WARNING  ...
2021-08-05 18:25:16 -07:00
Rene Hopf
e0c3d05aa8 remove various python2 workarounds 2021-08-01 12:36:41 +02:00
end
3bbb2f52fe fix xembed czechnology 2021-05-23 18:47:35 +02:00
Rene Hopf
28b27e65e3 Merge branch 'master' into master-gtk3 2021-05-23 02:19:18 +02:00
Rene Hopf
f1bed86b5c change masks to gtk3 syntax, fix icon warnings 2021-05-23 01:10:30 +02:00
Rene Hopf
7d50144e2c port gladevcp xembed to gtk3 2021-05-23 00:56:44 +02:00
Rene Hopf
dd95e08979 gtk3 wip 2021-05-23 00:51:14 +02:00
luz paz
ea08a53edd docs: fix source comment and doc typos in lib/python
Found via `codespell v2.0.dev`  
```
codespell -q 3  -L ans,doubleclick,halp,parms
```
2021-01-04 09:53:06 -05:00
Rene Hopf
f13249d1c2 pyngcgui: python3 compat 2020-05-13 19:56:21 +02:00
Dewey Garrett
20326af2f7 pyngcgui.py exceptions is builtin for python3
tests: buster py2, wheezy py2
       buster py3--NA, gtk
2020-05-06 10:31:50 -07:00
Damian Wrobel
94a6261729 Fix SyntaxWarning: "is" with a literal - pyngcgui.py pull #832
Fixes the following warning when compiling for python3.8:

 linuxcnc/lib/python/pyngcgui.py:1424: SyntaxWarning: "is" with a literal. Did you mean "=="?
   if comment is '':

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2020-05-06 10:31:41 -07:00
Damian Wrobel
ef9a3a4b63 Fix invalid syntax for python3 pull #828
Fixes:
$ python3 -m py_compile pyngcgui.py
  File "pyngcgui.py", line 96
    except ImportError,msg:
                      ^
SyntaxError: invalid syntax

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2020-05-06 10:31:29 -07:00
Rene Hopf
ac66fe3eb0 python3 compatibility in lib/python 2020-04-26 22:56:52 +02:00
Sebastian Kuzminsky
304ace43d3 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	docs/man/man1/halstreamer.1
	lib/python/gladevcp/combi_dro.py
	src/emc/motion/command.c
	src/emc/task/emccanon.cc
	src/emc/usr_intf/emcrsh.cc
	src/emc/usr_intf/gmoccapy/getiniinfo.py
	src/hal/components/biquad.comp
	src/hal/components/orient.comp
	src/hal/components/streamer.c
2018-01-22 10:32:44 -07:00
Sebastian Kuzminsky
3241f6dbf1 fix specifed/specified typos all over 2018-01-21 14:49:14 -07:00
Lubomir Rintel
a63ec765cb all: update FSF address in GPL 2.0 notices
If you write to 59 Temple Place you're unlikely to get a response.
Let's realign the address with a more up-to-date one from [1].

  [1] https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

This is purely a cosmetic change, doesn't affect the meaning of the
license. Done to make rpmlint happy.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
2017-09-15 13:06:22 +02:00
Jeff Epler
edfcb03f71 Merge remote-tracking branch 'origin/2.7' 2016-06-17 10:47:50 -05:00
Dewey Garrett
48ea609746 pyngcgui.py: chk for gcmc if not in ini on 1st use
Check for gcmc executable was made only if 1 or more gcmc files specified
by ini items like [DISPLAY]NGCGUI_SUBFILE=cpocket.gcmc but was not
checked on use if there were no gcmc ini items

Thanks to forum user phillc54 for the bug report

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
2016-06-17 07:52:06 -07:00
Chris Morley
2957cc5ad0 Merge branch '2.7' 2016-03-11 20:58:17 -08:00
Dewey Garrett
6a5a64f30c pyngcgui.py remove --help mention of --height
as it was never supported in a release

also: fix a typo and the grammar for possessive "its"

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
2016-02-19 12:07:24 -07:00
Dewey Garrett
cc48cacced pyngcgui remove unused variable
Signed-off-by: Dewey Garrett <dgarrett@panix.com>
2015-12-18 06:47:28 -07:00
Dewey Garrett
982eda8167 ngcgui: new variable for ct of remaining features
global: #<_remaining_features:> indicates the number of features
remaining after the current feature.  A value of zero indicates that
the current feature is the last feature.

A user subroutine (or preamble or postamble) can test
value to display count of remaining features and/or to test
if the current feature is the last feature in a sequence.

Also: include debug prints in some examples

Credit to RickG for suggestion on the LinuxCNC forum

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
2015-12-18 06:34:40 -07:00
Dewey Garrett
faf9e113c3 pyngcgui.py, gremlin_view.py improve ini file find
using ps -C linuxcncsvr --noheader -o args

both pyngcgui and gremlin view can be started independently
of the process running linuxcnc so they ask the system for
the inifile

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
2015-10-06 14:13:43 -07:00
Dewey Garrett
efe3ac1545 pyngcgui.py, gremlin_view.py regression
The options of pgrep (package procps) changed between:
  lucid:  procps 1:3.2.8-1ubunt
  jessie: procps 2:3.3.9-9

pgrep -lf worked on lucid but not on jessie
pgrep -a  worked on jessie but not on lucid

so try the form ps ax|grep ...

ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784143

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
2015-10-06 13:10:59 -07:00
Dewey Garrett
f86290abf6 ngcgui-gcmc: gcmc related bug fixes
limit msg length for popups when errant input to gcmc compiler
typo on strip()
for detecting options comment, split on // not /

minor: ngcgui.txt update
2014-03-04 09:22:09 -07:00
Dewey Garrett
b64d749707 ngcgui-gcmc programmable involute-gear example
new: involute-gear.gcmc adapted for ngcgui from B. Stultien's example
new: ensure_mode.gcmd include file to resolve potential conflict
     with preamble and gcmc code (gcmc wins)

with updates:
1) popup msg error if entry box for gcmc not a number
2) allow comment after tag when tagging a  gcmc option
3) handle gcmc_include_path for new custom tab additions
4) incorporate ensure_mode in .gcmc examples
5) update ngcgui.txt for ensure_mode
2014-03-03 11:18:43 -07:00
Dewey Garrett
1cbe86cf18 ngcgui-gcmc: always pass floating point
avoid subtle problems with gcmc using integers
2014-03-03 11:18:34 -07:00
Dewey Garrett
d13839780e pyngcgui: allow tabs scroll for any mode 2014-02-23 21:33:37 -07:00
Dewey Garrett
183efb3e9d ngcgui: support gcmc include path
with:
[DISPLAY]GCMC_INCLUDE_PATH = dir1:dir2:...
2014-02-23 17:40:33 -07:00
Dewey Garrett
fa704ced55 ngcgui.txt: update documentation
update for configs tree restructure
update for pyngcgui
update for gcmc
show  stanalone --help messages
2014-02-19 21:21:56 -07:00
Dewey Garrett
aa05c938ae ngcgui: support tilde expansion in PROGRAM_PREFIX 2014-02-15 21:43:32 -07:00
Dewey Garrett
56fdc0ee40 ngcgui: normalize filenames for tilde expansion
when using Ctrl-u etc
2014-02-15 09:45:23 -07:00
Dewey Garrett
7bdd488c0d ngcgui,pyngcgui: support gcmc files
(squashed commits from test branch: dgarr/ngcgui-gcmc)

Add support for [py]ngcgui to read .gcmc input files for the gcmc
compiler and make tab pages with entry boxes for tagged variables.
A tabpage 'info' message and compiler options can be specified
by tags too.

Ref:  gcmc (G-Code Meta Compiler) http://www.vagrearg.org/content/gcmc
Note: gcmc version 1.4.3 or later must be installed separately and
      available in the user PATH

--------------------------------------------------------------------
Tag formats (simplified):

  Variable:
  //ngcgui: vname [= value , [comment text]]

  Info message:
  //ngcgui: info: text message

  Option:
  //ngcgui: -optioname [optionvalue]
--------------------------------------------------------------------
When a feature for a gcmc tab page is created, the variables
and options are passed to the compiler and a gcode subroutine
file is produced and placed at the head of the linuxcnc subroutine
search path.  These files are purged at each ngcgui restart
that uses .gcmc files.
--------------------------------------------------------------------

Example ini files for axis, touchy, and gscreen:
   configs/sim/axis/ngcgui/ngcgui_gcmc.ini
   configs/sim/axis/ngcgui/pyngcgui_gcmc.ini
   configs/sim/touchy/ngcgui/pyngcgui_touchy_gcmc.ini
   configs/sim/gscreen/ngcgui/pyngcgui_gscreen_gcmc.ini

Example gcmc files:
   nc_files/gcmc_lib/drill.gcmc
   nc_files/gcmc_lib/square.gcmc
   nc_files/gcmc_lib/star.gcmc    (Bertho Stultiens)
   nc_files/gcmc_lib/wheels.gcmc  (Alan Battersby)
2014-02-06 19:24:03 -07:00
Dewey Garrett
fac208ae42 pyngcgui: show value not default value
in text prepended to generated ngc file
2014-01-02 05:54:34 -07:00
Dewey Garrett
5746b73f98 lib/python: take advantage of linuxcnc.SHARE
simplify specifying build items like:
   linuxcnc.SHARE
   linuxcnc.PREFIX
for easier compatibility of RIP builds and deb installs
2013-12-09 09:42:17 -07:00
Dewey Garrett
bc1bc54174 make: eliminate unneeded copies
use make to create simple standalone executable files for
   ngcgui,pyngcgui,gremlin_view,tooledit
instead of copying files from source tree

to add this patch, you may need to rm existing files:
  lib/python/gremlin_view.py
  lib/python/pyngcgui.py
  share/linuxcnc/gremlin_view.ui
2013-12-01 11:15:45 -07:00
Renamed from src/emc/usr_intf/pyngcgui.py (Browse further)