Merge branch 'foldynl:master' into master

Changelog

@@ -1,3 +1,26 @@
+2024/10/05 - 0.39.0
+- [NEW] - DXC - Added Full-text search
+- [NEW] - Select S in RST Edit when focused (issue #454)
+- [NEW] - Alerts - Added Member Column
+- [CHANGED] - HamlibDrv Rig/Rot- Added multiplatform reliable sleep
+- [CHANGED] - Changed Backup policy
+- [CHANGED] - Logbook page size - improved performance
+- [CHANGED] - Logbook - CTRL-A (Select All) is disabled
+- [CHANGED] - Awards - Bands are displayed based on the Settings (issue #452)
+- [CHANGED] - WSJTX - More reliable detection of CQ stations (PR #471 @aa5sh)
+- [CHANGED] - WSJTX - SOTA/POTA/WWFF/SIG are being added to the logged QSO (PR #463 @aa5sh)
+- [CHANGED] - Stats - Add a confirmation dialog for displaying over 50k QSOs on the map
+- [CHANGED] - New Contact - Starting QSO Timer when Rig online and WSJTX Update Callsign Status is received
+- [CHANGED] - Added a postponed handling for Rig soft errors (issue #472)
+- Fixed WSJT-X does not emit band change if rig is disconnected (issue #447)
+- Fixed Wrong import of ADIF file of another log program (issue #455)
+- Fixed WSJTX log record is stored incorrectly if it contains non-ASCII chars(issue #458)
+- Fixed ADIF import does not import records with old DXCC Entities (issue #459)
+- Fixed ADIF import incorrectly uses Station Profile parameters (issue #461)
+- Fixed Logbook - QSO Table Column Width Does Not Stick (issue #464)
+- Fixed Alerts Window displays OOB Spots (issue #469)
+- Fixed Field values from past QSOs are used incorrectly in case of WSJTX QSOs (#issue 470)
+
 2024/08/29 - 0.38.0
 - [NEW] - Logbook - Added Send DX Spot to the QSO Context Menu
 - [NEW] - DX Filter - Added Dedup Time/Freq difference setting (@aa5sh)

QLog.pro

@@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 5): QT += widgets
 
 TARGET = qlog
 TEMPLATE = app
-VERSION = 0.38.0
+VERSION = 0.39.0
 
 DEFINES += VERSION=\\\"$$VERSION\\\"
 
@@ -90,7 +90,6 @@ SOURCES += \
         data/CWKeyProfile.cpp \
         data/CWShortcutProfile.cpp \
         data/Data.cpp \
-        data/Dxcc.cpp \
         data/MainLayoutProfile.cpp \
         data/RigProfile.cpp \
         data/RotProfile.cpp \
@@ -107,6 +106,7 @@ SOURCES += \
         models/LogbookModel.cpp \
         models/RigTypeModel.cpp \
         models/RotTypeModel.cpp \
+        models/SearchFilterProxyModel.cpp \
         models/ShortcutEditorModel.cpp \
         models/SqlListModel.cpp \
         models/WsjtxTableModel.cpp \
@@ -242,6 +242,7 @@ HEADERS += \
         models/LogbookModel.h \
         models/RigTypeModel.h \
         models/RotTypeModel.h \
+        models/SearchFilterProxyModel.h \
         models/ShortcutEditorModel.h \
         models/SqlListModel.h \
         models/WsjtxTableModel.h \

core/AlertEvaluator.cpp

@@ -6,7 +6,6 @@
 #include "debug.h"
 #include "data/DxSpot.h"
 #include "data/WsjtxEntry.h"
-#include "data/StationProfile.h"
 #include "data/SpotAlert.h"
 #include "data/BandPlan.h"
 
@@ -35,7 +34,7 @@ void AlertEvaluator::dxSpot(const DxSpot & spot)
 
     QStringList matchedRules;
 
-    for ( const AlertRule *rule : qAsConst(ruleList) )
+    for ( const AlertRule *rule : static_cast<const QList<AlertRule *>&>(ruleList) )
     {
         qCDebug(runtime) << "Processing " << *rule;
 
@@ -76,7 +75,7 @@ void AlertEvaluator::WSJTXCQSpot(const WsjtxEntry &wsjtx)
 
     QStringList matchedRules;
 
-    for ( const AlertRule *rule : qAsConst(ruleList) )
+    for ( const AlertRule *rule : static_cast<const QList<AlertRule *>&>(ruleList) )
     {
         qCDebug(runtime) << "Processing " << *rule;
         if ( rule->match(wsjtx) )
@@ -344,11 +343,11 @@ bool AlertRule::match(const DxSpot &spot) const
          && (sourceMap & SpotAlert::DXSPOT)
          && (dxCountry == 0 || dxCountry == spot.dxcc.dxcc)
          && (spot.status & dxLogStatusMap)
-         && (mode == "*" || mode.contains("|" + spot.modeGroupString))
-         && (band == "*" || band.contains("|" + spot.band))
+         && (mode == "*" || (!spot.modeGroupString.isEmpty() && mode.contains("|" + spot.modeGroupString)))
+         && (band == "*" || (!spot.band.isEmpty() && band.contains("|" + spot.band)))
          && (spotterCountry == 0 || spotterCountry == spot.dxcc_spotter.dxcc )
-         && (dxContinent == "*" || dxContinent.contains("|" + spot.dxcc.cont))
-         && (spotterContinent == "*" || spotterContinent.contains("|" + spot.dxcc_spotter.cont))
+         && (dxContinent == "*" || (!spot.dxcc.cont.isEmpty() && dxContinent.contains("|" + spot.dxcc.cont)))
+         && (spotterContinent == "*" || (!spot.dxcc_spotter.cont.isEmpty() && spotterContinent.contains("|" + spot.dxcc_spotter.cont)))
          && (dxMember == QStringList("*") || spot.memberList2Set().intersects(dxMemberSet))
        )
     {

core/ClubLog.cpp

@@ -11,7 +11,6 @@
 #include "ClubLog.h"
 #include "debug.h"
 #include "core/CredentialStore.h"
-#include "core/Callsign.h"
 
 #define API_KEY "21507885dece41ca049fec7fe02a813f2105aff2"
 #define API_LIVE_UPLOAD_URL "https://clublog.org/realtime.php"

core/CredentialStore.cpp

@@ -16,14 +16,6 @@ CredentialStore::CredentialStore(QObject *parent) : QObject(parent)
     FCT_IDENTIFICATION;
 }
 
-CredentialStore* CredentialStore::instance()
-{
-    FCT_IDENTIFICATION;
-
-    static CredentialStore instance;
-    return &instance;
-}
-
 int CredentialStore::savePassword(const QString &storage_key, const QString &user, const QString &pass)
 {
     FCT_IDENTIFICATION;

core/CredentialStore.h

@@ -9,7 +9,11 @@ class CredentialStore : public QObject
     Q_OBJECT
 public:
     explicit CredentialStore(QObject *parent = nullptr);
-    static CredentialStore* instance();
+    static CredentialStore* instance()
+    {
+        static CredentialStore instance;
+        return &instance;
+    };
 
     int savePassword(const QString &storage_key, const QString &user, const QString &pass);
     QString getPassword(const QString &storage_key, const QString &user);

core/Fldigi.cpp

@@ -7,7 +7,6 @@
 #include "Fldigi.h"
 #include "logformat/AdiFormat.h"
 #include "debug.h"
-#include "data/StationProfile.h"
 
 MODULE_IDENTIFICATION("qlog.core.fldigi");
 

core/KSTChat.cpp

@@ -75,7 +75,7 @@ KSTUsersInfo KSTChat::getUserInfo(const QString &username) const
 
     qCDebug(function_parameters) << username;
 
-    for ( const KSTUsersInfo &info : qAsConst(userList) )
+    for ( const KSTUsersInfo &info : static_cast<const QList<KSTUsersInfo>&>(userList) )
     {
         if ( info.callsign == username )
             return info;
@@ -250,9 +250,9 @@ void KSTChat::receiveData()
     QRegularExpression chatCMDEndRE("([0-9]{4})Z " + userName.toUpper() + " " + QRegularExpression::escape(chatName) + " chat>(.*)");
     QRegularExpressionMatch chatCMDEndMatch;
 
-    QStringList lines = joinLines(socket->readAll());
+    const QStringList &lines = joinLines(socket->readAll());
 
-    for (const QString &line : qAsConst(lines) )
+    for (const QString &line : lines )
     {
         qCDebug(runtime) << "Processing Line" << line << "CMD" << currCommand;
         // Skip empty lines
@@ -461,7 +461,7 @@ void KSTChat::finalizeShowUsersCommand(const QStringList &buffer)
 
     userList.clear();
 
-    for ( const QString &record : qAsConst(buffer) )
+    for ( const QString &record : static_cast<const QList<QString>&>(buffer) )
     {
         QRegularExpressionMatch match = recordRE.match(record);
 
@@ -596,7 +596,7 @@ bool chatHighlightEvaluator::shouldHighlight(const KSTChatMsg &msg,
 {
     FCT_IDENTIFICATION;
 
-    for ( const chatHighlightRule *rule : qAsConst(ruleList) )
+    for ( const chatHighlightRule *rule : static_cast<const QList<chatHighlightRule *>&>(ruleList) )
     {
         qCDebug(runtime) << "Processing " << rule->ruleName;
         if ( rule->match(roomIndex, msg) )
@@ -696,7 +696,7 @@ QByteArray chatHighlightRule::toJson()
 
     QJsonArray conditionsArray;
 
-    for ( const Condition &condition : qAsConst(conditions) )
+    for ( const Condition &condition : static_cast<const QList<Condition>&>(conditions) )
     {
         QJsonObject conditionObject;
 
@@ -733,8 +733,8 @@ void chatHighlightRule::fromJson(const QJsonDocument &ruleDefinition)
     enabled = ruleDefinition["enabled"].toBool();
     ruleRoomIndex = ruleDefinition["roomId"].toInt();
     interConditionOperand = static_cast<InterConditionOperand>(ruleDefinition["operand"].toInt());
-    QJsonArray conditionArray = ruleDefinition["conditions"].toArray();
-    for ( const QJsonValue &value : qAsConst(conditionArray) )
+    const QJsonArray &conditionArray = ruleDefinition["conditions"].toArray();
+    for ( const QJsonValue &value : conditionArray )
     {
         QJsonObject obj = value.toObject();
         Condition condition;
@@ -779,7 +779,7 @@ bool chatHighlightRule::match(const int inRoomIndex,
     bool result = false;
     bool isFirstCondition = true;
 
-    for ( const Condition &condition : qAsConst(conditions) )
+    for ( const Condition &condition : static_cast<const QList<Condition>&>(conditions) )
     {
         QString columnValue;
 

core/MembershipQE.cpp

@@ -93,14 +93,6 @@ void MembershipQE::statusQueryFinished(const QString &callsign,
     emit clubStatusResult(callsign, statuses);
 }
 
-MembershipQE *MembershipQE::instance()
-{
-    FCT_IDENTIFICATION;
-
-    static MembershipQE instance;
-    return &instance;
-}
-
 void MembershipQE::saveEnabledClubLists(const QStringList &enabledLists)
 {
     QSettings settings;
@@ -124,7 +116,7 @@ void MembershipQE::removeClubsFromEnabledClubLists(const QList<QPair<QString, QS
     qCDebug(runtime) << toRemove;
     QStringList current = getEnabledClubLists();
 
-    for (const QPair<QString, QString>& toRemoveClub: qAsConst(toRemove))
+    for ( const QPair<QString, QString>& toRemoveClub : toRemove )
     {
         current.removeAll(toRemoveClub.first);
     }
@@ -492,13 +484,6 @@ ClubStatusQuery::ClubStatusQuery(QObject *parent) :
 ClubStatusQuery::~ClubStatusQuery()
 {
     FCT_IDENTIFICATION;
-    {
-        qCDebug(runtime) << "Closing connection to DB";
-        QSqlDatabase db1 = QSqlDatabase::database(dbConnectionName);
-        db1.close();
-    }
-
-    QSqlDatabase::removeDatabase(dbConnectionName);
 }
 
 void ClubStatusQuery::getClubStatus(const QString &in_callsign,
@@ -562,25 +547,25 @@ void ClubStatusQuery::getClubStatus(const QString &in_callsign,
     while ( ++records && query.next() )
     {
         QString clubid = query.value(0).toString();
-        QVariant band = query.value(1);
-        QVariant mode = query.value(2);
+        QString band = query.value(1).toString();
+        QString mode = query.value(2).toString();
         QVariant confirmed = query.value(3);
-        QVariant current_mode = query.value(4);
+        QString current_mode = query.value(4).toString();
 
         qCDebug(runtime) << "Processing" << currentProcessedClub
                          << clubid
-                         << band.isNull() << band
-                         << mode.isNull() << mode
-                         << confirmed.isNull() << confirmed
-                         << current_mode.isNull();
+                         << band.isEmpty() << band
+                         << mode.isEmpty() << mode
+                         << confirmed.toString().isEmpty() << confirmed
+                         << current_mode.isEmpty();
 
         // the select generates starting line for a new club
         // Changing the club
         if ( currentProcessedClub != clubid
-             && band.isNull()
-             && mode.isNull()
-             && confirmed.isNull()
-             && current_mode.isNull()  )
+             && band.isEmpty()
+             && mode.isEmpty()
+             && confirmed.toString().isEmpty()
+             && current_mode.isEmpty()  )
         {
             if ( !currentProcessedClub.isEmpty() )
             {
@@ -599,10 +584,10 @@ void ClubStatusQuery::getClubStatus(const QString &in_callsign,
 
         if ( currentProcessedClub == clubid )
         {
-            if ( band.toString() == in_band )
+            if ( band == in_band )
             {
                 bandMatched = true;
-                if ( mode.toString() == current_mode.toString() )
+                if ( mode == current_mode )
                 {
                     bandModeMatched = true;
 
@@ -613,7 +598,7 @@ void ClubStatusQuery::getClubStatus(const QString &in_callsign,
                 }
             }
 
-            if ( mode.toString() == current_mode.toString() )
+            if ( mode == current_mode )
             {
                 modeMatched = true;
             }

core/MembershipQE.h

@@ -75,7 +75,11 @@ class MembershipQE : public QObject
     Q_OBJECT
 
 public:
-    static MembershipQE *instance();
+    static MembershipQE *instance()
+    {
+        static MembershipQE instance;
+        return &instance;
+    };
     static void saveEnabledClubLists(const QStringList &enabledLists);
     static QStringList getEnabledClubLists();