Commit graph

49 commits

Author SHA1 Message Date
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
Hans Unzner
69cf700baf combi_dro: fixed toggling of systems (Rel->DTG->Abs)
Fixes following:
- Didn't show the reference coordinate system on start-up and on change
- Labels/colors/values didn't match when switching the mode
  State before was:
  labels: Rel   -> DTG   -> G54    -> Abs   -> DTG   -> G54
  values: <G54> -> <Abs> -> <DTG>  -> <G54> -> <Abs> -> <DTG>
  colors: black -> blue  -> yellow -> black -> blue  -> yellow
2022-06-15 20:38:12 +02:00
Hans Unzner
f29c9167dc gmoccapy: fixed DRO unit switching (G20/G21) 2022-04-29 18:19:52 +02:00
Hans Unzner
d3a7d2f07d combi_dro: fixed toggle_readout (no white DRO in lathe mode) 2022-04-29 14:32:13 +02:00
luz paz
d7ea470096 Fix various typos
Found via `codespell -q 3 -S *.po,*.ts,./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,wont`
2022-02-16 11:17:29 -05:00
Hans Unzner
2a488fa7f0 combi-dro: fix for get_position() (#1398)
Appears in gmoccapy/lathe_C config
2022-01-22 18:11:07 +01:00
Hans Unzner
2e55e3385b combi-dro: rename function to avoid confusion with bool variable 2022-01-16 18:32:34 +01:00
Hans Unzner
5e24ad85c9 Revert "Added more typos" in combi_dro.py
This reverts changes in combi_dro.py of commit 9d5d892847.
2022-01-16 18:30:24 +01:00
Hans Unzner
66c4d2a6b2 removed duplicated line 2022-01-01 15:30:44 +01:00
luz paz
7009d49ece Fix typos in misc. source comments and docs
Found via `codespell -q 3 -S *.po,*.ts,./share,./docs/man/es,./configs/attic,*_fr.*,*_es.* -L ans,ba,bulle,componentes,doubleclick,dout,dum,fo,halp,ihs,inout,parm,parms,ser,te,ue,wille,wont`
2021-11-16 08:04:22 -05:00
luz paz
9d5d892847 Added more typos 2021-11-10 06:32:09 -05:00
0c8a0058bf use python3 in all #!python lines 2021-09-02 18:32:58 -05:00
Rene Hopf
32bcd9db61 Merge branch 'master' into master-gtk3 2021-07-07 09:19:06 +02:00
luz paz
e716f28359 Fix source comment typos
Found via `codespell`
2021-06-17 20:14:29 -04:00
Rene Hopf
28b27e65e3 Merge branch 'master' into master-gtk3 2021-05-23 02:19:18 +02:00
Norbert Schechner
f1abd16921 CombiDRO - deleted unused lines
Signed-off-by: Norbert Schechner <nieson@web.de>
2021-05-23 01:28:19 +02:00
Norbert Schechner
d79a3db4c9 CombiDRo now working with RGBA colors and CSS Style
finally got it done, some times clicking fast, will result in not all
parts of the DRO are colored as they should


Signed-off-by: Norbert Schechner <nieson@web.de>
2021-05-23 01:27:56 +02:00
Norbert Schechner
1118207b2c combi_dro now the DRO is right justified
Missing the ability to change font sizes and colors at this state

Signed-off-by: Norbert Schechner <nieson@web.de>
2021-05-23 01:25:28 +02:00
Norbert Schechner
0ef5ed0c5a gmoccapy bug in assigning axis letter
Signed-off-by: Norbert Schechner <nieson@web.de>
2021-05-23 01:24:36 +02:00
Norbert Schechner
1603099a3f combi_dro - use CSS Style
changed the code to use the new CSS style. and cleaned up,
so that the code is not duplicated.

ToDo: Find out how to modify existing style classes,
      as that is needed to modify the colors
      from an external code

Signed-off-by: Norbert Schechner <nieson@web.de>
2021-05-23 01:23:09 +02:00
Norbert Schechner
e13ba72ec0 combi dro funktioniert nun fein 2021-05-23 01:22:37 +02:00
Rene Hopf
1132406395 fix combi dro 2021-05-23 01:11:21 +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
5b72e3bf22 combi_dro.py: python3 compatibility 2020-04-26 23:02:20 +02:00
Norbert Schechner
bed140fb86 gladevcp - CombiDRO - new signal and other axis joint assignment
- The axis joint assignment did not work correct, if the axis and
  joint count was not according to XYZABCUVW to 012345678, leading
  to strange reactions on a lathe with XZ being joint 0 and 1. It was
  even worse on a XYCW lathe config having joint 0,1,2,3

- added a new signal, clicking on the axisletter will emit a new signal
  ('axis-clicked') clicking on the numbers will still toggle the readout

Signed-off-by: Norbert Schechner <nieson@web.de>
2019-08-04 01:22:59 +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
0e7dc013fd fix recieved/received typos all over 2018-01-21 14:49:13 -07:00
Sebastian Kuzminsky
2506277876 fix usefull/useful typos all over 2018-01-21 14:49:12 -07:00
Norbert Schechner
5dd602a8ea GladeVCP - CombiDRO - If it can not poll just pass do
not print that information every cycle

Signed-off-by: Norbert Schechner <nieson@web.de>
2017-10-29 11:02:49 +01:00
Norbert Schechner
803c8d736f GladeVCP - CombiDRO - raise SystemExit Error does not allow to load file with Glade
In the code a SystemExit Error was thrown if linuxcnc status could not
be polled any more, this had the problem, that glade files with CombiDRO
widgets could not be loaded with glade.

Signed-off-by: Norbert Schechner <nieson@web.de>
2017-07-10 19:55:44 +02:00
Norbert Schechner
9a08778fec GladeVCP - ComiDRO - raise SystemExit in code stops Glade to load file
There was a try exept throwing an SystemExit Error, So trying to load
a file containing a CombiDRO widget could not be loaded any more
with Glade.


Signed-off-by: Norbert Schechner <nieson@web.de>
2017-07-10 19:52:13 +02:00
Norbert Schechner
fcf042c4e1 GladeVCP - CombiDRO removed unused import statement
Signed-off-by: Norbert Schechner <nieson@web.de>
2017-03-05 19:05:45 +01:00
Norbert Schechner
ff20647f7c GladeVCP - revert the wrong changes to CombiDRO witch destroyed some other glade applications
Signed-off-by: Norbert Schechner <nieson@web.de>
2017-03-05 19:04:25 +01:00
Norbert Schechner
4af2a63ed4 GladeVCP - CombiDRO - no more relation to get_ini_info,
as that relation destroyed several other appilications using Glade Widgets


Signed-off-by: Norbert Schechner <nieson@web.de>
2017-03-05 17:56:24 +01:00
Norbert Schechner
12b29dcec5 GladeVCP - CombiDRO - added support for Joints / axis differences
Signed-off-by: Norbert Schechner <nieson@web.de>
2017-02-19 13:58:03 +01:00
Norbert Schechner
69d272e080 gladeVCP - CombiDRO - make it compatible for both 2.7 and master
gmoccapy - getiniinfo - added get_joints_amount for compatibility 2.7 and master


Signed-off-by: Norbert Schechner <nieson@web.de>
2017-02-19 13:01:54 +01:00
Norbert Schechner
1f5243892d gmoccapy_2_2_1 - status.poll in a try except
ver. 2.2.1
- if linuxcnc is restarted without shutting down gmoccapy, it was not possible
  to close gmoccapy (except from comandline with killall -9 gmoccapy
  I added a check to status.poll and now a raise SystemExit will be called.
  as this also applies to CombiDRO a added that there too.
  I added gmoccapy to the linuxcnc script to be killed on restart

Signed-off-by: Norbert Schechner <nieson@web.de>
2017-01-05 08:35:11 +01:00
Norbert Schechner
4595ae5b6e Merge branch '2.7'
Conflicts:
	docs/src/config/ini-config.txt
	docs/src/getting-started/updating-linuxcnc.txt
	lib/python/gladevcp/combi_dro.py
	src/emc/usr_intf/gmoccapy/getiniinfo.py
	src/emc/usr_intf/gmoccapy/gmoccapy.py
	src/emc/usr_intf/gmoccapy/release_notes.txt

gmoccapy_2_1_6 - merged the changes I made to 1.5.6.5 to 1.5.6.8

Signed-off-by: Norbert Schechner <nieson@web.de>
2016-10-30 13:38:03 +01:00
Norbert Schechner
c0af9a9a98 GladeVCP - CombiDRO - new property cycle time
with 6 axis machine and not very fast PC the CombiDRO slowed down the main
application too much. Now we can set the poll time for each DRO separately.
At the same time i reduced the hard coded cycle time form 100 to 150.

Signed-off-by: Norbert Schechner <nieson@web.de>
2016-10-30 11:57:11 +01:00
Norbert Schechner
75a72f01a2 gmoccapy_JA_master_2_1_0 - ready to be merged with master ;-)
ver. 2.1.0
- reworked Combi_DRO to fit the needs of JA requierements
- some configs must be adapted to the new hal pin names, as they are
  put together in groups, so all stuff with jog is in that group
- Hiding the jog button in world mode is possible with a command line argument
- reorderd some code to be more understandable
- deleted a lot of debug prints
- still having problems with matchbox-keyboard, it is found, but not shown
  on every config, need more testing.

Signed-off-by: Norbert Schechner <nieson@web.de>
2016-08-01 20:46:49 +02:00
Norbert Schechner
81f8b7e87f gmoccapy_JA_master - corrected some bugs after the merge of touchscreen slider
ver. 2.0.6
- corrected some small bugs, avoiding gremlin to switch
  to fullsize preview,
- got back some missing handlers in the glade file


Signed-off-by: Norbert Schechner <nieson@web.de>
2016-07-02 22:39:05 +02:00
Dewey Garrett
9e7138cd8d touchy.py,gscreen.py,gladevcp AXIS_0-->AXIS_X JA
these files used [AXIS_0]UNITS to determine units
when there is no ini file item for[TRAJ]LINEAR_UNITS

for ja, AXIS_0 becomes AXIS_X typically but note that
there are no code references to [AXIS_n]UNITS otherwise

Signed-off-by: Dewey Garrett <dgarrett@panix.com>
2016-06-26 19:08:28 -06:00
Norbert Schechner
9cd3ebaf7a gmoccapy_1_5_6 - deleted alarm entry and added new settings for combi_dro
ver 1.5.6
- deleted the alarm_entry log page, as it has not been used by users
  to report bugs, and therefor it was designed.
- changing DRO mode by click can be disabled on settings page
- corercted and added information to the docs
- added a new property to combi_dro to disable readout toggling

Signed-off-by: Norbert Schechner <nieson@web.de>
2016-01-17 17:30:58 +01:00
Norbert Schechner
28436b5ea3 combi_dro - bug in set forground color attribut
If a user did set as metric or imperial template a value
with only one digit as "%12.1f" the last digit was not
colored correctly, because the string selection was to short.

Fixed!


Signed-off-by: Norbert Schechner <nieson@web.de>
2015-01-02 21:37:03 +01:00
Norbert Schechner
a52c9d96cd gmoccapy_1_0_2 - solved active gcode bug
ver. 1.0.2
- solved a bug in getting active gcodes, because I took also the first
  element of linuxcnc.stat.gcodes, but that seems not to be a gcode, but
  some kind of control number or something like that, so it causes wrong
  code and changed gmoccapy behavior in an erroneous way
- In this bug finding I also needed to change the gladevcp widget combiDRO
  to get the correct results
2014-03-18 17:19:44 +01:00
Norbert Schechner
ac75df9d60 Combi_DRO - shows warnings invalid font-size
Fixed a font_size handling problem, resulting in values not allowed by
the font_size property, fixed that
2013-12-04 18:58:06 +01:00
Chris Morley
78d09b3866 gladevcp -fix some error messages with combi_dro
fix complaints about an extra event box and floats instead of integers.
2013-12-02 13:33:32 -08:00
Norbert Schechner
7bc64b15dc gmoccapy_0_9_9 - new DRO with new features
ver. 0.9.9
- introduced a new DRO, showing all three positions (Abs, Rel, DTG) at ones
  user can toggle the DRO by clicking on them
- The new DRO also indicates the actual coordinate system
- The new DRO will change its units according to the active gcode (G20 / G21)
- There are still the three buttons, but they are hidden by default,
  this can be changed on the settings page, but when the buttons are vissible,
  the user looses the auto units feature of the DRO
  Hope too get the permission from the users to delete that button as soon as possible
- made the documentation for IconViewFileSelection
- made the documentation for Combi_DRO
- This change saved some lines of code in gmoccapy.py and made the code
  a lot easier to understand
- updated German translation
- updated Spanish translation
2013-11-21 20:23:57 +01:00