jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29426 commits 89 branches 0 tags 385 MiB
Commit graph

2736 commits

Author SHA1 Message Date
Greg Carl
c332ff3b9d glcanon: allow small origin to be hidden 2022-06-01 10:20:10 -04:00
Phillip Carter
fcddb27d4e qtplasmac: fix typo from v1.223.197 2022-06-01 09:44:18 +10:00
Greg Carl
6ae521c27c qtplasmac: recreate gui images in svg format 
allow conversational images to change color with gui
 2022-05-31 08:42:27 -04:00
CMorley
59d3d3be30 qtvcp -qt_vismach: add fanuc_200f vismach model 
This was based from Youtube character Excessive Overkill 's
github code.
 2022-05-30 21:04:29 -07:00
CMorley
e75d3f230a qtvcp -qt_vismach: add zoom range function, basic rough panning 
panning needs to be scaled to mouse and zoom?, but at least you can pan.
 2022-05-30 21:04:29 -07:00
Phillip Carter
a1d6956f58 qtplasmac: conversational changes: 
restore entries on settings close
fix widget placement in lines/arcs
 2022-05-31 11:46:04 +10:00
Phillip Carter
54bc57f73e qtplasmac: conversational enhancements and code tidy 2022-05-30 14:57:37 +10:00
CMorley
9998459ce6 qtvcp -simple_widgets: scaled_label update to handle rich text 
You can set text to scale or not.
You can use rich text now too.
added a 'textSample' property to reserve space
 2022-05-29 18:32:06 -07:00
CMorley
7616739502 qtvcp -simple_widgets: fix drawEllipse float-instead-of-int error 
In my test machine pyqt qpainter.drawEllipse would accept a float.
maybe in new versions, that bug was fixed.
Also related to python2/3 I think as the argument was a int and float added together
which is handled differently.
 2022-05-28 11:49:32 -07:00
CMorley
4c56205ad6 qtvcp -qt_pdf: add a sample setip page and a way to load it 2022-05-25 18:54:06 -07:00
Phillip Carter
aa2e0e93d9 qtplasmac: fix soft keyboard display for various dialogs 2022-05-25 15:14:34 +10:00
CMorley
30ab82ab80 gladevcp -file_chooser: fix dialog settings for python3 
There is surely more there but I know these need to be cganged
 2022-05-23 20:00:47 -07:00
CMorley
d7b03181c2 gladevcp -gtk_actionL fix dialog use GTK 
Still had qt gialog code.
 2022-05-23 19:58:09 -07:00
CMorley
41865b8049 gladevcp -hal_mdihistory: use new core library code 2022-05-22 16:42:06 -07:00
CMorley
0ce13d69c5 gladevcp -add core library with Status, Action and Info objects 
hopefully in the long run making it easier to program gscreen/gladevcp
 2022-05-22 16:42:06 -07:00
CMorley
48009e40b3 Revert "qtvcp -fix error message when last_path is not valid" 
This reverts commit 0e502a9ff2.

Merge error from 2.8?
 2022-05-21 19:31:59 -07:00
CMorley
2819287edc qtvcp -qtaction: automatically adjust embed widget size 2022-05-21 18:26:25 -07:00
CMorley
0e502a9ff2 qtvcp -fix error message when last_path is not valid 2022-05-22 01:25:28 +01:00
Phillip Carter
33eb2bc4f4 qtplasmac: fixes for conversational widget consolidation 2022-05-22 10:06:52 +10:00
Greg Carl
b21865b66d qtvcp: add mouse wheel zoom inversion, mouse control modes, update docs 2022-05-20 21:05:21 -04:00
Phillip Carter
ebd34a906c qtplasmac: conversational widget consolidation 2022-05-21 09:53:47 +10:00
Greg Carl
3d6650581b qtvcp: set dialog_widget default extension to .ngc if none is specified 
Since qt_action will apply an extension of '.ngc' if none is specified, 
this will prevent overwriting a file where no extension was specified if 
the file name with an extension of .ngc already exists.

Example:  test.ngc exists. You enter "test" in the save dialog.  
Previously, qt_action would would have been overwritten test.ngc with 
test.ngc without prompting.
 2022-05-19 15:39:05 -04:00
CMorley
4502222c73 qtvcp -state_led: add hard limits LED states 2022-05-18 21:44:08 -07:00
Phillip Carter
f0ea21400f qtplasmac: fix missing run from line variable 2022-05-18 11:19:46 +10:00
Greg Carl
e5757b2a9c qtvcp: allow external clearing of preview window highlighting 2022-05-17 20:16:58 -04:00
CMorley
e5a4153762 qtvcp -try to improve overlay widget. 
I'll have to check other systems to see if it is universally working.
 2022-05-16 22:23:22 -07:00
mwork
fe1f3b86fa Update qt_vismach.py 2022-05-17 08:40:04 +07:00
CMorley
087aaf7405 qtvcp -gcode editors: gcode lexer button should honour set colors 
python button changes the paper color but maybe thats alright.
 2022-05-15 17:57:34 -07:00
CMorley
d7c76e53c8 qtvcp -action_tool_button: set the menu later incase it's not needed 2022-05-15 17:57:34 -07:00
Phillip Carter
94b1077ea9 qtplasmac: make the run from line module gui agnostic 2022-05-15 10:33:49 +10:00
CMorley
6b032b74ae qtvcp -screenoptions: use action function to add embedded tab 2022-05-13 17:48:40 -07:00
CMorley
b43f4b806b qtvcp -fix filemanager error when last loaded is not found 
tmparay file would give annoying error messages
 2022-05-13 17:46:57 -07:00
CMorley
9e3f35faa2 qtvcp -qt_action: add a function to add a tab to tab or stacked widget 
just for convenience
 2022-05-13 17:42:00 -07:00
CMorley
98531cef14 qtvcp -qt_vismach: remove contents margins -use the full window 2022-05-13 10:32:08 -07:00
CMorley
c8a39c3288 qtvcp -initial commit of embedding Qtvcp panels 
-makegui/makepins looks and instantiates any Qtvcp panels
-have screenoption load Qtvcp embedable panels
 2022-05-13 10:30:26 -07:00
CMorley
081db3ba75 qtvcp -dialog_widgets: fix mutiple button signal connections 
button signals were connected everytime the message box was shown.
This would cause error messages about no callbacks or status messages.
This was because the status message was deleted on the fist button signal
callback.
 2022-05-12 21:58:39 -07:00
CMorley
c35ab92407 qtvcp -toolbar library: add step function 2022-05-11 18:40:25 -07:00
Phillip Carter
49eda93de3 qtplasmac: oops, I missed a brace. 2022-05-10 10:11:07 +10:00
Phillip Carter
71937a7137 qtplasmac: fix error messages for run from line 2022-05-10 10:02:01 +10:00
CMorley
5980d59eb9 qtvcp :PDFViwer: don't crash if poppler-qt5 module is missing 2022-05-05 18:38:08 -07:00
CMorley
12ce437917 qtvcp -qt_pgf library: update pdfviewer 
name change too
 2022-05-03 19:13:49 -07:00
Greg Carl
62a7a9d426 qtplasmac: move conversational prefs 2022-05-03 19:37:00 -04:00
Hans
1e73a3f22e
Merge pull request #1723 from hansu/gmoccapy-dro-1722 
Fixes some Gmoccapy DRO issues
 2022-04-29 19:45:48 +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
CMorley
864550224d qtvcp -camview: improve error messages when asking for wrong port 
It will search for avaliable ports and list them
 2022-04-29 01:06:14 -07:00
CMorley
6fb4cabbfd qtvcp -simplewidgets: give better error message if python command fails 
Actionbuttons use this for direct python commands
 2022-04-27 20:50:41 -07:00
CMorley
485c71f948 qtvcp camview: add ability to save image to file 2022-04-27 20:49:51 -07:00
CMorley
2e7a58b028 qtvcp -user messages: give dialogs a request name; fix multiple messages 
pther wise the dialog instances respind to all requests
 2022-04-27 19:45:11 -07:00
Hans Unzner
c016e5e13e gladevcp: removed PangoCairo warning 2022-04-25 09:36:29 +02:00
Hans
45b96aea4d
Merge pull request #1548 from PeterMue/feature/gmoccapy-modern-icons 
Added modern icon themes for Gmoccapy
 2022-04-25 09:07:44 +02:00
Dewey Garrett
e48acadb31 tooldb.py close stdout if BrokenPipeError 
avoids message:
"Exception ignored in: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='utf-8'>
BrokenPipeError: [Errno 32] Broken pipe"
 2022-04-20 18:02:31 -07:00
Greg Carl
c1ca6c2b42 qtplasmac: conversational block enhance offset handling 2022-04-17 10:13:52 -04:00
Peter Müller
3b34639916 Change old gtk-* icon names to new 
Following the suggested new names from https://docs.gtk.org/gtk3/?q=STOCK_
 2022-04-16 22:36:02 +02:00
Greg Carl
fdf9680b74 qtplasmac: updater enhancements 2022-04-14 18:03:17 -04:00
CMorley
4903b03ebb qtvcp -add a PDF rendering library file 
More work to be done yet
 2022-04-09 18:06:11 -07:00
CMorley
12ed6e3b45 qtvcp -qt_ngcgui: add function to move the frames to other widgets 
in some screens it's nicer to move the info tab to another location to
give more room.
 2022-04-08 14:56:47 -07:00
CMorley
59fd1fef96 qtvcp - initial commit of qt ngcgui library 
Jim (Persei) ported Ngcgui for qtvcp - Thanks Jim!
this is the library to support it.
 2022-04-06 22:06:39 -07:00
c-morley
17bb822c55
Merge pull request #1696 from ALatSMT/master 
Update pyvcp_widgets.py
 2022-04-05 00:43:43 -07:00
CMorley
71a8e74f44 qtvcp -status_label: don't follow feed rate status if not specified 
if you unselected everything it would still follow the feedrate override.
 2022-04-05 00:38:05 -07:00
CMorley
91069162ed qtvcp -system/axis tool buttons: disable when interp paused 
can't change these settings until interp is idle
 2022-04-04 21:56:38 -07:00
CMorley
a07f444034 qtvcp -action_button: disable mode buttons when interp running 
can't change mode (man, mdi, auto) when machine is running instructions
so we disable the buttons
 2022-04-04 21:54:43 -07:00
CMorley
3feaf29647 qtvcp -action_button: disable jog button when interp paused 
can't jog when running, even when paused
 2022-04-04 21:42:39 -07:00
CMorley
4f877fb040 qtvcp -disable 'zero offset button' when interp paused. 
You can't zero offsets when pausedm so diasable the buttons
 2022-04-04 21:29:04 -07:00
Greg Carl
ae7715ef65 python3: fix some lingering python2 syntax 2022-04-02 20:33:55 -04:00
ALatSMT
d2d273ad97
Update pyvcp_widgets.py 
convert floating point to int
 2022-04-02 17:37:57 -04:00
CMorley
05edba0dae qtvcp -catch error if xlib not available. 
Add a message to prompt user of problem.
 2022-03-30 22:36:00 -07:00
Hans
36b82992df
Merge pull request #1671 from hansu/fix-hal_lightbutton 
fix hal_lightbutton (#1266)
 2022-03-20 21:16:05 +01:00
Hans Unzner
95e133e9cd fix hal_lightbutton (#1266) 2022-03-20 12:56:15 +01:00
CMorley
825d4a59ed qtvcp -action_button: add a warning tooltip to INI MDI command 
if an action button is to run an INI MDI command, but that command is missing,
make a tooltip for the button to give a clue.
 2022-03-18 16:55:50 -07:00
CMorley
597eee2aca qtvcp -filemanager: set a minimum size for file filter combobox 
In some systems the default minimum is too small.
 2022-03-17 22:03:26 -07:00
Phillip Carter
838dfb2f67 qtplasmac: conversational block allow negative offsets 2022-03-15 17:29:48 +11:00
Phillip Carter
3db5d97a57 qtplasmac: rework run from line subroutine detection 2022-03-14 11:30:21 +11:00
Phillip Carter
eca100747f qtplasmac: rework run from line start of cut 2022-03-14 11:29:51 +11:00
Phillip Carter
d925c6634b qtplasmac: rework run from line material handling 2022-03-14 11:27:27 +11:00
luz paz
ea76d8a722 Follow-up to b016bf7722 (missing in previous commit) 2022-03-13 17:20:29 -04:00
CMorley
c55caa5227 qtvcp -dialog_widgets: catch a config error - no return mechanism 
dialog can return value; directly, through a return callback, or by
status message.
You must pick one.
 2022-03-12 11:45:43 -08:00
CMorley
b2d0a75ee4 qtvcp -pstar: add qt vismach model path 2022-03-12 11:45:43 -08:00
CMorley
05a9dac768 qtvcp -qt_vismach: add panels for gantry and millturn and other tweaks 2022-03-12 11:45:43 -08:00
Hans
2e3378daa3
Merge pull request #1663 from hansu/gmoccapy-gcode-view 
Gmoccapy: fix some issues with g code editing (e.g. #1176)
 2022-03-12 17:18:14 +01:00
Hans Unzner
50ca4f2872 sourceview: improve text search 2022-03-12 16:01:06 +01:00
Hans Unzner
612b1155df sourceview: fix replace all + improve replace 2022-03-12 16:00:12 +01:00
Hans Unzner
a52b23a178 sourceview: fix crash on text replace 2022-03-12 15:57:52 +01:00
Hans Unzner
6ca016be40 gmoccapy: sensitize save button after 'save as' 2022-03-12 15:57:52 +01:00
Hans Unzner
126de9d0ae gmoccapy: fixed save and save as 
re-added properties for EMC_Action_Save and EMC_Action_SaveAs
which gone lost in d2d7d5d65c
 2022-03-12 15:56:59 +01:00
Hans Unzner
4601d54083 gmoccapy: fix detection of file change 2022-03-12 15:48:54 +01:00
c-morley
29b98cac1a
Merge pull request #1652 from alkabal/patch-5 
Update versa_probe_screen.py
 2022-03-09 20:46:34 -08:00
Phillip Carter
cebd57f652 qtplasmac: fix run from line parameter checking 
remove redundant prefs command and file
 2022-03-09 13:39:54 +11:00
Phillip Carter
4464df5b64 qtplasmac: split prefs file 2022-03-08 12:36:38 +11:00
CMorley
e524d5e6a1 qtvcp -qt_vismach: add a README about converting vismach scripts 2022-03-06 17:43:54 -08:00
CMorley
45cb45b59d qtvcp -qt_vismach:add a converted gantry and mill turn scripts 2022-03-06 17:26:59 -08:00
CMorley
21f2ab973d qtvcp -qt_vismach: add missing math library 2022-03-06 17:25:22 -08:00
CMorley
50e6d5cda5 qtvcp -qt_vismach: update sample sripts - clean up code 2022-03-06 15:56:13 -08:00
CMorley
29bc954f4e qtvcp -qt_vismach: add HalToolCylinder object 
Moved from mill_xyz
 2022-03-06 15:56:13 -08:00
alkabal
dae2408069
Update versa_probe_screen.py 
I'm unsure but i think "import Pangp" is a typo mistake and need to be "import Pango"
 2022-03-06 21:47:29 +01:00
CMorley
f2a5ed44b5 qtvcp -aux_programs: add ability to get error messages from bad loading. 
also now in MDI line you can call say halmeter with arguments.

thank you Greg C ! those plasma guys have good ideas!
 2022-03-06 11:06:28 -08:00
CMorley
beb898daee qtvcp -qt_vismach: update sample simulations to use HUD 
HUD adds a tittle to prove it works.
Also now use qt_vismach's window if invoked directly from python3
it has sliders for zoom and translation.
 2022-03-05 21:17:25 -08:00
CMorley
df40dfeb5e qtvcp -qt_vismach: get the HUD working 
Now me can display text
 2022-03-05 21:16:31 -08:00
c-morley
32b8a41afd
Merge pull request #1639 from hansu/fix-color-in-glade 
gladevcp: fix color in VCP elements
 2022-03-05 19:12:39 -08:00
CMorley
ceb58626cd qtvcp -qt_vismach: remove 'direct=1' argument from HAL movement objects 
We can infer what way to get the pin value from whether the component
is None or not.
None = read HAL pin directly, otherwise read the HAL component's pin
 2022-03-05 12:03:53 -08:00
CMorley
4dc98a6d76 qtvcp -qt_vismach - use absolute imports - allows running directly 2022-03-05 00:45:52 -08:00
andypugh
aaf872747f
Merge pull request #1617 from satiowadahc/cw-statusid 
Emcmodule - Renaming status.id
 2022-03-01 22:30:34 +00:00
Hans Unzner
061ae4f621 gladevcp: fix color in vcp elements (#1596) 2022-03-01 17:28:03 +01:00
Hans Unzner
a218469535 offsetpage widget: Remove offsets from translation 2022-02-26 11:33:50 +01:00
c-morley
1f870d6942
Merge pull request #1591 from hansu/fix-offsetpage-translated-string 
offsetpage-widget: translation of 'black' results in a Gtk-Warning
 2022-02-25 13:52:40 -08:00
c-morley
d01076c984
Merge pull request #1606 from hansu/fix-hal-mdihistory 
fix: translation of hal_mdihistory broke other translations
 2022-02-25 12:07:53 -08:00
CMorley
7762d3a2de qtvcp -actionbutton: fix calling 'print' in a user python command 
action buttons can call user selected python commands.
builtin python functions are restricted - so print() was not available.
print is now allowed and added better error messages.
 2022-02-25 11:59:05 -08:00
Phillip Carter
3ba0951743 qtplasmac: 9x16 gui change parameters tab layout 2022-02-24 14:36:34 +11:00
Phillip Carter
8281d86fc4 qtplasmac: allow shutdown from power button 
change shutdown messages
 2022-02-24 13:49:17 +11:00
Chadly
3ab0c58ece emcmodule - missed a refactor 2022-02-19 11:55:28 -06: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
585996c1fe offsetpage-widget: 'black' must not be translated 
This results in a warning, here for locale DE: Gtk-WARNING **: Don't know color 'Schwarz'
 2022-02-15 21:08:23 +01:00
Hans Unzner
3600414585 fix: translation of hal_mdihistory broke other translations 2022-02-13 18:12:17 +01:00
CMorley
fae919506a qtvcp -dialog_widget: fix general 'external called'dialog typo 
Miss from lasr major code change for tool change dialog.
 2022-02-11 14:06:22 -08:00
c-morley
dfe0260cd1
Merge pull request #1561 from hansu/center-buttonlabels 
gmoccapy: center button labels with property instead of spaces
 2022-02-04 00:11:21 -08:00
Hans Unzner
5cfbea70ae gmoccapy: center labels of some buttons 2022-02-01 16:52:20 +01:00
Hans Unzner
16080cd8a6 gmoccapy: Fix window size by reducing button padding with CSS 2022-01-31 18:22:42 +01:00
Hans Unzner
360d8c67a3 also for gmoccapy with yellow active-backgound 
references:
https://shallowsky.com/blog/programming/styling-gtk3-with-css-python.html
https://docs.gtk.org/gtk3/css-overview.html
https://docs.gtk.org/gtk3/css-properties.html
 2022-01-31 18:15:53 +01:00
Hans Unzner
ec1898b1a4 apply css to all elements 2022-01-31 16:35:57 +01:00
Hans Unzner
7854de2cdb apply css style manually to buttons 2022-01-31 16:29:16 +01:00
Greg Carl
e36ed2e663 qtvcp: fix mdi_line history comparison 
prevent remembering the last entry for a failed attempt
 2022-01-30 20:34:16 -05:00
c-morley
70f52b8fcc
Merge pull request #1547 from hansu/remove-sourceview-warnings 
sourceview: remove Gtk-CRITICAL warnings
 2022-01-29 13:50:21 -08:00
Hans Unzner
02a76f0b73 offsetpage_widget: Fix error on color conversion 2022-01-29 16:15:56 +01:00
Hans Unzner
7b373ce864 sourceview: remove Gtk-CRITICAL warnings 2022-01-29 08:58:44 +01:00
Greg Carl
2bdb3edd08 qtvcp: mdi_line strip newline from history string 
somehow missed this in the previous mdi_line PR. This PR also removes 
the leading whitespace from MDI entries.
 2022-01-27 16:05:51 -05:00
c-morley
2c7632287b
Merge pull request #1534 from hansu/translate-mdihist 
Add mdihistory_hal to translations and update linuxcnc.pot & gmoccapy.pot
 2022-01-26 20:15:13 -08:00
Greg Carl
af3e1cc591 qtvcp: add enhancements to mdi_line widget 
1. allow the ability to disallow M3, M4, M5 commands entered in the MDI
2. allow CLEAR HISTORY to clear the history
3. allow setp commands from the MDI
4. history doesn't log entries with errors
5. history doesn't log consecutive duplicate entries
thanks to phillc54 for his efforts with this as well
 2022-01-26 22:33:40 -05:00
Hans Unzner
446e7addd3 make hal_mdihistory translatable 2022-01-26 19:02:26 +01:00
Hans Unzner
0a867e3074 gmoccapy: fixed some strings (spelling, spaces, punctuation) 2022-01-23 20:00:25 +01:00
CMorley
c286764cc8 qtvcp -action_buttons: allow overriding the button text from the INI 
When defining the MDI command in the INI you can add a comma and the text.
ie. MDI_COMMAND = G0 Z25 X0 Y0;Z0,Goto\nZero
If left off the original button text is used.
 2022-01-23 01:17:36 -08:00
c-morley
fc9ea3e5c6
Merge pull request #1512 from hansu/fix-combi-dro 
Fix Combi-DRO
 2022-01-22 16:42:47 -08:00
CMorley
3f3611c9ca qtvcp -user messages: add a no button dialog, fix style application 
no button dialogs are for critical=must-fix-before-going-on events.
qt styles are applied to the user messages.
big change to dialog code to incorporate.
 2022-01-22 16:25:08 -08: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
Phillip Carter
9f9205f88c qtplasmac: fix update check 
update sim configs
 2022-01-22 10:49:11 +11:00
Sebastian Kuzminsky
6dcc68d614
Merge pull request #1515 from smoe/g_code_to_g-code 
(g-code | gcode) -> G-code
 2022-01-21 14:06:54 -07:00
CMorley
94d6458007 qtvcp -toolchange dialog - fix honouring HAL pin 'changed' aknowledgement 
external aknowledge works on qt dialog and destopnotify style tool change
messages
 2022-01-20 14:56:25 -08:00
Steffen Moeller
36735d950a g-code -> G-code 2022-01-18 14:38:59 +01:00
Phillip Carter
c4374f8822 qtplasmac: prep work for simpler updating 2022-01-18 17:38:12 +11:00
Steffen Moeller
575c7770c0 Changed [gG] [cC]ode to G-code where appropriate 
Headers and titles have "Code" start with a capital, always with hyphen.
Somewhat unfortunate, for some files I also removed blanks at the ends of lines, which makes reading this patch more difficult than it meant to be.
 2022-01-17 20:33:48 +01:00
Sebastian Kuzminsky
f37dbf2706
Merge pull request #1510 from smoe/typos2 
Typos2 - changed all occurences of linuxCNC to LinuxCNC
 2022-01-16 10:53:01 -07: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
Steffen Moeller
47677c32b9 s/linuxCNC/LinuxCNC/g 2022-01-16 03:24:06 +01:00
Chris Morley
8ae2ceb6c9 qtvcp -status_slider: cast settings to int 
sliders can only use ints - now it an outside code calls the function
it will cast a float to integer.
 2022-01-11 18:33:46 -08:00
Chris Morley
d18467c339 qtvcp -simple_widgets: fix print statement to python3 version 2022-01-11 18:27:29 -08:00
CMorley
42c78a8a9c qtvcp -tool_offsetview: only allow single tool selection 
Maybe this needs to be selectable?
We will see if the world complains.
MarkoPolo from Forum 's idea
 2022-01-07 22:37:59 -08:00
c-morley
bc366ed8c4
Merge pull request #1454 from hansu/calculatorwidget-gtk3 
Calculator widget: Fixed buttonsize, resizing, num_pad_only option, decprecated items ...
 2022-01-07 10:12:48 -08:00
CMorley
87a2b493e0 qtvcp -tool_offsetview: fix error on sorting column 0 
clicking the checkbox header caused an error - we don't support
sorting checkboxes. bug and Fix brought to us by forum personality
MarkoPolo
 2022-01-06 20:49:32 -08:00
Hans Unzner
921c36321d calculatorwidget: Make glade file translatable, changed images from stock items (deprecated) to icons 2022-01-06 16:49:42 +01:00
Hans Unzner
ef13ff4406 calculatorwidget: replaced deprecated items 2022-01-06 16:49:42 +01:00
Hans Unzner
fc49b8d3ad calculatorwidget: placed up/down buttons inside the table to the right 2022-01-06 16:49:15 +01:00
c-morley
c14e48800a
Merge pull request #1489 from dwrobel/Fix-qtplasma-camview-QPoint-argument 
Fix qtplasma camview QPoint() argument
 2022-01-04 19:18:31 -08:00
c-morley
f1665861f8
Merge pull request #1490 from dwrobel/Fix-qtplasma-camview-drawLine-argument 
Fix qtplasma camview drawLine() argument
 2022-01-04 19:18:12 -08:00
Rene Hopf
c4536fe356
Merge pull request #1488 from hansu/remove-gtk3-deprecation-warnings 
Remove Gtk3 deprecation warnings in Gmoccapy
 2022-01-04 14:10:23 +01:00
Damian Wrobel
b164d2568b Fix qtplasma camview drawLine() argument 
Fixes:
  Traceback (most recent call last):
   File "/home/dw/projects/machinekit/linuxcnc/lib/python/qtvcp/widgets/camview_widget.py", line 294, in paintEvent
     self.drawCrossHair(event, qp)
   File "/home/dw/projects/machinekit/linuxcnc/lib/python/qtvcp/widgets/camview_widget.py", line 328, in drawCrossHair
     gp.drawLine(0, 0-self.gap, 0, -h)
 TypeError: arguments did not match any overloaded call:
   drawLine(self, QLineF): argument 1 has unexpected type 'int'
   drawLine(self, QLine): argument 1 has unexpected type 'int'
   drawLine(self, int, int, int, int): argument 4 has unexpected type 'float'
   drawLine(self, QPoint, QPoint): argument 1 has unexpected type 'int'
   drawLine(self, Union[QPointF, QPoint], Union[QPointF, QPoint]): argument 1 has unexpected type 'int'

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2022-01-04 11:37:17 +01:00
Damian Wrobel
d240f92f5e Fix qtplasma camview QPoint() argument 
Fixes:
 Traceback (most recent call last):
   File "/usr/lib/python3.10/site-packages/qtvcp/widgets/camview_widget.py", line 293, in paintEvent
     self.drawCircle(event, qp)
   File "/usr/lib/python3.10/site-packages/qtvcp/widgets/camview_widget.py", line 316, in drawCircle
     center = QtCore.QPoint(w/2, h/2)
 TypeError: arguments did not match any overloaded call:
   QPoint(): too many arguments
   QPoint(int, int): argument 1 has unexpected type 'float'
   QPoint(QPoint): argument 1 has unexpected type 'float'

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2022-01-04 11:36:14 +01:00
CMorley
13b89b583f qtvcp -status_slider: fix minimum setting of slider 
While the last code change fix float/interger errors setting a minimum higher
\the 0 would not work correctly.
I was too lazy to work out why - this works.

Currently we round floats anyways. Maybe in the future we can fix it better.
 2022-01-02 21:09:33 -08:00
Hans Unzner
4c8c083190 calculatorwidget: optimize table with num_pad_only 2022-01-02 18:19:19 +01:00
Hans Unzner
d3b6918cde calculatorwidget: fixed num_pad_only in some cases 2022-01-02 02:34:17 +01:00
Hans Unzner
f035c45273 Fix hal_filechooser for Gtk3 2022-01-02 01:00:38 +01:00
Hans Unzner
66c4d2a6b2 removed duplicated line 2022-01-01 15:30:44 +01:00
Phillip Carter
bd22bc17da qtplasmac: remove redundant parameter 2022-01-01 16:43:01 +11:00
c-morley
14a02d19b0
Merge pull request #1485 from dwrobel/Allow-to-use-float-for-QSlider 
Allow to use float for QSlider
 2021-12-30 16:24:28 -08:00
c-morley
840ddfba73
Merge branch 'master' into Fix-QTimer-start-argument-HALPIN_CYCLE_TIME 2021-12-30 16:21:53 -08:00
Damian Wrobel
f543391afc Allow to use float for QSlider 
Fixes #1481

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2021-12-31 01:17:04 +01:00
c-morley
87bdd82256
Merge pull request #1483 from dwrobel/Improve-error-logging-by-adding-full-python-traceback 
Improve error logging by adding full python traceback
 2021-12-30 16:15:54 -08:00
c-morley
945c30e668
Merge pull request #1482 from dwrobel/Fix-drawEllipse-arguments 
Fix drawEllipse() arguments
 2021-12-30 16:14:17 -08:00
c-morley
7f8e098ff3
Merge pull request #1480 from dwrobel/Fix-addWidget-argument 
Fix addWidget() argument
 2021-12-30 16:13:35 -08:00
c-morley
67c3730187
Merge pull request #1479 from dwrobel/Fix-QColor-argument 
Fix QColor() argument
 2021-12-30 16:12:36 -08:00
Damian Wrobel
94a483d7fe Fix QTimer start() argument (HALPIN_CYCLE_TIME) 
Fixes:
 [QTvcp.QTVCP.CORE][ERROR] Qhal: Error making new HAL pin: arguments did not match any overloaded call:
 start(self, int): argument 1 has unexpected type 'float'
 start(self): too many arguments
 /home/dw/projects/linuxcnc/lib/python/qtvcp/widgets/simple_widgets.py
 Line 1102
 Function: _hal_init (core.py:154)
 [QTvcp.QTVCP.CORE][ERROR] Qhal: Traceback (most recent call last):
 File "/home/dw/projects/linuxcnc/lib/python/qtvcp/core.py", line 149, in newpin
 p = QPin(_hal.component.newpin(self.comp, *a, **kw))
 File "/home/dw/projects/linuxcnc/lib/python/qtvcp/core.py", line 48, in init
 self.update_start()
 File "/home/dw/projects/linuxcnc/lib/python/qtvcp/core.py", line 88, in update_start
 cls.timer.start(INI.HALPIN_CYCLE_TIME)

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2021-12-30 20:20:50 +01:00
Damian Wrobel
9b758c30b7 Improve error logging by adding full python traceback 
Adds traceback to output log to make it easier
to identify the error location.

Existing output:

[QTvcp.QTVCP.CORE][ERROR]  Qhal: Error making new HAL pin: arguments did not match any overloaded call:
  start(self, int): argument 1 has unexpected type 'float'
  start(self): too many arguments
    /home/dw/projects/machinekit/linuxcnc/lib/python/qtvcp/widgets/simple_widgets.py
    Line 1102
    Function: _hal_init (core.py:154)

Added traceback:

[QTvcp.QTVCP.CORE][ERROR]  Qhal: Traceback (most recent call last):
  File "/home/dw/projects/linuxcnc/lib/python/qtvcp/core.py", line 149, in newpin
    p = QPin(_hal.component.newpin(self.comp, *a, **kw))
  File "/home/dw/projects/linuxcnc/lib/python/qtvcp/core.py", line 48, in __init__
    self.update_start()
  File "/home/dw/projects/linuxcnc/lib/python/qtvcp/core.py", line 88, in update_start
    cls.timer.start(INI.HALPIN_CYCLE_TIME)

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2021-12-30 20:12:56 +01:00
Damian Wrobel
b95cbcb899 Fix drawEllipse() arguments 
Fixes:
Traceback (most recent call last):
  File "/home/dw/projects/linuxcnc/lib/python/qtvcp/widgets/led_widget.py", line 114, in paintEvent
    painter.drawEllipse(x, y, self._diameter - 1, self._diameter - 1)
TypeError: arguments did not match any overloaded call:
  drawEllipse(self, QRectF): argument 1 has unexpected type 'float'
  drawEllipse(self, QRect): argument 1 has unexpected type 'float'
  drawEllipse(self, int, int, int, int): argument 1 has unexpected type 'float'
  drawEllipse(self, Union[QPointF, QPoint], float, float): argument 1 has unexpected type 'float'
  drawEllipse(self, QPoint, int, int): argument 1 has unexpected type 'float'

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2021-12-30 19:43:00 +01:00
Damian Wrobel
657a8c8130 Fix addWidget() argument 
Fixes:
  File "/home/dw/projects/linuxcnc/lib/python/qtvcp/widgets/calculator.py", line 92, in __init__
    mainLayout.addWidget(self.digitButtons[i], row, column)
TypeError: arguments did not match any overloaded call:
  addWidget(self, QWidget): too many arguments
  addWidget(self, QWidget, int, int, alignment: Union[Qt.Alignment, Qt.AlignmentFlag] = Qt.Alignment()): argument 2 has unexpected type 'float'
  addWidget(self, QWidget, int, int, int, int, alignment: Union[Qt.Alignment, Qt.AlignmentFlag] = Qt.Alignment()): argument 2 has unexpected type 'float'

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2021-12-30 18:27:51 +01:00
Damian Wrobel
1ccc7a60f9 Fix QColor() argument 
Fixes:
  File "/home/dw/projects/linuxcnc/lib/python/qtvcp/widgets/gcode_graphics.py", line 58, in __init__
    self._backgroundColor = QColor(0, 0, 0.75, 150)
TypeError: arguments did not match any overloaded call:
  QColor(Qt.GlobalColor): argument 1 has unexpected type 'int'
  QColor(int): too many arguments
  QColor(QRgba64): argument 1 has unexpected type 'int'
  QColor(Any): too many arguments
  QColor(): too many arguments
  QColor(int, int, int, alpha: int = 255): argument 3 has unexpected type 'float'
  QColor(str): argument 1 has unexpected type 'int'
  QColor(Union[QColor, Qt.GlobalColor, QGradient]): argument 1 has unexpected type 'int'

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2021-12-30 18:27:17 +01:00
Damian Wrobel
a61f5f3b55 Fix QTimer start() argument 
Fixes:
  File "/home/dw/projects/linuxcnc/lib/python/qt5_graphics.py", line 299, in __init__
    self.addTimer()
  File "/home/dw/projects/linuxcnc/lib/python/qtvcp/widgets/gcode_graphics.py", line 86, in addTimer
    self.timer.start(INFO.GRAPHICS_CYCLE_TIME)
TypeError: arguments did not match any overloaded call:
  start(self, int): argument 1 has unexpected type 'float'
  start(self): too many arguments

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2021-12-30 18:25:22 +01:00
c-morley
c23f0a58b7
Merge pull request #1469 from DuttonIndustrial/curtdutt/pyhal_fix 
pyhal component names were not being registered properly when using python3
 2021-12-29 17:51:45 -08:00
c-morley
54f1036929
Merge pull request #1471 from smoe/typos 
Typos in docs
 2021-12-28 05:52:39 -08:00
Hans Unzner
c821586b01 calculatorwidget: changed layout 2021-12-25 17:39:21 +01:00
Hans Unzner
116cbd1d10 calculatorwidget: fixed sizing of OK/Cancel button due to GTK3, new layout 2021-12-25 17:39:21 +01:00
CMorley
4d865f43cc qtvcp -versaprobe: change pin names, fix tool measure button 
change the HAL pin prefix to always be qtversaprobe.
record the state of the use-tool-probe button in the preference file.
make the use-tool-probe button's LED match its initial state
 2021-12-25 01:20:20 -08:00
CMorley
cb776cb41b qtvcp -pushbuttons/indicated pushbuttons: make sure the code is initialized 
the button could be in a different state when the _hal_init() code is called
 2021-12-25 00:48:12 -08:00
Steffen Moeller
acc553df70 DIameter -> Diameter 2021-12-25 01:57:34 +01:00
Curtis Dutton
8d1a87f192 pyhal component names were not being registered properly when using python3. 2021-12-24 09:15:16 -05:00
mwork
2f4b391871 QTVCP - Update Function to setting the TITLE and ICON for QTVCP APP 
Need to add config in DISPLAY to INI file
With ICON : image file need to save in ini folder

[DISPLAY]
DISPLAY = qtvcp qtdragon
TITLE = MyQTVCP-qtdragon
ICON = silver_dragon.png
 2021-12-23 16:18:03 +07:00
mwork
27bc8e715d fix type 2021-12-23 08:30:05 +07:00
mwork
a098776182 Update camview_widget.py 2021-12-23 08:27:54 +07:00
CMorley
8d8355e104 qtvcp -qt_action: fix unhome all 
Thanks Phill
 2021-12-18 21:31:17 -08:00
CMorley
61e1729800 qtvcp -qt_action: when unhoming a joint -unhome combined joints too 
combined joints make an axis
 2021-12-18 20:46:54 -08:00
Dewey Garrett
5ee44f19b0 tooldata_db_notify: support tool_notify_t types 
was: commands 'g','p'
is:  commands 'g','p','l' (load_spindle), 'u' (unload_spindle)
 2021-12-18 17:51:36 -07:00
CMorley
c48a052660 qtvcp -action: add function to set motion teleop mode 
WIP - the code might be right but it didn't seem to work in my
test config. tis code is copied from AXIS
 2021-12-16 23:24:49 -08:00
CMorley
c6d05a8c06 qtvcp -gcode graphics: fix display in joint mode 
There was missing code to display joints instead of axes,
when in free (joint) nmode.
added enable_dro code to hide joints DRO if requested. This
required glcannon to be modified (in another commit)
Should also display extra joints (not tested)
 2021-12-16 23:19:17 -08:00
CMorley
39248a9a7a glcannon -allow joint dro display function to be overridden 2021-12-16 23:16:48 -08:00
Phillip Carter
6ef404ed30 qtplasmac: add fallback to torch if laser framing out of bounds 
re-instate entry check in conversational lines
 2021-12-15 13:33:26 +11:00
CMorley
41888a1960 qtvcp -add joint/axis conversion function 2021-12-11 23:27:10 -08:00
CMorley
eb9d3f8733 hal_glib -is_joint_homed should return a bool 2021-12-11 23:27:10 -08:00
CMorley
62f1222779 qtvcp -designer readme: fix wrong package name. 2021-12-07 01:28:28 -08:00
Dewey Garrett
d8c823d53e tooldb.py updates to improve err reporting 2021-12-06 17:49:14 -07:00
CMorley
d1264fbb50 qtvcp -add user_command_file option for modifications 
Simliar to AXIS's .axisrc option
 2021-12-05 20:46:24 -08:00
Phillip Carter
b2fa9d0d7e
Merge pull request #1414 from phillc54/phillc54/led 
qtvcp: led_widget fix off color and add border color
 2021-11-29 11:23:47 +11:00
Phillip Carter
8f8ab15fff qtvcp: led_widget fix off color and add border color 2021-11-29 10:44:24 +11:00
CMorley
c93277a206 qtvcp -qt_action: remove mode change to auto when loading 
it's not nessasary.
Thanks Greg C of qtplasmac fame
 2021-11-28 14:55:35 -08:00
Phillip Carter
170b2926b1 qtplasmac: improve z motion handling in g-code filter and conversational block 2021-11-28 14:23:16 +11:00
Phillip Carter
2241985e9c qtplasmac: move conversational to a module 2021-11-28 13:22:10 +11:00
CMorley
b948e65d57 qtvcp -gcode_graphics:fix typo in mousebuttonMode function 2021-11-27 15:57:06 -08:00
Phillip Carter
1365386aeb qtplasmac: move run from line to a module 2021-11-27 11:52:13 +11:00
CMorley
31f864b817 qtvcp -gcode_display: add mouse button control property 
Some people prefer the buttons controls differently
 2021-11-26 15:32:47 -08:00
Phillip Carter
c74198db6c qtplasmac: change progress bar appearance 2021-11-27 10:19:25 +11:00
CMorley
9480c41915 qtvcp -gcode_display: fix GObject unblock warning 
Now we don't try to unblock a signal that was never blocked in the first place
 2021-11-25 06:40:27 -08:00
CMorley
f248ae66db qtvcp -simple_widgets: stop calling internal functions twice 2021-11-24 14:08:43 -08:00
CMorley
1302d0ad6d qtvcp -add a disable_STATUS_signal property 
Allows a user to use the plotter without it responding to auto loading/reloading/
line selection or view change signals from STATUS

This property can be changed at runtime too
 2021-11-24 14:06:00 -08:00
CMorley
a8ced9b0b1 qtvcp -add HAL pins to versa probe 
The existing remap to autotool height probing requires HAL pins.
Also make the check buttons indicate properly
 2021-11-19 18:04:19 -08: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
CMorley
110672050a qtvcp -fix verbose level logging. 
Actually it still doesn't print 'VERBOSE', it print 'DEBUG'.
But at least it prints something
 2021-11-14 20:27:14 -08:00
CMorley
f51d8b5d2c qtvcp -add POSTGUI_HALCMD option for INI 
POSTGUI_HALCMDs are called after all POSTGUI_HALFILEs are finished.
Multiple commands are run one after another.
 2021-11-12 15:53:44 -08:00
Phillip Carter
d9ba6800ec qtplasmac: add ofset probing option 2021-11-12 17:47:29 +11:00
CMorley
f185973b3b qtvcp -work around error caused by mising TRAJ entry 
If the the MAX_LINEAR_VELOCITY  is missing from the TRAJ entry,
 the default in linuxcnc is 1e99 which GObject doesn't like.
 2021-11-10 20:39:56 -08:00
Phillip Carter
41044c01fe qtplasmac: fix scribe offset setting error if no tool table entry for axes 2021-11-11 11:52:09 +11:00
luz paz
9d5d892847 Added more typos 2021-11-10 06:32:09 -05:00
luz paz
3868020263 Added more API typos 2021-11-10 06:32:09 -05:00
Phillip Carter
fe0c9ae031 qtplasmac: add offset setup for laser, camera, and scribe 2021-11-08 18:03:32 +11:00
CMorley
166f249f31 qtvcp -call _hal_cleanup in handler before closing anything. 
recording toolbar settings must be done before the gui closes anything.
out usual closing_cleanup__ function was run too late.
 2021-11-07 00:56:27 -07:00
ChrisM
362dc32795 qtvcp -add geditor: uses moveable toolbars 2021-11-06 21:09:05 -07:00
ChrisM
d4c2fd6eda qtvcp -qtvcp<-plugin: add a switch for qt version for joypad 
older versions of qt can't use enum
 2021-11-06 21:09:05 -07:00
CMorley
833f4c75c8 qtvcp -core: add constants for operator messages 
easier to emit errors with the STATUS library rather then
also importing linuxcnc module
 2021-11-06 15:43:32 -07:00
Phillip Carter
bceb99c85b qtplasmac: fix conversational origin settings 2021-11-05 15:48:03 +11:00
luz paz
36a7c0ba71 Fix qtvcp related typos 
Found via `codespell -q 3 -S *.po,*.ts,./share,./docs/man/es,./configs/attic -L ans,doubleclick,dout,halp,parms`
 2021-11-03 11:33:06 -07:00
CMorley
59fd277721 qtvcp -IndicatedPushButton: fix calling of functions on state change 
All the special code was not called because the connecting function
was not included on the last code shuffle
 2021-11-03 11:11:38 -07:00
CMorley
0b210fd499 qtvcp -qt_makegui: add qsettings file path info 2021-10-31 22:31:28 -07:00
CMorley
a78af93094 qtvcp -filemanager: change the Qsettings recorded names 2021-10-31 22:30:16 -07:00
ChrisM
e3d274f88c qtvcp -force sync of Qsettings on shutdown 
newer versions of qt seem to do this automatically.
This seems to fix those that do not.
 2021-10-31 21:51:55 -07:00
CMorley
ba62f3d9ba qtvcp -remove python qtdesigner files 
Not needed anymore and probably would cause more trouble to keep them
 2021-10-30 20:22:29 -07:00
CMorley
b3ee4a073f qtvcp -widget_baseclass: fix error when using qtdesigner 2021-10-30 14:40:41 -07:00
CMorley
e8d5c5d837 qtvcp -core: add sep to Qhal 2021-10-30 14:06:03 -07:00
CMorley
9a4cac1436 qtvcp -have basewidget register the widget for special treatment later 2021-10-30 13:57:35 -07:00
CMorley
75073edd50 qtvcp -filemanager - remember what column is sorted 2021-10-30 13:57:11 -07:00
CMorley
4f0952fde9 qtvcp -add qt settings instance to qtvcp's widget baseclass 2021-10-30 13:56:12 -07:00
Phillip Carter
0084a25623 qtvcp: install script can update from a python2 install 2021-10-26 16:28:22 +11:00
CMorley
d5c3f1d6a8 qtvcp -preference library: automatically convert data types 
ie a List would always comeback none - now it gets evaluated to list
 2021-10-25 00:14:51 -07:00
CMorley
a00969af4f qtvcp -fix widget and plugin paths 
They didn;t point properlyon an installed version.
 2021-10-24 14:23:52 -07:00
CMorley
d41e6a0701 qtvcp -pstat: fix widget library path on installed systems 
This always pointed to RIP path
 2021-10-23 14:23:21 -07:00
CMorley
af0854e880 qtvcp -add ability to set halpin name in designer. 
Before this it used the widget name, now you can use either.
 2021-10-22 23:09:50 -07:00
CMorley
58af0e749d qtvcp -add indicatedPushButtons to designer editor 
changed the name from indicated_PushButton
It was the hidden base widget for PushButton and actionButton.
IndicatedPushButton has no output HAL pin nor builtin selectable actions.
 2021-10-22 23:09:50 -07:00
CMorley
d5ae4fd5c1 qtvcp -stylesheet editor: fix loading of Qss files 
When removing python2 code the loading got changed a bit but I would have thought it would
work the same anyways - but it didn't. It wuldn't load the text into the text edit widget.
 2021-10-22 23:09:50 -07:00
CMorley
0fbbb29102 qtvcp -screenOptions: add property to set HAL component basename 
This is more apropriate then setting it in the handlerfile, I think.
setting in the handler file still works though.
 2021-10-20 20:30:36 -07:00
CMorley
3ea287c24d qtvcp -gcode_editor: account for ; being a comment 2021-10-20 17:53:18 -07:00
CMorley
d67b241f8f qtvcp -gcode_editor: fix search/replace error. 
Thanks Phill
 2021-10-19 23:42:19 -07:00
CMorley
7c6732fa0b qtvcp -gcode_editor: improve gcode syntax highlighter 
more colors.
separate colors for codes 'gst', 'mfpq' and for axis letters
can change what letters are in the two code colors.
fix coloring for []
 2021-10-19 22:50:27 -07:00
andypugh
df78b69c0d
Merge pull request #1312 from satiowadahc/cw-halpin 
halmodule - adding getpins function
 2021-10-19 20:28:07 +01:00
Rene Hopf
02fb25a971
Merge pull request #1317 from LinuxCNC/qtvcp-cleanup 
remove python version checks from qtvcp
 2021-10-18 18:12:45 +02:00
c-morley
b6a59e18cc
Update core.py 
These are unneeded too. Thanks
 2021-10-17 20:52:32 -07:00