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
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
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
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
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
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
More detailed message to come, with comparative timing statistics.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4926 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This change introduces the program jt9_omp which is a testbed for a
multi-threaded version of the jt9 decoder program. The program jt9_omp
should be a directly substitutable for jt9 except that JT65 and JT9
decodes are computed in parallel.
Also enable the OpenMP directives in decoder.f90 - note this is not
yet a working multi-threaded decoder and the existing jt9 is still the
correct decoder to be used in WSJT-X.
Increased the available stack size for jt9_omp.exe as this is a hard
limit on Windows and the default is not big enough for the OpenMP
version of jt9.
Also Fortran array bounds checking is now disabled for Release
configuration builds so as to improve performance a little.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4922 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The long FFTs can now use the multi-threaded FFTW routines.
Subroutine decode9.f90 was renamed jt9fano.f90.
The JT9 decoder's top-level functions were removed from decoder.f90
and put into a separate subroutine decjt90.f90.
Subroutine decoder.f90 is now configured for possible use of OpenMP
SECTIONS, with the JT9 and JT65 decoders running concurrently on
a multi-core machine. Note, however, that this concurrent processing
is not yet fully implemented. Probably calls to timer need to be removed;
some variables used in calls to jt65a and decjt9 may need to be
declared PRIVATE in decoder; some sections probably need to be declared
CRITICAL; probably some SAVE statements in downstream routines have
made them not thread-safe; etc., etc.
I'm a neophyte at using OpenMP. Comments, suggestions, and/or tests by
others will be welcome!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4919 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
New command-line option for jt9: [-m nthreads]. Default is nthreads=1.
Also refactored a loop in filbig.f90 that was taking far too much
time.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4916 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The kvasd binary need only be downloaded if the MD5 hash for it has
changed.
Also fixed a defect in the status check of the MD5 hash download.
Also switched to HTTP protocol as it is quick and gives clearer error
messages.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4830 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The rigctl program is not used directly by WSJT-X but it does contain
the same Hamlib code from the Hamlib v3 fork as WSJT-X and
rigctld-wsjtx. So it makes sense to distribute it as a testing tool or
for any user that needs it to converse with the rigctld-wsjtx server.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4775 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Pass the temporary directory to jt9 and use it to give the correct
paths to temporary files. Also jt9 passes the absolute path to
kvasd.dat in the temporary directory to kvasd.
Clear out all the annoying cruft that has accumulated due to having to
run with $CWD as the temporary directory.
Use QStandardPaths to find the writable data directory where needed
rather than passing it around between objects. This now works because
the $CWD hasn't been changed.
Do away with the CMake option WSJT_STANDARD_FILE_LOCATIONS as it is no
longer needed.
Fix astro status file azel.dat formatting.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4732 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
To comply with the WSJT_X GPL v3 license, the closed source KVASD
executable must be delivered separately and optionally to end
users. To facilitate this a new install option has been added to the
Windows installer to install KVASD by downloading it at install
time. The installer first downloads the KVASD EULA from the Internet
and presents it to the user for reading and agreement. If agreement
is given the KVASD binary is downloaded from the Internet and
checksummed using an MD5 hash, if that passes, it is installed along
with WSJT-X. An uninstall record is also written to ensure that, if
installed, KVASD will be un-installed if WSJT-X is un-installed.
To facilitate this enhancment to the NSIS installer the standard CPack
NSIS installer script template has been overridden with a project
specific version. This version also implements the more modern and
recomended nsDialogs mechanism for installer custom page construction
including the install options page. See CMake/Modules/NSIS.template.in
for details and CMakeCPackOptions.cmake.in for usage in this
installer.
Merged from branch wsjtx-1.4.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4663 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Also complete the wrapper code in wisdom.c.
TBD: should be possible to use fftw3f.f03 instead of the ad hoc wisdom.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4617 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
To allow personal builds on Mac OS X on 10.7 where no 10.9 SDK is
available, the key options have been made CMake ached variables so
that they may be overridden at configure time.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4585 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
In order to support the WSJT-X super build in LOCAL mode the location
of the User Guide needs to be specified.
A CMake cache variable WSJT_MANUAL_DIRECTORY has been added to allow
the URI of the User Guide directory to be specified at configure time.
The default value remains as the project web site.
Merged from branch wsjtx-1.4.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4566 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
CMake v3 complains about missing dependencies so the manpages
dependency must not be added to the wsjtx target unless it exists.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4564 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The debian target was being added as a dependency to teh wsjtx target
even when it doesn't exist. This isn't allowed in CMake v3 so it no
longer added if it doesn't exist.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4562 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The minimum OS X version supported and SDK selection compiler options
were not being set for Fortran compiles on Mac.
As CMake 3.0.2 is the current release the facilities obsoleted by
CMake 3.0 have been removed. This also entails making CMake 2.8.10 the
minimum supported version.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4560 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The normal way to view console output from a Windows GUI application
(i.e. with a WinMain entry point) is to attach a debugger which will
then receive the application console output in its own console.
If it is required to build wsjtx.exe as a console application it may
be done by setting the new WSJT_CREATE_WINMAIN CMake option to
OFF. This option is only available for Debug configuration builds to
avoid accidental shipping of non-Debug configuration builds as a
console application.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4555 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The DMG volume name must not change between versions as it invalidates
the .DS_Store file backgound image.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4548 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Routine packmsg now tries the shortlist (Type 1 prefix or suffix) first.
Then it tries to to make a valid message using a Type 2 prefix or suffix.
If both fail, it packs the first 13 characters as a free-text message.
The GUI now generates the most useful messages with compound callsigns
of all valid types.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4533 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The justified text in the project description caused many unwanted
hard line breaks when viewed in Debian package install tools.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4512 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
Debian packages are only build if dpkg-buildpackage is available and
RPM package generation is only done if rpmbuild is available.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4504 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The kavasd binary is not open source so cannot be automatically
bundled with WSJT-X on Linux.
The CMake option WSJT_INCLUDE_KVASD has been added with a default of
OFF in Linux Release configuration builds.
Merged from wsjtx-1.4 branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4498 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
An ambiguity existed between release candidates and development
versions as there was no definitive identification for development
versions.
Added a new version number suffix of '-devel' which appears if the
release candidate number is missing or zero in Versions.cmake and the
revision is not marked as a release version, also in Versions.cmake.
Also re-factored setting of version number suffiexes to a single place
in in CMake/VersionCompute.cmake.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4422 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This was generated in error by selecting one of the source CPack
generators as a default.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4408 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The *nix package generators do not include the target architecture in
the package file names.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4382 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
The location of documentation files on Linux distributions is
controlled to a certain extent. Using the QStandardPaths::locate()
method helps us with this.
Work round the misbehaviour of QCoreApplication::applicationDirPath()
when the CWD has been changed by working out the documentation
location before changing the CWD to a temporary directory. This path
is now provided by the Configuration settings class which also manages
other run time paths.
Updated Debian packaging to move a little nearer a conforming DEB
file.
Added a basic manpage for rigctld-wsjtx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4364 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
So that a manual can be viewed without an Internet connection a second
manual action has been added to the WSJT_X help menu. This shells out
to the default web browser with a local file target.
The build has been enhanced to install and package the current version
of the HTML user manual as downloaded from the project web site at
build time
The package file locations have been adjusted to be compatible with
the QStandardPaths class so that its locate() method can be used to
portably access resources like this local help file
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4359 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
