Commit Graph

6667 Commits

Author SHA1 Message Date
Bill Somerville
f66788691d
Set up for Boost logging in WSJT-X
uses a  settings file to  define log  sink back-ends, by  default uses
:/wsjtx_log_config.ini  from  the  resources file-system.   Users  may
override  by placing  their own  wsjtx_log_config.ini into  the WSJT-X
config location. The settings file format is as described in the Boost
log
documentation (https://www.boost.org/doc/libs/1_74_0/libs/log/doc/html/log/detailed/utilities.html#log.detailed.utilities.setup.settings_file)
with the additional feature that  allows some pre-defined variables to
be expanded. The  predefined variables refer to  standard locations in
the file-system,  and allow  log files  and rotation  target directory
paths to be specified. The pre-defined variables are:

   DesktopLocation
   DocumentsLocation
   TempLocation
   HomeLocation
   CacheLocation
   GenericCacheLocation
   GenericDataLocation
   AppDataLocation

and  must  be   used  enclosed  on  braces  and  preceded   by  a  '$'
character. E.g. to define the pattern for a sink's log file:

   FileName="${AppLocalDataLocation}/wsjtx_syslog.log"

this would place the log file wsjtx_syslog.log in the WSJT-X log files
directory, on all platforms.
2020-09-18 21:23:11 +01:00
Bill Somerville
b420c9f6d3
Basic support for using the Boost log library 2020-09-18 21:12:53 +01:00
Bill Somerville
0bca52d2d8
Switching to consuming Boost as external libraries 2020-09-18 18:40:14 +01:00
Bill Somerville
906abd8599
Merge branch 'develop' into feat-boost-log 2020-09-16 13:47:00 +01:00
Bill Somerville
9356bec3a5
Updated translation files 2020-09-16 13:43:07 +01:00
Bill Somerville
2755afe466
Updated Catalan l10n, tnx to Xavi, EA3W 2020-09-16 13:42:15 +01:00
Bill Somerville
bdabea36d0
Merge branch 'develop' into feat-boost-log 2020-09-16 11:53:26 +01:00
Bill Somerville
e48f71f424
Updated Spanish l10n, tnx Cédric, EA4AC 2020-09-16 11:45:55 +01:00
Bill Somerville
d544f5ed38
Merge branch 'develop' into feat-boost-log 2020-09-15 16:50:55 +01:00
Bill Somerville
10fbcfc7d0
Updated l10n .TS files 2020-09-15 16:38:17 +01:00
Bill Somerville
baa9c4fdd4
Updated Italian l10n, tnx Marco, PY1ZRJ 2020-09-15 16:37:22 +01:00
Bill Somerville
c9e3c56c8e
Updated Spanish l10n, tnx Cédric, EA4AC 2020-09-15 16:35:52 +01:00
Bill Somerville
abe470b24a
Fix a typo 2020-09-15 15:53:14 +01:00
Bill Somerville
e65caabdea
Build with Boost Log library and dependants
Requires Boost libraries to be available as an external library.

On Debian style Linux distributions:

sudo apt install boost-dev-all

On Red Hat style Linux distributions:

sudo dnf install boost-dev

On macOS install Boost from a suitable Open Source package manager,
e.g. MacPorts:

sudo port install boost

If building WSJT-X  packages on macOS for distribution  you must build
boost and  its dependants from  sources with a  suitable macports.conf
file specifying the target macOS  version (10.12 at present). To build
Boost from sources in this case:

sudo port -s install boost

On MS Windows boost must be built from sources using the correct MinGW
compilers,  i.e. the  Qt  tools  32- or  64-bit  g++  for each  target
bit-width respectively.  To  build boost something along  the lines of
the following recipe should be used:

1)     Download    the     boost    ZIP     source    archive     from
https://sourceforge.net/projects/boost/, the latest  release should be
OK, at the time of writing that was 1.74,

2) create a directory for the sources:

MKDIR C:\boost-install

and extract the boost sources there.

3) Bootstrap and  build Boost.Build. If you are building  both 32- and
64-bit  variants then  do  this  twice, each  from  the correct  MinGW
terminal  session  for  the  necessary tool-chain.  Specify  a  unique
install directory  for each variant  (--prefix=). I use C:\Tools  as a
root directory for external libraries and tools, choose whatever suits
your development environment.

CD C:\boost-install\boost_1_74_0\tools\build
bootstrap.bat gcc
b2 --prefix="C:\Tools\boost-build\MinGW32" install

CD C:\boost-install\boost_1_74_0\tools\build
bootstrap.bat gcc
b2 --prefix="C:\Tools\boost-build\MinGW64" install

4) Build Boost. If you are  building both 32- and 64-bit variants then
do this  twice, each from the  correct MinGW terminal session  for the
necessary tool-chain. Specify a unique build and install directory for
each variant (--build-dir=  and --prefix=).  I use C:\Tools  as a root
directory for external libraries and tools, choose whatever suits your
development environment.

SET Path=%Path%;C:\Tools\boost-build\MinGW32\bin
CD C:\boost-install\boost_1_74_0
b2 --build-dir="C:\boost-install\boost_1_74_0\build" ^
 --build-type=complete ^
 --prefix="C:\Tools\boost\MinGW32" ^
 toolset=gcc install

SET Path=%Path%;C:\Tools\boost-build\MinGW32\bin
CD C:\boost-install\boost_1_74_0
b2 --build-dir="C:\boost-install\boost_1_74_0\build" ^
 --build-type=complete ^
 --prefix="C:\Tools\boost\MinGW32" ^
 toolset=gcc address-model=64 install

5)  Once successfully  built  the sources  directory  and build  trees
within can be deleted. The build products are contained in the install
directories (C:\Tools\boost-build and C:\Tools\boost in my case).

6) Update  your development environment  to include the  boost headers
and libraries. In  my case I have  scripts that set up  32- and 64-bit
environments,  they need  to be  modified to  include the  appropriate
boost library  directories on  the Path  environment variable  so that
applications  linked  to Boost  libraries  can  locate the  DLLs.  For
32-bit:

SET Path=C:\Tools\boost\MinGW32\lib;%Path%

For 64-bit:

SET Path=C:\Tools\boost\MinGW64\lib;%Path%

7) To  build WSJT-X  CMake will need  to be able  to locate  the Boost
libraries. I do that using tool-chain files for each of 32- and 64-bit
in both Debug and Release configurations which are passed to the CMake
configuration  invocation using  the -DCMAKE_TOOLCHAIN_FILE=  variable
assignment.  In the  tool-chain files you need to  add the appropriate
Boost  installation  directory   to  the  CMAKE_PREFIX_PATH  variable,
something like:

set (BOOSTDIR C:/Tools/boost/MinGW32)
...
set (CMAKE_PREFIX_PATH ${BOOSTDIR} ${QTDIR} ...

adjust as needed for 32- or 64-bit variants.
2020-09-15 10:35:34 +01:00
Bill Somerville
e4eb6eb94e
Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-15 10:31:04 +01:00
Steven Franke
221ede2903 Remove some unused variables. 2020-09-14 13:07:07 -05:00
Steven Franke
affe33091d Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-14 13:03:38 -05:00
Steven Franke
b49a90f530 Remove a redundant array. 2020-09-14 13:03:33 -05:00
Joe Taylor
cada7e5777 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-14 13:56:22 -04:00
Joe Taylor
3886411fad Two more corrections to mode-switch settings of GUI controls in FST4/FST4W. 2020-09-14 13:55:30 -04:00
Steven Franke
832212b402 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-14 12:42:36 -05:00
Steven Franke
1b59d9dc8c Eliminate redundancies from the calculation of sequence correlations. 2020-09-14 12:42:32 -05:00
Joe Taylor
1a9d97a969 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-14 10:59:34 -04:00
Joe Taylor
f20c45c167 FST4: Align WideGraph green bar with RxFreq on startup. CTRL-diouble-click on waterfall sets FTol=10 and calls decoder. 2020-09-14 10:56:54 -04:00
Steven Franke
ca0804450b Remove some redundant code. 2020-09-14 09:07:45 -05:00
Steven Franke
3d8c8e3dd7 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-14 09:00:35 -05:00
Steven Franke
98d52e35ac Speed up FST4 decoding. 2020-09-14 09:00:30 -05:00
Joe Taylor
614f3037a9 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-14 09:56:44 -04:00
Joe Taylor
8f554321c8 Make sure that Tx audio frequency in FST4 mode comes from FST4 TxFreq spinner, not the WSPR/FST4W spinner. 2020-09-14 09:55:33 -04:00
Bill Somerville
5014c62bfa
Notify user when enumerating audio devices 2020-09-13 17:12:11 +01:00
Bill Somerville
617d4eaa7f
Updated Chinese and Hong Kong UI translations, tnx to Sze-to, VR2UPU 2020-09-13 15:28:10 +01:00
Joe Taylor
39403c2520 Expand the range of allowable values for TxFreq in FST4W. 2020-09-13 09:38:39 -04:00
Joe Taylor
ec47811c27 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-12 13:47:11 -04:00
Joe Taylor
a1baaebee9 Decoder should reject data with rms < 3.0 over first 15 seconds. 2020-09-12 13:46:09 -04:00
Bill Somerville
e096b77bc1
Ensure default FTol spin box range covers all possible values
This allows persistence between sessions to work correctly.
2020-09-12 15:58:25 +01:00
Joe Taylor
174893395b Ensure sending correct FTol value from GUI to decoder for FST4. 2020-09-12 09:54:13 -04:00
Joe Taylor
bcdaf395f1 Must set m_bFastMode=false for FST4. Fixes the reported "Hold Tx frequency" issue. Also, ensure display of WideGraph rather than FastGraph for FST4, FST4W. 2020-09-12 09:35:32 -04:00
Joe Taylor
18ab40a576 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-12 09:02:27 -04:00
Joe Taylor
263675cac4 Fix an oddball result with i*2 numbers: abs(-32768)=-32768. 2020-09-12 09:00:39 -04:00
Bill Somerville
d5ef698ce1
Updated l10n files 2020-09-12 12:54:42 +01:00
Bill Somerville
ba709fb1b0
Updated Danish UI l10n, tnx to Michael, 5P1KZX 2020-09-12 12:46:26 +01:00
Bill Somerville
c032f0655b
Merge branch 'feat-dropped-frames' into develop 2020-09-12 04:44:09 +01:00
Bill Somerville
2f912c14e8
Restore l10n strings lost on round trip
Reminder  to  touch a  source  file  with  any  l10n string  to  force
translatable strings to be updated when there are no other source file
changes.
2020-09-12 03:29:27 +01:00
Bill Somerville
66e887b2f9
Merge branch 'develop' into feat-dropped-frames 2020-09-12 00:19:04 +01:00
Bill Somerville
14dad11f2e
Updated cty.dat database, Big CTY - 01 September 2020
Tnx Jim, AD1C.
2020-09-11 20:42:46 +01:00
Bill Somerville
f23e8a4e0d
Catalan l10n updates, tnx to Xavi, EA3W 2020-09-11 19:07:28 +01:00
Bill Somerville
1bf1d4cd8f
Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-11 15:02:48 +01:00
Bill Somerville
5c05cd2acb
Spanish l10n updates, tnx to Cédric, EA4AC 2020-09-11 14:56:42 +01:00
Bill Somerville
6d434b147d
Japanese l10n updates, tnx to Oba san, JA7UDE 2020-09-11 14:55:25 +01:00
Joe Taylor
20085e0ec8 Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop 2020-09-11 09:14:24 -04:00