Commit Graph

1275 Commits

Author SHA1 Message Date
Bill Somerville
3fbf5a5686 Fix defects in audio down-sampling on some platforms.
The filter used for 4 times down-sampling cannot handle sample streams
where the hardware or drivers deliver chunks of data that are not
multiples of 4 frames long. This seems to be prevalent on some Linux
platforms. Also de-interleaving of single channel audio from stereo
streams was no longer supported.

I have changed the input strategy to de-interleave the incoming
sample stream into an intermediate buffer large enough to hold all the
samples required for a single unit of processing (one basic waterfall
interval) and apply the down-sampling filter to the whole intermediate
buffer just prior dispatch to the FFT generator.

This now means that we are now using the ubiquitous 48kHz hardware
sample rate for both input and output of audio across all platforms
and decoding a single channel of a stereo stream is again
supported. The down-sampling to 12kHz is done with a high quality FIR
49-tap low pass filter specifically designed by Joe (K1JT) for
operation in a 4kHz bandwidth.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3585 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-28 18:34:27 +00:00
Murray Curtis
a7c36b7d5a 1. Fix for the locator being truncated on double click when the call was unexpectly long
2. Removed commented code left over from previous edits in MainWindow::doubleClickOnCall()



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3584 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-28 03:56:43 +00:00
Bill Somerville
bc99eb2061 Changed Detector to only pass multiples of 4 frames to
48kHz to 12kHz down sampler routine.

Added assert to disallow stereo processing of i/p samples
until fil4.f90 can deal with interleaved stereo streams.

Added QProcess error to jt9 error handler, not that anything
is done with the error code yet but at least it can be examined
in the debugger if required.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3583 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-28 00:58:36 +00:00
Joe Taylor
de98c4114e Update Makefile.linux.
Please note that I removed the option "-mno-stack-arg-probe" from CFLAGS.
Was there any good reason for it still being there?


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3582 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 18:37:37 +00:00
Joe Taylor
24d74ac8cb UPdate the makefiles so they will compile fil4.f90
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3581 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 15:47:34 +00:00
Bill Somerville
a49c4dd704 Added fil4.f90 to CMake script.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3580 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 15:46:26 +00:00
John Nelson
e875987e4b Inadvertently removed G4WJS fix in r3571. Replaced
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3579 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 15:07:28 +00:00
John Nelson
73f4dade44 Bump Rev in mainwindow.cpp
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3578 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 13:59:09 +00:00
John Nelson
f35913f34c Changes for 48000 Hz Audio in samplerate
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3577 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 13:57:48 +00:00
Bill Somerville
b1378a3a86 Added tuning parameters for audio subsystem.
By adding the following section to the initialisation file the audio buffer
sizes and audio thread priority may be adjusted.

[Tune]
Audio\InputBufferFrames=1200
Audio\OutputBufferMs=1000
Audio\ThreadPriority=4

The values above are the program defaults that will be used if the
initialisation parameters are omitted.

Thread prioritis are the QThread::Priority enumumeration values.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3576 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-27 01:06:23 +00:00
Bill Somerville
6cc4255e87 Commented out input sample buffer zeroing.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3571 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-19 16:53:47 +00:00
Joe Taylor
5da6167e13 1. Remove several obsolete palette files.
2. Clear the "Name" field after logging a QSO.
3. Add fil4.f90, a subroutine for downsampling from 48000 Hz to 12000 Hz
sample rate.  (Not yet incorporated in WSJT-X, but intended to be called 
from arounf line 51 in Detector.cpp.)
4. Minor updates to User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3570 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-13 13:42:11 +00:00
Murray Curtis
2d696730b1 Moved code that writes to the ADIF log from logqso into logbook/adif
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3569 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-06 05:00:28 +00:00
Edson W. R. Pereira
6f9d869baf Forcing revision update.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3568 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-04 18:56:34 +00:00
Edson W. R. Pereira
21b1c2670f Change DNS loopup to slot in PSK Reporter class.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3567 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-04 18:55:38 +00:00
Edson W. R. Pereira
caf67fb701 Added code to hangle DNS loopkup failures in PSK Reporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3566 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-09-04 17:14:18 +00:00
Murray Curtis
72f90c7d25 removed jtcom_.nagain from blank line separator logic
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3565 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-30 01:08:10 +00:00
Murray Curtis
13dba2b1ba 1. Decoded text should now remain left justified even if the font is too large for the window
2. The main window can be expanded wider to allow those with large screens to use larger fonts
3. New class DecodedText handles the formatted text from decoder.f90.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3564 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-25 01:48:45 +00:00
Bill Somerville
0a67803476 Moved audio input to the audio thread.
Change source URLs in teh CMake scripts for the kvasd binaries.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3563 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-17 19:21:14 +00:00
Joe Taylor
babb07cce0 Somehow the relative positions of readSettings() and the "kllbyname"
block got inverted, preventing multiple instances from working.  
It's fixed now.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3562 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-17 18:55:31 +00:00
Bill Somerville
9021a34288 Fixed issue with working directory path containing spaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3561 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-17 12:49:28 +00:00
Bill Somerville
36691cb1e7 Better attempt at fetching the correct kvasd binary from the SVN
repository in the CMake scripts.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3560 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-17 12:29:10 +00:00
Bill Somerville
94e6348230 Adjusted CMake scripts for source file changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3559 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-17 12:26:14 +00:00
Bill Somerville
4bed627fd8 Fix a typo in class name.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3558 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-16 23:31:19 +00:00
Bill Somerville
bf90f2042a Moved instantiation of PSK_Reporter object to MainWindow constructor
initialisation list to avoid a null pointer issue in restoring the
settings on startup.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3557 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-16 23:24:48 +00:00
Joe Taylor
76ead6b071 Remove several unused files, and update Makefile.linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3556 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-16 17:13:07 +00:00
Murray Curtis
b7284c185a Adjust proportions between text windows if displaying DXCC
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3555 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-16 10:25:28 +00:00
Bill Somerville
ee4ae6589e More complete CMake install target including sample WAV files from
SVN, user manual and, HRD Interface runtime on Windows.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3554 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-16 00:24:32 +00:00
Bill Somerville
04aabda7d9 Added HRD Interface runtime library.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3553 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-15 23:48:02 +00:00
Joe Taylor
b831d1e08e 1. Add the sample files described in the User's Guide.
2. Remove offending redefinition of "struct timezone" in timeval.h, it's
no longer needed.  (Let me know if this breaks anyone's build procedure!!)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3552 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-15 20:55:05 +00:00
Joe Taylor
9ab51fd8eb Changes from G4KLA, required to make latest code play on MacOSX.
It's necessary to convey "appDir" from the GUI to jt9, so that jt9
can find the .lock and .quit files.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-15 17:32:46 +00:00
Murray Curtis
4bade4865d 1. Only the left 'band activity' display has DXCC and worked B4 status
2. Moved some of the text handling code from MainWindow to Displaytext


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3550 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-15 12:24:12 +00:00
Bill Somerville
4e17c5ffaa Get correct kvasd.exe during Windows install.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3549 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-14 16:57:53 +00:00
Bill Somerville
97bc017ad9 Initial commit of a CMake script to build wsjtx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3548 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-14 11:31:49 +00:00
Joe Taylor
4e0032ca8e Oops! It seems that I mistakenly inverted the gain slider control for
audio input.  It's fixed now.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3547 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-12 13:43:45 +00:00
Joe Taylor
d06f0d88af Remove PSKReporter.h, it's no longer used.
Make the two sliders on main window have similar appearance.
Remove unused #ifdef block.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3546 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-11 13:31:51 +00:00
Murray Curtis
e2d1898a3f 1. Moved font width calc for DXCC enitity display from LogBook to DisplayText.
2. The available character count is now updated by catching resizeEvents


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3545 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-11 11:45:17 +00:00
Bill Somerville
073e3c0679 Bugfix: DevSetup was not filling the sound output combo box correctly, causing the current setting to be changed without user input.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3544 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-11 02:35:44 +00:00
Bill Somerville
c05689944a Bugfixes:
Detector no longer collects samples when transmitting or not
monitoring. This was causingissues with the waterfall after tx periods
and was a waste of CPU cycles.

Correct the missing window title on the waterfall window.

Stop and restart the output audio stream if the configuration of
device or channels changes in the setup dialog. This defect was
causing spurious transmissions after changing configuration.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3543 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-11 01:30:05 +00:00
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
Joe Taylor
67f19ac73f Sorry, r3540 introduced a bug that preventer JT65 decoding in some
situations.  It's fixed now.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3541 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-09 23:11:05 +00:00
Joe Taylor
a8acd97f42 1. Correct bug that prevented save/restore of Wide Graph geometry.
2. Fix jt9 so that decoding starts at fStart (which now may be non-zero).
3. Improved or new Tool Tips for some GUI controls.
4. Updates to User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-09 17:22:08 +00:00
Murray Curtis
84a8696f22 Calc chars available when adding DXCC entity to decoded text line
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3539 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-09 03:17:04 +00:00
Murray Curtis
c0ce066408 Logbook:
-changed log to hash table for faster lookup
  -improved ADIF compatibility
mainwindow.ui
  -fixed typo in menu entry



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3538 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-08 23:51:53 +00:00
Joe Taylor
f70a09cb98 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
af91bbfb67 Updates to User's Guide for Version 1.2.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3536 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-08 17:45:10 +00:00
Joe Taylor
a114b8c9ea 1. Capitalize names of palettes appropriately.
2. Remove (or comment out) most qDebug() statements.
3. Swap positions of labels 2 and 3 on status bar.
4. In "Split Tx" mode, transmit audio always between 1500 and 2000 Hz.
5. Rearrange positions of WideGraph controls.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3535 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-08 14:26:53 +00:00
Joe Taylor
47c4245984 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
Bill Somerville
be6f085104 Bogus line removed.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3533 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-07 23:16:08 +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