Commit Graph

1637 Commits

Author SHA1 Message Date
Bill Somerville
207db8a5c4 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
8c348b7171 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
a273bb5eab 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
1e59bdf367 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
5c5283552a 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
c591ee59c1 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
ff7fd057ed 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
5741f91229 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
c5c873a4a6 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
2f9fde0853 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
7223a29788 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
eb45744177 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
0070211176 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
175f1913b4 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
11487c69fa 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
875dd0724b 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
761fd3095f 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
6a4bdcabe0 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
20c7046a90 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
d9bc8f5dff 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
7680cb3c75 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
1de397479c 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
a677e183fc 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
d3a84572d4 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
d9054d667c 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
dab7e196c0 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
3b21ec328b 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
8725a649e1 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
2f21733ea8 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
39f802bea0 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
4fc1ba02d2 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
9a2e0fad22 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
Bill Somerville
3fecf85a0a Fix Mac OS X DragNDrop DMG Volume name
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
2014-10-20 17:38:53 +00:00
Joe Taylor
51e4dbb1c6 Remove two unused routines. Remove declaration of unused variable.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4544 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-20 13:04:29 +00:00
Bill Somerville
c9c3e4f22c Support for the DDUtil HRD emulator
DDUtil  by K5FR  allows multiple  clients  to control  a FlexRadio  or
similar by emulating an HRD TCP/IP server.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-20 00:10:02 +00:00
Joe Taylor
1deb0e9fbc Remove a bad test message from jt9code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4540 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 12:29:45 +00:00
Joe Taylor
c3258d9e3e Update the "Usage" messages for jt65code and jt9code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4537 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:31:17 +00:00
Joe Taylor
44fe8b02a2 Build a list of test messages into jt9code and jt65code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4536 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:29:30 +00:00
Joe Taylor
fdb12a76fa Minor tweak to the new output format for jt9code and jt65code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4535 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 01:04:58 +00:00
Joe Taylor
0e52f8eb5c Forgot to commit a new utility function.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4534 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 00:57:29 +00:00
Joe Taylor
e4927efd62 Improve the way messages with compound calls are automatically generated.
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
2014-10-19 00:56:41 +00:00
Bill Somerville
5e64ed790a Ensure user guide and kvasd is always latest version
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4532 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-19 00:23:42 +00:00
Bill Somerville
83a4cb5edb Add support for Yaesu FT-450(D) via HRD
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4530 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-18 21:34:09 +00:00
Bill Somerville
88a40bc97e Implement mode setting on the Ten-Tec Omni VII via HRD
Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4527 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-17 20:45:53 +00:00
Joe Taylor
ef3eb77f7f Use CPU_TIME() rather than SYSTEM_CLOCK() in timer.
SYSTEM_CLOCK() did not work as well, in the Windows Release build.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4525 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-17 18:38:06 +00:00
Bill Somerville
0a5facb331 Support for the Yaesu FTdx3000 and similar rigs via HRD
There  is an  outstanding  issue with  the FTdx3000  via  HRD in  that
setting  the  "other" VFO  mode  doesn't  work.   This appears  to  be
insoluable and the  only current option is to set  "Mode" to "None" in
WSJT-X leaving mode  setting to the user. As it  happens the best mode
combo on this rig  is probably DATA-U on Tx and USB  on Rx which would
require "Mode" as "None" anyway.

This change is quite large  including several general strategy changes
in an attempt to make the HRD interface more generic and more robust.

Also cleaned up  trace output removing stuff that is  working and just
clutters output.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4524 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-17 10:07:45 +00:00
Bill Somerville
507a6c9b39 Use non localized get frequency commands with Commander
Commander sends invalid  UTF-8 strings for numbers  that contain group
separators,  e.g. non-break  space  U+00A0 in  French regional  number
formats.

Revert to  old undocumented frequency  query commands that  always use
'.' and ',' for number punctuation.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4519 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-16 22:57:55 +00:00
Bill Somerville
69b2eac75a Clean up HRD information file format
Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4514 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-13 10:53:15 +00:00
Bill Somerville
9cee2342a2 Unjustify project description
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
2014-10-11 19:01:12 +00:00
Bill Somerville
db60373bde Fix up shadow manpages when a2x generates invalid one
On Ubuntu a2x  generates invalid shadow manpages. A sed  edit has been
added to teh build script to rectify this.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-11 16:20:49 +00:00