Commit Graph

66 Commits

Author SHA1 Message Date
Bill Somerville
b6559fae7c 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
Joe Taylor
436fc96dff Correct the default palette's filename.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3537 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-08 18:59:27 +00:00
Joe Taylor
6694757683 Save/restore of user's palette choice was broken. Now fixed.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3534 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-08 00:16:13 +00:00
Joe Taylor
7bdc623ec6 1. Use a ComboBox for palette selection.
2. Minor adjustments to position of WideGraph controls.
3. Include the palette files.  The whole directory "Palettes" should
be copied into the install directory.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3529 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-07 18:59:11 +00:00
Joe Taylor
016245e80e New flexibility for defining and selecting the waterfall palette.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3528 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-07 14:49:45 +00:00
Joe Taylor
0a7adf9b44 1. Fix a longstanding (and evidently latent) bug in widegraph.cpp.
2. Add basic proof-of-concept code that uses QAudioInput instead of
PortAudio for sound input.  By default, this test code is not active,
and it compiles using PortAudio.  To compile using QAudio, uncomment
the line

#DEFINES += QAUDIO_INPUT

in wsjtx.pro.  Note that device selection in the QAudio code is presently
hard-wired to use the default input device.  You can change this 
choice on line 267 in soundin.cpp.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-30 20:36:14 +00:00
Joe Taylor
18f1119b1a Adjustable start frequency for waterfall.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3502 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-25 16:48:10 +00:00
Joe Taylor
239e9156e0 Simplify the WSPR warning message, and mark the WSPR band when we're
on 30 m.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3481 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-12 13:45:28 +00:00
Joe Taylor
8fb483a200 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
0b6205d455 1. Oops, inadvertently I clobbered a Win32-only line while editing unix
code.  
2. Add a Setup option "Tx freq locked to Rx freq."  Needs testing!


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3318 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-28 19:34:18 +00:00
Joe Taylor
1ada32a81e 1. De-activate submodes JT9-5, JT9-10, and JT9-30. (This makes the shared
memory region smaller by some 150 MB.)
2. Some code cleanup (removing unused lstrong, etc.)...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3283 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-20 14:09:02 +00:00
Joe Taylor
a0eb456a4f 1. Minor corrections to plotter.cpop and widegraph.cpp.
2. New algorithm for 'sync9'.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3267 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-14 17:42:25 +00:00
Joe Taylor
119b2ed43b 1. Send values of fMin, fMax, to the jt9 decoder.
2. Option for user to set default fonts.
3. Minor tweaks to GUI appearance.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3150 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-10 14:41:16 +00:00
Edson W. R. Pereira
7d5bbf47c3 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
7f72925679 First try at changing Tol to fMin and fMax. More work still to be done!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3125 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-04-03 16:44:31 +00:00
Joe Taylor
e7f8b7e0ca 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
0516a86dd8 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
a1e43d4a77 Continuing to work on Rig Control.
Changed "Tx = QSO Freq" button to a band-change ComboBox.
Rig control of frequency setting and T/R now works on TS-2000.
T/R sequencing is not yet correct, but I thimnk it still works OK in the 
DTR/RTS switching mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3083 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-24 17:29:26 +00:00
Joe Taylor
a360a64275 Combining wsjtx_rx.log and wsjtx_tx.log into ALL.TXT.
Implementing ADIF log.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3050 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-18 16:14:18 +00:00
Joe Taylor
2e6e5c97dd Change wsjtx_txcall.txt and wsjtx_qrg.txt to wsjtx_status.txt.
Change DialFreqkHz to DialFreqMHz.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3049 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-18 13:24:50 +00:00
Joe Taylor
ae7b78ce22 End lines in wsjtx_qrg.txt, wsjtx_txcall.txt, and wsjtx.log with CRLF.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3048 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-14 00:20:55 +00:00
Joe Taylor
85a3f8782f Add files "wsjtx_txcall.txt" and wsjtx_qrg.txt" for use by JT-Alert.
Write log info to wsjtx.log, not wsjt.log.
Bump version number to 0.6.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3045 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-12 14:53:53 +00:00
Joe Taylor
37e78f1afa Change selection of Current/Cumulative/JT9Sync to a combobox.
Don't change frequency settings on double-click on decoded text, if 
the first call is MyCall.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3038 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-03-06 16:37:28 +00:00
Joe Taylor
5c4503df99 Correct the vertical scale of red curve, when nbpp>1.
Change "double-click on callsign" so that you can click anywhere on the line,
and make it set TxFreq accordingly.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3025 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-02-28 23:35:04 +00:00
Joe Taylor
00273a5540 Fix the red plot when bins/pixel > 1.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3024 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-02-28 21:22:56 +00:00
Joe Taylor
4d19d9dd5b Remove the Auto Zero button and associated code.
Other code cleanup.
Display UTC at start of sequence on decoded text line.
Install DLLs to {app} rather than {sys}.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2788 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-30 13:56:55 +00:00
Joe Taylor
725c6bcbc0 Enable "Save synced" and "Save Decoded".
Clean up handling of DialFreq.
Put Date into wsjtx_rx.log.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2768 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-24 15:18:17 +00:00
Joe Taylor
7a43d28e68 TxFreq tracks fQSO unless CTRL is held down.
Red marker for TxFreq.
Max Tol = 500.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2763 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-23 16:05:50 +00:00
Joe Taylor
6012a0c7a0 Clean up compiler warnings.
Better definition of "red()" for waterfall plot.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2729 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-14 17:02:54 +00:00
Joe Taylor
05322bb4f2 Correct UTC on waterfall for slow modes.
Tweak some GUI widget placements.
Send stderr to file wsjtx.log.
Fix formatting of std message with "R -7", etc., to "R-7".
Introduce calls to "timer".
Remove console.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2727 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-14 15:30:21 +00:00
Joe Taylor
a84c3a8c5d Updates to Users Guide.
Double-click on waterfall sets Tol to a reduced (mode-dependent) value.
Tol is saved/restored on program restart.
Added digital gain slider for setting input level.
Garbage decode "15P6715P67WCV" is rejected.
Arrays ss and c0 are copied and saved when newdat=1.  Further processing is
done on the copies.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2712 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-11-01 19:54:40 +00:00
Joe Taylor
05c3dadc99 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
9697dbf189 Save and restore fQSO.
Decode mjultiple signals inside the "Tol" green bar, rather than just the
one producing highest value of sync.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2701 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-29 17:58:33 +00:00
Joe Taylor
e9f2cbfb1d Many improvements to GUI. Fixed the "yellow waterfall" problem; fixed
generated names for *.wav files.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2694 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-26 16:01:57 +00:00
Joe Taylor
879be2044f Several updates for suitable packaging.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2692 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-25 16:50:00 +00:00
Joe Taylor
dd0fb0c743 Code cleanup. Implement use of fQSO, ntol, etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2671 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-19 19:26:07 +00:00
Joe Taylor
6950c262c1 Working toward implementing JT9 decoder in WSJT-X.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2663 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-15 17:43:49 +00:00
Joe Taylor
64bfbf3647 Draw correct scale on startup, with nbpp>1.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2662 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-11 22:59:36 +00:00
Joe Taylor
47b8c44521 Offer cumulative as well as current 2-d plot.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2656 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-11 00:51:16 +00:00
Joe Taylor
734e6e7163 Several tweaks toward letting someone else Tx to me...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2651 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-05 19:14:45 +00:00
Joe Taylor
8106840d3b working on pxdb, spectra
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2645 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-04 02:05:14 +00:00
Joe Taylor
a6a41824fa Correct frequency scale for nes FFT length. (Still off by a bit??)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2644 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-03 19:25:49 +00:00
Joe Taylor
d0997e4740 More cleanup; correct the value of NSMAX in GUI.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2639 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-10-03 15:42:13 +00:00
Joe Taylor
64eeef06d0 GUI tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2620 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-09-29 23:52:01 +00:00
Joe Taylor
482f160b23 Code cleanup... remove unused variables, etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2617 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-09-29 18:11:44 +00:00
Joe Taylor
16556ec7ac More progress on wide graph display. Mostly OK now... ??
Sometimes need to restart after mode change, etc.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2612 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-09-29 17:09:05 +00:00
Joe Taylor
6469c6d96e Removed freqOffset spinBox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2611 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-09-29 13:29:12 +00:00
Joe Taylor
2232d88405 Working on wide graph displays.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2609 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-09-29 13:02:19 +00:00
Joe Taylor
d9df62b9e9 Now can see signal on both waterfall plots. (Far from correct, though!)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2608 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-09-28 23:59:50 +00:00
Joe Taylor
4caf2ddec0 More progress.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2601 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2012-09-26 18:45:10 +00:00