Commit Graph

2188 Commits

Author SHA1 Message Date
Bill Somerville
806b968a42 Add rigctl to WSJT-X package as rigctl-wsjtx
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
2014-12-06 16:45:57 +00:00
Bill Somerville
a5d7793c25 Mac KVASD-installer, don't lock in temporary directory location
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4766 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-05 23:11:15 +00:00
Bill Somerville
044277c225 Mac KVASD-installer - Add download retry mechanism and improve error reporting
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4762 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-05 19:39:35 +00:00
Bill Somerville
f8c5bcf69a Mac KVASD-installer - use a user specific temporary directory
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4760 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-05 17:46:20 +00:00
Bill Somerville
c938a0bd89 Correct Mac OS X version portability settings for KVASD-installer
Disable drag and drop target selection in KVASD-installer

The Mac KVASD-installer running on OS X 10.7 crashes when trying
to process a target selected by drag and drop. Due to issues
debuging issues on 10.7 with Xcode 4, I have disabled the
feature since there is an alternative mechanisim available.

Merged r4754 & r4756 from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4757 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-05 15:37:24 +00:00
Bill Somerville
f37ed4cd78 Take advantage of the new KVASD v1.12
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
2014-12-03 00:06:54 +00:00
Bill Somerville
c7e74af254 Add a header to the build stating architecture being built for
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4731 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-03 00:06:37 +00:00
Joe Taylor
aeacca68a9 Correct the placement of vertical grid lines when start freq is nonzero.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4717 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-12-01 21:38:48 +00:00
Bill Somerville
f8e51d4e62 Keep UI in line with messages when clicking F4
When tab 2 is  current the action of F4 is to set  the next message to
transmit the standard

Merged  from branch wsjtx-1.4.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4693 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-29 20:35:58 +00:00
Bill Somerville
2b614fd9e2 Don't keep querying split status on rigs where it doesn't work
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4691 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-29 18:15:05 +00:00
Bill Somerville
eaea408189 Specify the Qt version required
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4689 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-29 13:57:36 +00:00
Bill Somerville
89db57e6f0 Licence file name changed
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4683 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-29 00:18:04 +00:00
Bill Somerville
7377e53dfc Add THANKS acknowledgements file to installed files
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4680 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-29 00:04:53 +00:00
Bill Somerville
118638a783 Top level docs added to installed files
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4678 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-28 23:45:21 +00:00
Bill Somerville
4d8170f48a Top level docs
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4677 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-28 23:34:23 +00:00
John Nelson
e633328ada Update Mac shared memory system file
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4671 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-28 15:50:38 +00:00
John Nelson
dca70996fb Update Mac installation guide
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4670 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-28 15:49:47 +00:00
Bill Somerville
8f26544380 Fix line endings on Mac text files
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4667 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-28 14:29:46 +00:00
Bill Somerville
46064e3af3 Add on-line KVASD install to Windows NSIS installer
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
2014-11-27 17:17:19 +00:00
Bill Somerville
8e806c7201 Mac KVASD installer
Merged from branch wsjtx-1.4.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4661 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-27 15:31:31 +00:00
John Nelson
c0baed3f21 Update Mac installation guides for OSX 10.0
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4658 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-27 13:20:26 +00:00
Joe Taylor
8ceeb501b4 Fix a longstanding bug in "on_addButton_clicked()".
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4647 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-25 14:39:15 +00:00
Joe Taylor
e8c59114db Update the linux Makefile for qmake/make builds.
Minor correction for wsjtx man page.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4635 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-24 14:54:47 +00:00
Bill Somerville
99784dfd61 Use the generic icons in the Mac OS X generic iconset
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4634 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-23 13:47:50 +00:00
Bill Somerville
4b6b2098e6 Artwork updates
New Mac OS X icon set for generic WSJT uilities.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4632 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-23 13:35:16 +00:00
Bill Somerville
856f1ecc77 Increased minimum size of Settings window
Several users  have reported missing parts  of the Settings UI  due to
the window starting up too small. This shouldn't be possible since the
Qt layout  manager should  expand the  window but  it doesn't  seem to
always get it right.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4627 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-22 02:16:48 +00:00
Joe Taylor
ac7e565f18 Silence compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4623 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 22:10:25 +00:00
Joe Taylor
021f677687 Add wisdom for the FFTs done by symspec_(), wsjtx[.exe].
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
2014-11-21 15:17:22 +00:00
Joe Taylor
20ded259d8 Decode from disk sets npatience = 2.
This means that the first decode from a saved data file will be slow,
but the saved wisdom for the decoded mode(s) will be better than
for the default npatience = 1.  All subsequent decodes in the same 
mode(s) will take advantage of the newly saved wisdom.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4616 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 01:40:24 +00:00
Joe Taylor
2bc824b4a5 Try a home-made wrapper for fftwf_export_wisdom_to_filename().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4614 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-21 00:44:50 +00:00
Joe Taylor
c5d053dfa7 Should have been included in previous commit.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4611 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-20 19:01:52 +00:00
Joe Taylor
3a5edb5af5 FFTW wisdom is now built into jt9[.exe].
New optional argument to jt9: -w patience
Default is patience = 1

Example timing measurements for 130610_2343.wav:

patience  plan   execute
          (s)      (s)
-----------------------------------------------
   0      0.01     1.25  FFTW_ESTIMATE
   1      0.69     1.25  FFTW_ESTIMATE_PATIENT
   2     16.97     1.15  FFTW_MEASURE
   3    390.88     1.15  FFTW_PATIENT

Conclusions, consistent with expectation based on past experience
with similar FFTs:
  - First decode (in each mode) with patience = 2 is slow.
  - Speed advantage of patience = 2 is small but measurable.
  - No measurable advantage in using patience > 2.

Present mainwindow.cpp has "-w 1" hard-wired.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4610 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-20 18:48:53 +00:00
Joe Taylor
b3f4432f67 Correct the logic for negative-frequency index into new ca array.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4609 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-19 20:17:15 +00:00
Joe Taylor
f07a960e2d Several decoder optimizations, including implementation of FFTW wisdom.
Notes:
1. Equivalents of wisdom1.bat will be needed for *nix and OS X.  (The
   version now added to the source .../lib directory is an example only.)
2. Installers should offer to run the wisdom1[.bat] script at installation
   time.
3. wisdom1[.bat] and fftwf-wisdom[.exe] must be installed in .../bin directory 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4607 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-19 17:23:57 +00:00
Bill Somerville
deb94dde78 Make Mac OS X portability and compatibility options overridable
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
2014-11-04 20:59:51 +00:00
Bill Somerville
1cf6756138 OmniRig interface fixes
Split mode  was inadvertently disabled  in a prior change  to disallow
split mode on the "None" rig.

Allow OmniRig to report a rig offline  status for up to 5s since short
periods of "rig  not responding" seem to happen regularly  for no good
reason.

Use  high level  OmniRig SetSimplexMode()/SetSplitMode()  functions to
initialize rig.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4578 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-11-01 22:34:44 +00:00
Bill Somerville
3b43a18362 Fix various fake split mode issues
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4573 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-30 22:03:04 +00:00
Joe Taylor
4fea8ebd0c Optimizations of JT9 and JT65 decoders; change clock in timer routine.
Both decoders now have slightly better performance and faster
execution.  The rare "duplicate decodes" in JT9 were eliminated.
On Windows, at least, calls to f90 routine system_clock() do not
provide correct wall time increments.  Changed to using secnds()
instead.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4571 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-30 19:29:16 +00:00
Bill Somerville
7ef6688869 WSJT-X User Guide location variable
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
2014-10-29 13:25:34 +00:00
Bill Somerville
2bac856a5b Fix missing manpages dependency
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
2014-10-28 10:51:28 +00:00
Bill Somerville
b2e34418df Fix missing target
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
2014-10-28 01:00:46 +00:00
Bill Somerville
1c9f1e603b Fix Fortran options on Mac and CMake 3 adjustments
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
2014-10-28 00:49:27 +00:00
Joe Taylor
3dec8d4d97 Adding programmer comments to decoding routines.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4558 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-24 21:43:43 +00:00
Joe Taylor
bddcdf2115 Correct the filename ZL1FZ.pal also in wsjtx.qrz.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4557 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-24 17:52:08 +00:00
Joe Taylor
40928d5ce3 Corrected name of ZL1FZ.pal palette.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4556 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-24 13:33:27 +00:00
Bill Somerville
992643d693 Add a CMake option to allow a Debug wsjtx.exe to be a console application
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
2014-10-21 20:51:00 +00:00
Bill Somerville
0ee86f63b5 Added new library source
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4553 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 14:21:24 +00:00
Bill Somerville
643db52c9d Correct cut/paste error
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4552 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 14:04:37 +00:00
Bill Somerville
1ff68d5098 Make/qmake tweaks
The lib/Makefile.MinGW makefile  has been enhanced to link  to the DLL
version of fftw3  which is the normal version of  the library that you
get with the Windows installer.

The library is  located by passing the FFTW3_DIR variable  on the make
command line. For example on my system:

	$ # In a MinGW console
	$ cd ~/src/wsjtx/lib
	$ make QT_DIR=/c/Tools/Qt/5.2.1/mingw48_32 \
	>  FFTW3_DIR=/c/Tools/fftw-3.3.3-dll32-2

Similarly with the qmake project:

	$ # In a Qt MinGW 32-bit console
	$ cd ~/src/wsjtx
	$ qmake \
	>  HAMLIB_DIR=c:/test-install/hamlib/mingw48_32 \
	>  FFTW3_DIR=c:/Tools/fftw-3.3.3-dll32-2
	$ mingw32-make



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4551 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-21 13:47:19 +00:00
Bill Somerville
5a56cbdedb Tidy up unused files and move platform specific files
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4549 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-20 18:01:21 +00:00