w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 21:40:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Joe Taylor 2020-09-09 19:12:28 -04:00
commit 048348107f
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/user_guide/en/install-linux.adoc
View File

@ -40,7 +40,6 @@ sudo dpkg -P wsjtx
You may also need to execute the following command in a terminal: You may also need to execute the following command in a terminal:
[example]
.... ....
sudo apt install libgfortran5 libqt5widgets5 libqt5network5 \ sudo apt install libgfortran5 libqt5widgets5 libqt5network5 \
libqt5printsupport5 libqt5multimedia5-plugins libqt5serialport5 \ libqt5printsupport5 libqt5multimedia5-plugins libqt5serialport5 \
@ -73,7 +72,6 @@ sudo rpm -e wsjtx
You may also need to execute the following command in a terminal: You may also need to execute the following command in a terminal:
[example]
.... ....
sudo dnf install libgfortran fftw-libs-single qt5-qtbase \ sudo dnf install libgfortran fftw-libs-single qt5-qtbase \
qt5-qtmultimedia qt5-qtserialport qt5-qtsvg \ qt5-qtmultimedia qt5-qtserialport qt5-qtsvg \

24
doc/user_guide/en/install-windows.adoc
View File

@ -21,18 +21,30 @@ TIP: Your computer may be configured so that this directory is
`"%LocalAppData%\WSJT-X\"`. `"%LocalAppData%\WSJT-X\"`.
* The built-in Windows facility for time synchronization is usually * The built-in Windows facility for time synchronization is usually
not adequate. We recommend the program _Meinberg NTP_ (see not adequate. We recommend the program _Meinberg NTP Client_ (see
{ntpsetup} for downloading and installation instructions) or {ntpsetup} for downloading and installation instructions). Recent
_Dimension 4_ from {dimension4}. Recent versions of Windows 10 are versions of Windows 10 are now shipped with a more capable Internet
now shipped with a more capable Internet time synchronization time synchronization service that is suitable if configured
service that is suitable if configured appropriately. appropriately. We do not recommend SNTP time setting tools or others
that make periodic correction steps, _WSJT-X_ requires that the PC
clock be monotonic.
NOTE: Having a PC clock that appears to be synchronized to UTC is not
sufficient, monotonicity means that the clock must not be
stepped backwards or forwards during corrections, instead the
clock frequency must be adjusted to correct synchronization
errors gradually.
[[OPENSSL]] [[OPENSSL]]
image:LoTW_TLS_error.png[_WSJT-X_ LoTW download TLS error, image:LoTW_TLS_error.png[_WSJT-X_ LoTW download TLS error,
align="center"] align="center"]
* _WSJT-X_ requires installation of the _OpenSSL_ libraries. Suitable libraries may already be installed on your system. If they are not, you will see this error shortly after requesting a fetch of the latest LoTW users database. To fix this, install the _OpenSSL_ libraries. * _WSJT-X_ requires installation of the _OpenSSL_ libraries. Suitable
libraries may already be installed on your system. If they are not,
you will see this error shortly after requesting a fetch of the
latest LoTW users database. To fix this, install the _OpenSSL_
libraries.
** You can download a suitable _OpenSSL_ package for Windows from ** You can download a suitable _OpenSSL_ package for Windows from
{win_openssl_packages}; you need the latest *Windows Light* {win_openssl_packages}; you need the latest *Windows Light*

9
logbook/WorkedBefore.cpp
View File

@ -8,6 +8,7 @@
#include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/key_extractors.hpp> #include <boost/multi_index/key_extractors.hpp>
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include <QCoreApplication>
#include <QtConcurrent/QtConcurrentRun> #include <QtConcurrent/QtConcurrentRun>
#include <QFuture> #include <QFuture>
#include <QFutureWatcher> #include <QFutureWatcher>
@ -254,7 +255,7 @@ namespace
} }
else else
{ {
throw LoaderException (std::runtime_error {"Invalid ADIF field " + fieldName.toStdString () + ": " + record.toStdString ()}); throw LoaderException (std::runtime_error {QCoreApplication::translate ("WorkedBefore", "Invalid ADIF field %0: %1").arg (fieldName).arg (record).toLocal8Bit ()});
} }
if (closingBracketIndex > fieldNameIndex && fieldLengthIndex > fieldNameIndex && fieldLengthIndex < closingBracketIndex) if (closingBracketIndex > fieldNameIndex && fieldLengthIndex > fieldNameIndex && fieldLengthIndex < closingBracketIndex)
@ -271,7 +272,7 @@ namespace
} }
else else
{ {
throw LoaderException (std::runtime_error {"Malformed ADIF field " + fieldName.toStdString () + ": " + record.toStdString ()}); throw LoaderException (std::runtime_error {QCoreApplication::translate ("WorkedBefore", "Malformed ADIF field %0: %1").arg (fieldName).arg (record).toLocal8Bit ()});
} }
} }
return QString {}; return QString {};
@ -308,7 +309,7 @@ namespace
{ {
if (end_position < 0) if (end_position < 0)
{ {
throw LoaderException (std::runtime_error {"Invalid ADIF header"}); throw LoaderException (std::runtime_error {QCoreApplication::translate ("WorkedBefore", "Invalid ADIF header").toLocal8Bit ()});
} }
buffer.remove (0, end_position + 5); buffer.remove (0, end_position + 5);
} }
@ -354,7 +355,7 @@ namespace
} }
else else
{ {
throw LoaderException (std::runtime_error {"Error opening ADIF log file for read: " + inputFile.errorString ().toStdString ()}); throw LoaderException (std::runtime_error {QCoreApplication::translate ("WorkedBefore", "Error opening ADIF log file for read: %0").arg (inputFile.errorString ()).toLocal8Bit ()});
} }
} }
return worked; return worked;