Fixed ADI parser/cache.

hmatuschek · Jul 21, 2020 · 00b2045 · 00b2045
1 parent 43f420d
commit 00b2045
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,7 +50,7 @@ add_subdirectory(src)
 # Source distribution packages:
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "5")
+set(CPACK_PACKAGE_VERSION_PATCH "6")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME
   "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")

diff --git a/shared/about.html b/shared/about.html
@@ -3,7 +3,7 @@
  <body>
  <center>
   <h1>RBN Client</h1>
-  <h3>version 1.0.5</h3>
+  <h3>version 1.0.6</h3>
   <h4><h ref="https://dm3mat.darc.de/rbn">https://dm3mat.darc.de/rbn</a></h4>
   <h5><i>Copyright (C) 2019 Hannes Matuschek, DM3MAT, dm3mat[at]darc[dot]de</i></h5>
  </center>

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1,7 +1,7 @@
 name: rbnc
 version: git
 grade: devel
-#version: 1.0.5
+#version: 1.0.6
 #grade: stable
 summary: Reverse-Beacon-Network Desktop-Client
 description: |

diff --git a/src/adi.cc b/src/adi.cc
@@ -80,6 +80,8 @@ LogFile::insert(const Record &qso) {
   int dxcc = dxcc_from_call(qso.call);
   if (! _DXCCs.contains(dxcc)) {
     _DXCCs.insert(dxcc, DXCCRecord(qso.band, qso.mode));
+  } else {
+    _DXCCs[dxcc].insert(qso.band, qso.mode);
   }
 }
 

diff --git a/src/adi.hh b/src/adi.hh
@@ -1,6 +1,7 @@
 #ifndef ADI_HH
 #define ADI_HH
 
+#include <QObject>
 #include <QFile>
 #include <QString>
 #include <QDateTime>

diff --git a/src/dxcc.cc b/src/dxcc.cc
@@ -317,8 +317,9 @@ DXCCList::addRule(const Rule &rule) {
 
 int
 DXCCList::dxcc(const QString &call) {
-  if (_dxcc_cache.contains(call))
+  if (_dxcc_cache.contains(call)) {
     return _dxcc_cache[call];
+  }
 
   int match_len = 0;
   Rule match;
@@ -342,7 +343,9 @@ DXCCList::dxcc(const QString &call) {
 
 QString
 DXCCList::dxcc_name(const QString &call) {
+  // get DXCC ID from call
   int nr = dxcc(call);
+  // get name by ID
   if (! _dxcc_name.contains(nr))
     return "Unknown DXCC";
   return _dxcc_name[nr];

diff --git a/src/dxcc.hh b/src/dxcc.hh
@@ -2,6 +2,7 @@
 #define DXCC_HH
 
 #include "webfile.hh"
+#include <QObject>
 #include <QString>
 #include <QRegularExpression>