Commit Graph

36 Commits

Author SHA1 Message Date
Bill Somerville
ef586e4b58 Qt 5 Audio replaces PortAudio.
Currently only Qt5 or above is known to work with this code. It may be
possible to backport it to Qt4 if required.

Audio output goes back to a separate thread to try and minimize
stutters in streaming on Windows particularly.

A crash on Linux due to mishandling of stereo audio output has been
fixed and both left and right channels are now correctly synthesised
with identical contents.

Rigs are enumerated directly from hamlib API rather than running a sub
process reading output of rigctl -l. This was initially done to get
rid of some GUI thread blocking in the configuration dialog, but is
generally a better way of doing it anyway.

Some refactoring in MainWindow to accomodate the audio streaming,
modulation and detecting classes.

Exit handling for application refactored to use signals rather than
brute force event loop exit. This was required to get correct thread
shutdown semantics.

The GUI update timer is now stopped during application shutdown which
is necessary to stop crashes when shutting down gracefully with
signals and window close() calls.

There is an outstanding issue with Linux audio streams; the QAudio
Input/Output classes create a new stream name each time a stream is
started. This doesn't play well with PulseAudio utilities such as
pavucontrol to set stream volume as settings are lost every tx
period. I have tried to keep a single stream for all output but there
are problems restarting it that haven't been resolved yet.

The QtCreator project file has been rearranged a little because it
passes all the object files to the linker rather than using an archive
library. Since the GNU linker is single pass; the object files need to
be in a logical order with definitions appearing afer references to
them. This was required to avoid a linking error.

The lib/Makefile.linux has been enhanced to use the fortran compiler
to locate the correct version of the Fortran library to use. This is
necessary on the latest Linux distros because the unversioned symlink
to compiler support libraries is no longer provided. This only an
issue with mixed programming language links where the linker driver
for one language has to link support libraraies for another language.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3532 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-07 23:09:13 +00:00
Joe Taylor
61f023ddd1 Most of these changes are thanks to G4WJS. Audio I/O is now done using
Qt's built-in QAudio calls rather than PortAudio.  Also includes some
refactoring of the arrangement for these calls, and more use of C++ style.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3523 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-05 13:57:55 +00:00
Joe Taylor
30712a3ce8 1. Full control of DTR and RTS on serial port used for CAT control -- patch
submitted by G4WJS.
2. Improved(???) means of multiple tries when polling radio for frequency.
3. Minor tweaks to widget sizes on devsetup screen.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3500 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-23 17:32:59 +00:00
Murray Curtis
5d64092a1c Band settings with multiple antenna descriptions for PSK reporter
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3499 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-23 10:28:22 +00:00
Joe Taylor
a4cc4f4101 Warning: these changes have not yet been thoroughly tested!
1. Correct the TxMode label on program startup.
2. Insert TxMode (not RxMode) into the "Transmitting..." lines in ALL.TXT.
3. Put TxMode in wsjtx_status.txt.
4. F4 clears Az, Dist, and all Tx messages as well as DxCall and DxGrid.
5. Make it possible to decode JT9 in the "JT65 region", and vice-versa, with
   directed double-click on signal in waterfall.
6. Improved logic for enabling/disabling TestPTT button on setup screen.
7. Do not call getFreq() when TestPTT is activated under CAT control.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3463 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 19:57:01 +00:00
Joe Taylor
3dc6abc0c1 Merging code for v1.1 back into the main wsjtx branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 13:17:22 +00:00
Joe Taylor
0fe2869799 Add optional antenna description for PSK Reporter. (Presently implemented
only for Windows.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3344 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-06-06 17:40:09 +00:00
Joe Taylor
73cd30dd1b Satisfied another compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3308 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 17:25:52 +00:00
Joe Taylor
8bb4abc54f Several more #ifdef's.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3293 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 01:02:07 +00:00
Joe Taylor
a0755bf0f5 Enable/Disable catPort controls and labels according to need.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3292 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 00:31:53 +00:00
Joe Taylor
d7f2ca2bd4 Added "#ifdef WIN32 ... #endif" around HRD interface code.
(Did I get them all??)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3291 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 21:36:34 +00:00
Joe Taylor
22bb94dc02 First attempt at interface to Ham Radio Deluxe (HRD).
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3288 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 19:49:41 +00:00
Joe Taylor
63f6cd9000 Revert to ComboBox for selecting PTT Port. (Straightened out the bizarre
ordering of items on the drop-down list.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3285 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-20 18:33:06 +00:00
Joe Taylor
a4dd062938 Change PTT Port from a QComboBox to a QlineEdit.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3284 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-20 15:43:56 +00:00
Joe Taylor
79bdc5c82f 1. Correct annoying bug producing infinite "Error rigOpen -1" messages: must
do a rig->Close() if user has done "Test CAT Control" and then hit "Cancel".

2. Remove the "0%" part of Rx noise label; exchange positions of "Rx
Noise" and "QSO Freq" on Status Bar.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3260 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-07 18:19:15 +00:00
Joe Taylor
3c7ce2f4e1 1. Fix the window titla end label above audio devices on Configuration
screen.
2. Some copy-editing on the User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3255 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-03 23:28:39 +00:00
Joe Taylor
80724e089d Save m_pttPort when its comboBox is changed, so that the "Test PTT"
button can act accordingly.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3253 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-03 00:04:44 +00:00
Joe Taylor
b0bfd5ffea This is test code!!
I have changed the declarations of the Rig class functions we use:

open()
setConf()
getFreq()
setFreq()
setPTT()
close()

... so that each one returns the (negative) error code returned by 
hamlib.  These functions no longer throw exceptions.

Initial tests seem to show things working well.  I have found one
condition that causes a crash.  The rig is initially opened and is
running OK (in this case, with the Polling interval set to 1 s).  Then
the radio is turned off.  The next call to getFreq() never returns.

Probably we need to set a timeout limit?

The code is kinda on the quick-and-dirty side.  Improvements will be 
welcom!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3246 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-30 18:54:11 +00:00
Joe Taylor
98d4ba6a98 Starting to implement a "polling interval" option. More to come!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3245 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-30 14:34:45 +00:00
Joe Taylor
37ee325aa2 "Data" and "Mic" options for PTT via CAT control.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3223 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-25 22:57:08 +00:00
Joe Taylor
338f72bcc4 Add a setup checkbox "RTS/DTR Off", to enable proper CAT control of
Elecraft K2 (and possibly other rigs?).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3209 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-24 19:41:58 +00:00
Joe Taylor
4a7d5d38c7 1. Fixed a bug causing seemingly random crashes when compound callsign
is decoded.
2. Fixed minor bug in the "Test PTT" function.
3. Background of DialFrequency label goes red if frequency differs from
default for this band by mode than 10 kHz.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3208 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-24 17:55:33 +00:00
Joe Taylor
d53a40aeae 1. Removed all vestiges of rigctl use. Now using calls to hamlib
functions.  

2. Restored "Test CAT Control" and "Test PTT" buttons on the 
Setup | Configuration screen.

These features need thorough testing!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3204 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-23 20:46:04 +00:00
Joe Taylor
0577b42f43 Backed out the changes from r3171 to r3172 -- too buggy at present.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3173 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-15 21:13:31 +00:00
Joe Taylor
6ebfd25e27 1. CAT control now working with calls to hamlib functions.
Needs testing!!!
2. Added "Test CAT Control" and "Test PTT" buttons on 
   Setup | Configuration screen.  (Must fix flaky behavior of calls to ptt().)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3172 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-15 20:20:06 +00:00
Joe Taylor
39a98d2645 1. Tweak the DialFreq label; remove similar label from Wide Graph window.
2. Add a tab for Default Frequencies on Setup window.
3. Update Makefile.MinGW
4. Bump version number to 0.8.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3097 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 19:13:49 +00:00
Joe Taylor
3362a37672 Implemented CW ID.
Signal reports 0 dB and above now displayed as "+03", "+16", etc.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3089 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 01:24:47 +00:00
Joe Taylor
b752c8c517 Starting to implement CAT control. Not finished yet, and there may be bugs!
PTT control not yet done...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3078 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-24 12:55:13 +00:00
Joe Taylor
67cf0fb5c6 LogQSO now has a confirmation step where you can edit the log entries.
Tx macros are now enabled.
Bug in decoder fixed.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3068 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-21 22:58:16 +00:00
Joe Taylor
727bf12c75 Allow COM port numbers up to COM99.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3047 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-13 18:47:34 +00:00
Joe Taylor
21d8c80360 Starting to implement uploading to PSKReporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3042 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-10 02:45:12 +00:00
Joe Taylor
e789c19386 Use correct upper/lower case for MyCall, MyGrid.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2770 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-24 16:30:39 +00:00
Joe Taylor
a96023b9ca More cleanup of the devsetup dialog.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2477 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-07-02 17:22:11 +00:00
Joe Taylor
0f9750689f Cleaning up the "devsetup" screen. NB: List of audio input devices is not
being populated.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2476 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-07-02 16:13:21 +00:00
Joe Taylor
0875a12cad Set properties for native eol style and the "Rev" keyword.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2464 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-05-22 17:09:48 +00:00
Joe Taylor
9e73f87218 Major changes to the MAP65 branch. This branch is now a copy of
MAP65 v2.3.0, r631, as checked out from the SVN repository on
pulsar.princeton.edu.  If all goes well with this commit, subsequent
MAP65 development will use the Berlios repository.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2461 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-05-22 14:28:39 +00:00