Commit Graph

220 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
5af0f6880f Change Makefile.MinGW to use my qt5.0.2 paths. Yours may be different!
The old Makefile.MinGW has been renamed Makefile.MinGW.qt4.
Be sure to check settings in lines 13-19 of wsjtx.pro.

Soon to come: Permanent changeover from PortAudio to QAudio ?



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3521 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-02 19:52:25 +00:00
Joe Taylor
34a7d4befa Makefiles should create EXE_DIR if it does not exist.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3503 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-25 18:12:03 +00:00
Joe Taylor
f932f2a1da Wrong version of ipcomm.cpp was saved?
Running multiple instances now checked out in Linux, as well as Windows.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3496 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-19 00:44:48 +00:00
Joe Taylor
fb7948a836 Full activation of "Multiple Instances", thanks to some code by
Josh Rovero, KK1D.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3495 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-19 00:23:40 +00:00
Joe Taylor
8f3c9a672b Further optimizations of the decoders, and some code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3492 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-17 19:13:36 +00:00
Joe Taylor
f10ef57c7d 1. Double-click on a yellow Tx message should not copy the message again,
and if CTRL is held down it should set Tx as well as Rx freq.  Fixed.
2. Improve the logic for suppressing duplicate JT65 decodes.
3. Disable the "Advanced" item on Setup menu.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3491 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-17 14:18:18 +00:00
Joe Taylor
ac44bacd91 1. Allow waterfall window to have smaller height.
2. Speed improvement in JT9 decoder.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3488 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-16 18:17:20 +00:00
Joe Taylor
600c3e228c Apply sigital gain slider to spectra sent to waterfall.
Update the User's Guide.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3477 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-10 15:46:27 +00:00
Joe Taylor
ecfc15f3e4 Add calls to timer().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:22:25 +00:00
Joe Taylor
bfe9e49e03 Clean up two warning messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3469 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-09 16:05:23 +00:00
Joe Taylor
0f9dc17a8f Remove qDebug() statements.
Use ptt_() function included in getfile.cpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-07-08 23:32:20 +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
207116f574 1. Implement PTT control via HRD.
2. Fix two more g95 compiler warnings.
3. Remove some unused code in getfile.cpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3305 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 14:52:51 +00:00
Joe Taylor
bfef326b25 Oops! Add jt9b.f90
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3304 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 14:44:36 +00:00
Joe Taylor
f95ab994c0 Eliminate all compiler warnings from gfortran, in Ubuntu 12.04.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3301 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 13:33:29 +00:00
Joe Taylor
e3921407bd 1. Forgot to add the code for jt9c.f90, which was separated from
jt9a.F90 in order to suppress a compiler warning.
2. Updated Makefile.linux.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3300 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 12:45:33 +00:00
Joe Taylor
d9d9047cb0 Clean up all g95 compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-23 01:05:37 +00:00
Joe Taylor
3699ac36bf Some minor code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3298 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 20:21:38 +00:00
Joe Taylor
bfcbce34a7 Convert all *.f files to *.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3296 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-22 15:39:28 +00:00
Joe Taylor
b226f532d4 1. Dashed line between decoding periods.
2. Tweak four2a for compilation on 64-bit systems.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3287 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-21 11:43:01 +00:00
Joe Taylor
9890731f4f 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
6646005f20 Preparing for more tests of JT9 decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3282 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-17 19:35:29 +00:00
Joe Taylor
8f9e5283a2 Removed red3, was not useful.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3280 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-17 15:16:29 +00:00
Joe Taylor
a75430865e Diasble diagnostic writes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3278 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-17 01:35:36 +00:00
Joe Taylor
2ccb9206b0 1. Remove the "color highlight left window" option.
2. Re-establish the pxdb measurement for Thermo.
3. Double-click on decoded line copies it to QSO window (unless it's 
   already there).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3276 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-16 23:52:04 +00:00
Joe Taylor
7cb0731dc6 Reduce ntol.
Add "red3" (but not yet using it).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3275 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-16 19:01:16 +00:00
Joe Taylor
057287fab1 Many changes to the procedures for selecting decodable candidate JT9 signals.
This code may be the new benchmark?


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3274 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-16 16:02:00 +00:00
Joe Taylor
1f82d75194 Change to symspec() was not a good idea.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3273 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 19:45:55 +00:00
Joe Taylor
1fc406b8a0 Remove diagnostic prints.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 19:13:31 +00:00
Joe Taylor
9d30c88a6f Another try at optimizing choices for decoding. Not done yet!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3271 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 19:03:49 +00:00
Joe Taylor
bd103459f1 Added routine "chkss2" to test sync vector for sanity before attenpting
Fano decode.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3270 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 15:17:36 +00:00
Joe Taylor
85af134fd1 More (temporary) adjustments to decode parameters.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3269 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-15 11:37:25 +00:00
Joe Taylor
cba66a9242 Move Tune button to right of "Halt Tx".
Tweak decoding parameters in sync9.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3268 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-05-14 22:47:32 +00:00
Joe Taylor
f195dda223 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