Commit Graph

1778 Commits

Author SHA1 Message Date
Joe Taylor
2aa42f0414 Minor tweaks in JT9 decoder.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4989 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-24 20:19:04 +00:00
Bill Somerville
4933a30546 Clean up program identification to pskreporter and other places
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4987 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-23 15:19:41 +00:00
Bill Somerville
0f72c3fd9b Abandon getting changeset revision number from svn keyword expansion
Subversion keyword expansion of $Rev:$ in  a file is hopeless as it is
impossible to  coordinate with  a release. Revert  to an  empty string
when it can't be discovered with svn info etc..

Further changes to the way verion and revision numbers are generated

Local builds from  source tar balls or the  two phase wsjtx-superbuild
no longer specify  any revision, just the version  number. Since these
sort  of builds  are  expected  to be  release  candidates or  release
versions the revision (svn changeset  number) is implicit from the svn
tag of the version.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4986 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-22 00:20:42 +00:00
Bill Somerville
b79456ed1b Look in the right place for temporary files
decoded.txt was not being deleted after a full activity window erase.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4982 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-21 20:13:28 +00:00
Bill Somerville
c718bfd2fd Use full device path for serial port names
Except  on Windows  where  the  obscure \\.\  device  root is  removed
because Windows users will not be used to it.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4978 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-19 15:18:47 +00:00
Bill Somerville
b844593080 Update INSTALL file with new Qt dependency
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4977 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-19 13:02:19 +00:00
Bill Somerville
1453ed6f35 Populate serial port lists with available actual devices
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4976 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-19 12:26:36 +00:00
Bill Somerville
0df477c717 Make check for non-working split query more general
Some Hamlib  back ends clain to  support split queries but  they don't
work. The existing code to only try  a split query once per session if
it fails  has been extended to  any error from Hamlib  returned from a
split query.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4972 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-18 22:29:47 +00:00
Bill Somerville
7fd12effae Make some obvious abbreviations in DXXCC country names
To keep the decoded text lines to a minimum length suitable for screen
display  some obvious  abbreviations have  been applied.  Also as  the
lines  may now  extend  to  the right  with  a  horizontal scroll  bar
appearing when necessary the country names are not truncated any more.

Users still have the option to provide their own tailored cty.dat file
if they wish.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4970 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-17 18:42:00 +00:00
Bill Somerville
a1f88cfb34 Yet more settings window layout adjustments for the best Mac layout
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4969 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-16 22:56:13 +00:00
Bill Somerville
26bd666734 More settings dialog window layout tweaks to improve Mac user experience
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4968 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-16 22:39:39 +00:00
Bill Somerville
25bdad573f Tweak settings window layout to work better on Macs
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4967 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-16 22:08:54 +00:00
Bill Somerville
13afca4488 Stop accumulating baseline samples when there are too many
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4966 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-15 19:20:11 +00:00
Bill Somerville
9a8521d2d4 Add a progress dialog to show that FFT optimization is doing something
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4965 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-15 00:48:38 +00:00
Joe Taylor
efeb157d94 Minor tweaks to how decoder statistics are compiled and displayed.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4964 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 20:25:49 +00:00
Bill Somerville
ec6847ff00 Enhanced Mac build instructions
Mac builds require  that Qt be built from sources  since the binary Qt
package is built  against the clang libstdc++ C++  support library and
we need it built against the more modern libc++ C++ support library.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4963 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 19:44:25 +00:00
Bill Somerville
3a968ace7d Reorder CMake commands to fix Mac build error
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4962 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 18:54:29 +00:00
Bill Somerville
701911ac9c Minor timer clean up
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4961 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 16:55:57 +00:00
Bill Somerville
8956b53453 Use the OpenMp parallel decoding jt9 in WSJT-X
The temporary  development version  of jt9 called  jt9_omp is  now the
default jt9. This means that parallel  decoding of JT65 and JT9 is the
default on platforms that support  OpenMP.

If parallel decoding is not required or desired, it can be constrained
by setting the environment  variable OMP_THREAD_LIMIT=1.  In dual mode
operating this will deliver all decodes of the current mode before any
decodes of the  other with the potential impact of  taking up to twice
as long to finish decoding.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4960 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 16:55:47 +00:00
Bill Somerville
7172533282 Make cursor an arrow pointer in activity widgets
The change  to use  QTextEdit in  read only mode  cause the  cursor to
become an I-beam type, this changes  it to the arrow pointer type that
the previous QTextBrowser used by default.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4959 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 15:38:46 +00:00
Joe Taylor
93f918a451 Add decoder statistics to timer.out.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4958 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 14:22:54 +00:00
Bill Somerville
127c633a97 Bring colour settings into line with general configuration strategy
Colours behave  like other  configuration items  and changes  are only
applied when the Settings UI is dismissed via the "OK" button.

Simplified font settings and use  style sheets consistently to set the
application and decoded  text fonts. This is necessary  because any UI
widget that  has a style  sheet applied does not  honor a font  set by
QWidget::setFont()  even if  there is  no  font setting  in the  style
sheet, this is broken behaviour IMHO  but that is the way Qt currently
works.

Use a  style sheet to style  the frequency display and  clock. This is
necessary to  allow fonts to  be cascaded through parent  style sheets
and still be overridden on these widgets.

Simplify  the decoded  text  widgets,  there is  no  need  to use  the
QTextBrowser  as a  super class  since  the simpler  QTextEdit set  as
read-only is sufficient. Also removed  colour setting via a background
brush  as it  doesn't  work  and the  HTML  'bgcolor' attribute  works
correctly.

Change  to  UI  properties  of  the  decoded  text  widgets  to  allow
horizontal scrolling if required, this  allows larger fonts to be used
without truncating decoded messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4957 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-13 08:53:02 +00:00
Joe Taylor
ebca33890b Open Configuration.ui an tab 0.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4956 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-11 21:25:52 +00:00
Joe Taylor
e338773e08 Minor GUI tweaks.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4955 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-11 18:20:07 +00:00
Joe Taylor
58947b7865 Another step wider.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4954 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-11 14:09:48 +00:00
Joe Taylor
bb725dfbcc Make color-select buttons wider, for better fit to Linux fonts.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4953 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-11 14:04:45 +00:00
Bill Somerville
6780563a07 Added commentary to the Configuration module
Description and instructions to help those adding or amending settings
values.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4952 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-11 11:57:40 +00:00
Joe Taylor
a93e55fef0 Improved, simplified sort routine; faster and better "flatten"
procedure; better window functions for some FFTs, resulting in
better decoder performance; User-selectable colors for backgrounds
of decoded messages.  NB: more testing is desirable!



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4951 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-11 00:50:35 +00:00
Bill Somerville
88bbb988ef Fix CMake link flags for OpenMP on non-Mac platforms
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4950 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-10 14:18:02 +00:00
Bill Somerville
f58656984c Add more decoding parameters to jt9 command line program
Options have been added to control frequency cut off values, mode and, Tx mode.

The comand line parser now has optional long option names and usage help.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4949 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-10 14:04:54 +00:00
Bill Somerville
f59dc6d089 Ensure prompt output of decoded messages
Outputo buffer flush commands have been added after each decoded message output
to ensure that other processes get timely updates of newly decoded messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4948 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-10 14:04:47 +00:00
Bill Somerville
52e2beb320 Adjust CMake script for OpenMP on Mac
The native Mac C/C++ compilers (Clang) do not support OpenMP so CMake by
default disables OpenMP for the project since it requires all project compilers
to support it. This means that we have to hack the build script on Mac to
compile the Fortran sources with OpenMP turned on and manually link in the
required OpenMP run time support to the executables.

This hack presumes that the Fortran compiler on Mac is gfortran.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4947 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-10 14:04:38 +00:00
Joe Taylor
3fdde76420 The "big FFTs" should be computed only once for each new set of Rx data.
This requires setting newdat=0 after the big FFT is computed.  In the OMP
code this must be done separately for each mode; so new variables newdat9 
and newdat65 have been defined.  Both are set to "newdat", the value
forwarded from the GUI, each time jt9[_omp][.exe] goes into action. 


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4946 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 15:07:31 +00:00
Bill Somerville
004a604cde Fix defect in timer call chain maintenance
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4945 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 11:56:22 +00:00
Bill Somerville
90940a4eac Use correct type for FFTW3 argument
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4944 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 11:10:28 +00:00
Bill Somerville
f68e6f289f Correct compile error
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4943 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 10:53:48 +00:00
Bill Somerville
127f72f3ad Remove redundant copy of large array in JT9 decoder
Also moved  the same large array  from stack to heap  which along with
other prior  changes now allows  the Windows jt9 OpenMP  executable to
run with a default stack size again.

This also removes a crash on the Mac version which was probably due to
excessive stack usage.

Net result is an even faster JT9 decoder.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4942 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-08 09:53:20 +00:00
Joe Taylor
c86f37cade Another instance of variables needing to be saved explicitly between
calls to a subroutine.  I believe this fixes the known outstanding decode
issue.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4941 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-06 18:44:45 +00:00
Bill Somerville
d1a1510fc8 Make output arguments of decoders shared between threads
This is only a temporary fix  becuase if both decoders were to produce
results  that need  accumulating  e.g. number  of  decodes, then  more
complex code to merge the results would be needed.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4940 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-06 16:34:26 +00:00
Joe Taylor
b01fb32aea Some variables now need to be saved explicitly to maintain value
betweek subsoutine calls.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4939 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-06 15:18:38 +00:00
Bill Somerville
f60c2e19c5 Fix compiler detection on Mac OS X
Set the CMake variables CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET
must be set before the project() command since they can effect compiler
detection and capability tests.

Only use the -stdlib=libc++ option on Mac OS X when using Clang tools.
On other platforms with Clang tools libc+ is not currently the best choice.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4938 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-06 14:37:10 +00:00
Bill Somerville
1271243952 Thread safe lib/timer.f90
Accounts for each traced call per thread and accumulates by rolling up
calls with an identical call chain before printing the statistics. The
print now accounts for function calls  in their call chain so the same
function will be reported more than  once if it is called in different
places.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4937 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-05 22:07:19 +00:00
Joe Taylor
6582f5410c Increase JT65 decoding depth at QSO frequency.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4936 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-05 17:43:43 +00:00
Joe Taylor
5de52a2516 Better to set nflatten=0 here, for command-line speed tests.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4935 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 21:42:49 +00:00
Joe Taylor
06c83c580d Make array sizes in downsam9 consistent with the new big FFT length.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4934 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 21:26:58 +00:00
Bill Somerville
01626eeaa3 Only use >1 thread for the biggest FFTs
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4933 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 20:52:42 +00:00
Joe Taylor
73a69499e4 Make the symspec() call in jt9.for consistent with that from mainwindow.cpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4932 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 19:52:37 +00:00
Bill Somerville
36ad50735b Fix typo that disabled JT65 decoding in dual mode.
Disable timer.out generation in OpenMP builds as it is broken.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4931 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 16:33:45 +00:00
Bill Somerville
a7c4d1001f Adjust the jt9 decoder to do the right decodes in parallel
Also limit the required threads for parallel decoding to 2.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4930 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 15:34:46 +00:00
Joe Taylor
c7faf40d34 Need space for more calls to timer().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4929 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-02-04 15:05:39 +00:00