Commit Graph

57 Commits

Author SHA1 Message Date
Bill Somerville
4f4c535c4e Added audio channel support.
Audio input can be mono, left of stereo pair or, right of stereo
pair. Audio output can be mono, left of stereo pair, right of stereo
pair or, both of stereo pair (the same output goes to both channels in
both mode). Settings are remembered between sessions.

Stream channel suport is implemented mainly in the new AudioDevice
class which is now the base class of Modulator and Detector.

Audio channels are selected on the configuration screen. Only
supported channel configurations per device can be selected.

Audio output volume (actually attenuation) is now possible from the
GUI. I have added a slider control to the main window; I don't
necessarily propose this as a final release location for the widget as
I understand that changes to the main screen are sensitive. This
location is just a starting suggestion for a trial. The volume
(attenuation) setting is remembered between sessions and is not device
dependent. This addresses all issues of volume setting on *nix
versions since there is no need to use pavucontrol to set audio
levels. The volume (attenuation) action is logarithmic.

Shaped CW keying has been implemented in Modulator although it is
currently disabled as I am not 100% happy wth the implementation. If
you want to try it define the C++ preprocessor macro WSJT_SOFT_KEYING
in your build.

The Modulator instance has been moved to the same thread as the
SoundOutput instance as it should have been since the output callback
already operates in that thread. Cross thread slots are now correctly
called in a thread safe way as a result.

A number of files where in the SVN repository with DOS line endings
which I have removed. SVN users on Windows need set the config for
native line endings so that DOS line endings are automatically
stripped on checkin.

The DevSetup class now holds it's UI o the heap to reduce imapact on
build dependencies.

The application settings are now passed to objects from the main.cpp
file. Management of settings are moved to the responsible classes (top
level windows). This has involved a few settings moving groups so
users will see some settings reverting to default values on the first
run of an update.

Persistance of top level windows geometry and position is now handled
in the recommened manner (constructor for load, closeEvent for store
in modal windows and, hideEvent for store in modeless dialogs).

The MainWindow class now holds its children as members rather than
global variables.

The LogQSO class now hides its implementation and takes responsibility
for its own settings and widows rendering parameters. A new settings
file group is implemented to persist the LogQSO class settings.

The WideGraph class now hides its implementation and manages its own
settings and window rendering parameters.

  --This line, and those below, will be ignored--

M    Modulator.cpp
M    rigclass.cpp
M    widegraph.cpp
M    signalmeter.cpp
M    soundin.cpp
M    soundout.cpp
M    mainwindow.h
M    main.cpp
M    meterwidget.h
M    devsetup.cpp
M    mainwindow.ui
M    Detector.cpp
M    logqso.h
M    rigclass.h
M    mainwindow.cpp
M    meterwidget.cpp
M    soundin.h
M    devsetup.ui
M    wsjtx.pro
M    devsetup.h
M    logqso.cpp
M    Modulator.hpp
M    psk_reporter.cpp
M    killbyname.cpp
M    Detector.hpp
M    signalmeter.h
M    widegraph.h
M    psk_reporter.h
M    soundout.h
M    PSKReporter.h
M    lib/afc65b.f90
M    lib/gran.c
M    lib/usleep.c
M    lib/afc9.f90
M    lib/wrapkarn.c
A    AudioDevice.hpp


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-10 15:29:55 +00:00
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
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
0110ab88dd Very minor twesk to labels in devsetup.
Minor changes to User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3494 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-18 15:23:34 +00:00
Joe Taylor
dc948031dd 1. Set the default startup frequencies to reasonable ones for JT65.
(JT9 will typically be about 2 kHz higher.)
2. Add a few default Tx macros, as examples.
3. Fix display of correct UTC on decoded lines, when "Shift+D" is used to 
   do another wideband decode during the next Rx sequence.
4. Clear the "Split Tx" checkbox when CAT is not enabled (but remember
   what its state should be, if CAT is re-enabled).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3468 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 15:44:33 +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
57fe9f0508 Clean up the Tab order on LogQSO and Setup screens.
Please note: features added today need more testing that I have yet given
them!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3345 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-06-06 17:46:27 +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
1f86d76eca Make the controls for PTT Port and CAT Port wide enough to display
unix-style names like "/dev/ttyUSB0", etc.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3325 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-06-04 12:24:32 +00:00
Joe Taylor
b0c2eb69ed 1. Correct a flaw in setting m_lockFreq in wideGraph.
2. Double-click on a 73 message sets Tx5, rather than Tx6.
3. Clean up a few remaining compiler warnings.
4. Clean up Tab order.
5. Updates to User's Guide


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3320 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-29 15:09:04 +00:00
Joe Taylor
07b1987eb2 1. Added Tool Tips for most on-screen controls.
2. Removed all vestiges of NB code and controls.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3314 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-24 15:41:33 +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
363d3d548f Activate the "read frequency once" orange button.
Delete the last tentatively-saved file on program exit.
No negative numbers needed on "CW ID" spinner.
Updates to User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3259 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-07 16:35:50 +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
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
b79b017df3 Minor tweaks to GUI on Setup screen, to accommodate larger fonts.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3241 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-29 12:59:27 +00:00
Joe Taylor
20a23cc267 Commit an early draft of full User's Guide.
Fix tab order on page 1 of Configuration screen.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3229 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-26 19:38:43 +00:00
Joe Taylor
5bd9dc9e8a Fix the Tab ordering on pages 2 and 3 of the Setup screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3225 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-25 23:49:39 +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
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
6e95e05c5f 1. New controls for selecting Tx messages now functioning correctly?
2. Double-click on decoded message sets Tx Enable.
3. Implemented a runaway Tx watchdog.
4. Added a spinbox for S/N report.
5. Implemented correct message formats for compound callsigns.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3135 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-08 18:31:21 +00:00
Edson W. R. Pereira
0c9b05f0e6 1. Moved fMin and fMax spin boxes to spectrum widget.
2. Adjusted mainwindow layout.
3. Added label at top level of decoded text widgets.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3133 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-05 16:48:10 +00:00
Joe Taylor
ffb0d72db2 Reset a number of default parameters so they will be consistent with a
new version of the User's Guide (which itself is not yet finished).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3112 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-26 18:54:15 +00:00
Joe Taylor
7bd121bb48 Tweaked size od devsetup window.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3111 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-26 17:16:47 +00:00
Edson W. R. Pereira
3d37e9cbf3 1. Cleared CAT serial device list in UI. It is now populated in devsetup.cpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3107 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-26 15:41:31 +00:00
Edson W. R. Pereira
c7d1e1d87c 1. Increase size of labels in devsetup to prevent text hiding.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3106 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-26 15:38:10 +00:00
Edson W. R. Pereira
ac54c676fe 1. Forced revision update
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3105 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-26 15:31:42 +00:00
Joe Taylor
55038c0e9b Fix warning messages about duplicate widget names in devsetup.ui.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3101 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 22:16:21 +00:00
Edson W. R. Pereira
2fa5a07fd5 1. Added comport list as per OS type
2. Adjusted layout od devsetup dialog


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3100 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 20:42:25 +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
Edson W. R. Pereira
cff342420f 1. Added Linux serial devices to serial devices selector
2. Fixed bug with default number of serial stop bits
3. Adjusted layout on setup dialog


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3096 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-25 15:18:46 +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
b9ed53c150 Some tweaks to the Tx macro code, and a few small clean-ups.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3070 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-22 19:57:32 +00:00
Joe Taylor
f60cff8698 Default to Station tab on Setup screen.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3069 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-22 00:39:45 +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
b49a821ec6 Working on Tx macros.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3066 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-21 16:26:44 +00:00
Joe Taylor
4bad091a3d Correct spelling on "Enable PSK Reporter" checkbox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3046 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-12 15:03:32 +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
5d030bd413 Much code cleanup: remove unised variables and code.
Include # channels in audio device offerings.
Start implementing "msgsent" correctly.  (Not finished!)
Include Date in UTC display.
Use the properly computer snrdb.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2718 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-12 16:33:45 +00:00
Joe Taylor
90ad55cf77 Remove m_DF and associated code.
Disable some presently un-implemented controls.
Begin implemnting "Save Synced" and "Save Decoded".
Set compilation to CONSOLE mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2706 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-30 16:49:24 +00:00
Joe Taylor
a199729efb Clean up the devsetup window. Some fixes to getfile and savewav.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2486 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-07-04 18:22:38 +00:00