not1mm 25.6.8__py3-none-any.whl → 25.6.10__py3-none-any.whl

not1mm/data/dxcc_tracker.ui

@@ -16,7 +16,7 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <widget class="QTableView" name="tableView">
+     <widget class="QTableWidget" name="dxcc_table">
       <property name="focusPolicy">
        <enum>Qt::FocusPolicy::NoFocus</enum>
       </property>

not1mm/dxcc_tracker.py

@@ -1,10 +1,11 @@
-from PyQt6.QtWidgets import QDockWidget, QTableView
-from PyQt6.QtSql import QSqlDatabase, QSqlQueryModel, QSqlQuery
+from PyQt6.QtWidgets import QDockWidget
 from PyQt6.QtGui import QBrush, QColor
-from PyQt6.QtCore import Qt
+
+# from PyQt6.QtCore import Qt
 from PyQt6.QtCore import pyqtSignal
-from PyQt6 import uic
+from PyQt6 import uic, QtWidgets
 import not1mm.fsutils as fsutils
+from not1mm.lib.database import DataBase
 import os
 from json import loads
 
@@ -13,66 +14,72 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class CustomSqlModel(QSqlQueryModel):
-    def data(self, index, role):
-        if role == Qt.ItemDataRole.BackgroundRole:
-            column = index.column()
-            if column < 7:  # Columns 0-6 (CountryPrefix and band columns)
-                value = super().data(index, Qt.ItemDataRole.DisplayRole)
-                if value and isinstance(value, (int, float)) and value > 0:
-                    return QBrush(QColor(44, 138, 44))  # Light green color
-                elif value == 0:
-                    return QBrush(QColor(155, 100, 100))  # Light red color
-        return super().data(index, role)
-
-
 class DXCCWindow(QDockWidget):
     message = pyqtSignal(dict)
     dbname = None
     db = None
     model = None
     pref = {}
+    columns = {
+        0: "DXCC",
+        1: "160m",
+        2: "80m",
+        3: "40m",
+        4: "20m",
+        5: "15m",
+        6: "10m",
+        7: "Total",
+    }
 
     def __init__(self):
         super().__init__()
         self.active = False
         uic.loadUi(fsutils.APP_DATA_PATH / "dxcc_tracker.ui", self)
+        self.dxcc_table.setColumnCount(len(self.columns))
+        for column_number, column_name in self.columns.items():
+            self.dxcc_table.setHorizontalHeaderItem(
+                column_number, QtWidgets.QTableWidgetItem(column_name)
+            )
         self.setWindowTitle("DXCC Tracker")
         self.load_pref()
-        self.db = QSqlDatabase.addDatabase("QSQLITE")
-        self.tableView.verticalHeader().setVisible(False)
+
+        self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
+            "current_database", "ham.db"
+        )
+        self.database = DataBase(self.dbname, fsutils.USER_DATA_PATH)
+
+        self.database.current_contest = self.pref.get("contest", 0)
+
+        self.get_log()
+        self.dxcc_table.resizeColumnsToContents()
+        self.dxcc_table.resizeRowsToContents()
 
     def setActive(self, mode: bool):
         self.active = bool(mode)
 
-    def update_model(self):
-        self.model = CustomSqlModel(self)
-        query = QSqlQuery(self.db)
-        query.prepare(
-            f"""
-            SELECT CountryPrefix,
-                SUM(CASE WHEN Band = 1.8 THEN 1 ELSE 0 END) AS '160m',
-                SUM(CASE WHEN Band = 3.5 THEN 1 ELSE 0 END) AS '80m',
-                SUM(CASE WHEN Band = 7.0 THEN 1 ELSE 0 END) AS '40m',
-                SUM(CASE WHEN Band = 14.0 THEN 1 ELSE 0 END) AS '20m',
-                SUM(CASE WHEN Band = 21.0 THEN 1 ELSE 0 END) AS '15m',
-                SUM(CASE WHEN Band = 28.0 THEN 1 ELSE 0 END) AS '10m',
-                COUNT(*) AS Total
-            FROM DXLOG where ContestNR = {self.pref.get('contest', 1)} 
-            GROUP BY CountryPrefix
-            ORDER BY Total DESC
-            """
-        )
-        if not query.exec():
-            print("Query failed:", query.lastError().text())
-        else:
-            self.model.setQuery(query)
-            headers = ["DXCC", "160m", "80m", "40m", "20m", "15m", "10m", "Total"]
-            for i, header in enumerate(headers):
-                self.model.setHeaderData(i, Qt.Orientation.Horizontal, header)
-            self.tableView.setModel(self.model)
-            self.tableView.resizeColumnsToContents()
-            self.tableView.resizeRowsToContents()
+    def get_log(self):
+        """dxcc_table"""
+
+        # result=[
+        # {'CountryPrefix': 'K', '160m': 0, '80m': 0, '40m': 0, '20m': 7, '15m': 0, '10m': 0, 'Total': 7},
+        # {'CountryPrefix': 'XE', '160m': 0, '80m': 0, '40m': 0, '20m': 1, '15m': 0, '10m': 0, 'Total': 1},
+        # {'CountryPrefix': 'G', '160m': 0, '80m': 0, '40m': 0, '20m': 1, '15m': 0, '10m': 0, 'Total': 1}
+        # ]
+
+        result = self.database.fetch_dxcc_by_band_count()
+        self.dxcc_table.setRowCount(0)
+        for row_number, row_data in enumerate(result):
+            self.dxcc_table.insertRow(row_number)
+            for column, data in enumerate(row_data.values()):
+                item = QtWidgets.QTableWidgetItem(str(data))
+                if column > 0 and column < 7:
+                    if data == 0:
+                        item.setBackground(QBrush(QColor(44, 138, 44)))
+                    else:
+                        item.setBackground(QBrush(QColor(155, 100, 100)))
+                self.dxcc_table.setItem(row_number, column, item)
+        self.dxcc_table.resizeColumnsToContents()
+        self.dxcc_table.resizeRowsToContents()
 
     def load_pref(self) -> None:
         """
@@ -115,18 +122,18 @@ class DXCCWindow(QDockWidget):
         self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
             "current_database", "ham.db"
         )
-
-        self.db.setDatabaseName(f"{self.dbname}")
-        if not self.db.open():
-            print("Error: Could not open database")
-            return
+        self.database = DataBase(self.dbname, fsutils.APP_DATA_PATH)
+        self.database.current_contest = self.pref.get("contest", 0)
+        self.contact = self.database.empty_contact
+        self.get_log()
 
     def msg_from_main(self, msg):
         """"""
-        if msg.get("cmd", "") in ("UPDATELOG", "CONTACTCHANGED", "DELETED"):
-            ...
-            self.update_model()
-        if msg.get("cmd", "") == "NEWDB":
-            ...
-            self.load_new_db()
-            self.update_model()
+        if self.active is True:
+            if msg.get("cmd", "") in ("UPDATELOG", "CONTACTCHANGED", "DELETED"):
+                ...
+                self.get_log()
+            if msg.get("cmd", "") == "NEWDB":
+                ...
+                self.load_new_db()
+                self.get_log()

not1mm/lib/database.py

@@ -726,6 +726,34 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
+    def fetch_dxcc_by_band_count(self) -> list:
+        """
+        Fetch list containing count of unique countries by band
+
+        """
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                query = f"""
+                            SELECT CountryPrefix,
+                                SUM(CASE WHEN Band = 1.8 THEN 1 ELSE 0 END) AS '160m',
+                                SUM(CASE WHEN Band = 3.5 THEN 1 ELSE 0 END) AS '80m',
+                                SUM(CASE WHEN Band = 7.0 THEN 1 ELSE 0 END) AS '40m',
+                                SUM(CASE WHEN Band = 14.0 THEN 1 ELSE 0 END) AS '20m',
+                                SUM(CASE WHEN Band = 21.0 THEN 1 ELSE 0 END) AS '15m',
+                                SUM(CASE WHEN Band = 28.0 THEN 1 ELSE 0 END) AS '10m',
+                                COUNT(*) AS Total
+                            FROM DXLOG where ContestNR = {self.current_contest} 
+                            GROUP BY CountryPrefix
+                            ORDER BY Total DESC
+                        """
+                cursor.execute(query)
+                return cursor.fetchall()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
     def fetch_exchange1_unique_count(self) -> dict:
         """
         Fetch count of unique countries

not1mm/lib/ham_utility.py

@@ -16,19 +16,22 @@ def calculate_wpx_prefix(the_call: str) -> str:
         return ""
     if the_call in ["OPON", "CW", "SSB", "RTTY"]:
         return ""
-    suffix_to_ignore = ["M", "MM", "P", "QRP", "A", "LH", "NLD"]
+    suffix_to_ignore = ["M", "MM", "P", "QRP", "A", "J", "LH", "LGT", "LS", "NLD", "T", "R", "TR" ]
+    for suffix in suffix_to_ignore:
+        the_call = re.sub("/" + suffix + "$", "", the_call)
     result = None
     working_call = the_call.split("/")
     if len(working_call) > 1:
         result = min(working_call, key=len)
         if not result.isnumeric():
-            if result not in suffix_to_ignore:
-                if any(chr.isdigit() for chr in result):
-                    return result
-                return result + "0"
+            if any(chr.isdigit() for chr in result):
+                return result
+            return result + "0"
 
     working_call = max(working_call, key=len)
     last_digit = re.match(".+([0-9])[^0-9]*$", working_call)
+    if last_digit is None:
+        return working_call[0:2] + "0"
     position = last_digit.start(1)
     prefix = working_call[: position + 1]
     if not result:

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.6.8"
+__version__ = "25.6.10"

not1mm/test.py

@@ -1,37 +1,5 @@
-import datetime
+from not1mm.lib.rot_interface import RotatorInterface
 
-
-# Assume self.auto_cq_delay is defined (e.g., in milliseconds)
-class SomeClass:
-    def __init__(self, auto_cq_delay_ms):
-        self.auto_cq_delay = auto_cq_delay_ms
-
-
-# Example instantiation
-instance = SomeClass(auto_cq_delay_ms=5000)  # 5 seconds delay
-
-
-then = datetime.datetime.now()
-future = datetime.datetime.now() + datetime.timedelta(milliseconds=15000)
-
-
-# Calculate the total duration between 'then' and 'future'
-total_duration = future - then
-
-while datetime.datetime.now() < future:
-
-    now = datetime.datetime.now()
-    # Calculate the elapsed duration between 'then' and 'now'
-    elapsed_duration = now - then
-
-    # Avoid division by zero if total_duration is zero (though unlikely in this scenario)
-    if total_duration.total_seconds() > 0:
-        # Calculate the percentage of the way 'now' is to 'future'
-        percentage_complete = (
-            elapsed_duration.total_seconds() / total_duration.total_seconds()
-        ) * 100
-        print(f"Current time is {percentage_complete:.2f}% of the way to 'future'.")
-    else:
-        print(
-            "'future' is the same as or before 'then', so percentage cannot be calculated meaningfully."
-        )
+rotator = RotatorInterface()
+if rotator.connected is True:
+    print(f"{rotator.get_position()=}")

{not1mm-25.6.8.dist-info → not1mm-25.6.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.8
+Version: 25.6.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -245,7 +245,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-6-10] Merged PR from @dj1yfk correcting WPX prefix calculation.
 - [25-6-8] Revmoved SQLite WAL mode.
+  - Rewrote DXCC tracker.
 - [25-6-7] Fix focus issue when dxcc widget is active.
 - [25-6-4] Add a DXCC/Band widget.
 - [25-6-3] Fix crash caused by SSL cert expiration from supercheckpartial.com.

{not1mm-25.6.8.dist-info → not1mm-25.6.10.dist-info}/RECORD

@@ -2,7 +2,7 @@ not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/__main__.py,sha256=IHFJFKGAgKyPZUdi-aRDFIS--XJPdoPiV6utXx31_-I,172631
 not1mm/bandmap.py,sha256=0JmZ32UvkaPjXs2xTgowX1GLvZo5zHU_Zo9y_GL-On4,31139
 not1mm/checkwindow.py,sha256=zEHlw40j6Wr3rvKbCQf2lcezCoiZqaBqEvBjQU5aKW0,7630
-not1mm/dxcc_tracker.py,sha256=v3ctEyiB9CbA8l70T0ANS-kymo2DXpLIPEp2rj84Bjg,4302
+not1mm/dxcc_tracker.py,sha256=LUTt538mBjOr590WMby-hmRz47XG8xUCkU2x0j4oB4w,4306
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=O2dMaT_BYWsXA_dxsEHN92JwN-qVGy9nmH0MCMaG9gY,42830
 not1mm/lookupservice.py,sha256=GkY_qHZfrW6XHf8upIoaG4hCFqm0fg6Ganu9ConGrIc,2628
@@ -10,7 +10,7 @@ not1mm/radio.py,sha256=4Lysf9BY3vdtYCHwKfzO5WN7IGyh4_lKSVuQ6F4Z08g,5536
 not1mm/ratewindow.py,sha256=iBjqdOetIEX0wSwdGM89Ibt4gVlFdE-K8HQPnkVPVOg,6965
 not1mm/rtc_service.py,sha256=axAwnCBuTr-QL0YwXtWvg9tjwhcFsiiEZFgFjOofX6k,2816
 not1mm/statistics.py,sha256=eOmUvbbYdbbIYHmaEhtBGab1IxAf2RQYV1q9MItpqEM,7969
-not1mm/test.py,sha256=BNhsSvLnNG5hN4pywIWnj4pUBI-wQYY4Ejfbl97knmw,1198
+not1mm/test.py,sha256=WhL0DLlJTD15aON8Dkf2q_tlP_X1juxKZJh0jEC99tU,154
 not1mm/vfo.py,sha256=SsqinokSd8BqVp6l-_DGRKcNN9Uc9JiFYXDl9Ycep1o,10111
 not1mm/voice_keying.py,sha256=HZImqC5NgnyW2nknNYQ3b7I8-6S_hxpq5G4RcIRXn_k,3005
 not1mm/data/JetBrainsMono-Thin.ttf,sha256=B1bo6M8dZfp1GXdnZEebOXPvsVr09BnV1ydNwnrhtwI,270112
@@ -27,7 +27,7 @@ not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,8930
 not1mm/data/cty.json,sha256=3Nk98AoENvBB4RwJCTheDVCjJ1AvX4ik5kg2R0iU1X0,4948509
 not1mm/data/cwmacros.txt,sha256=NztufsX6R52gAO7VyJ2AHr7wOh41pJTwHKh5Lcs32ds,468
 not1mm/data/donors.html,sha256=hxxm23mHP_YUN3PnGwm12CiAutUTl5DQfDpgfyZbimY,370
-not1mm/data/dxcc_tracker.ui,sha256=0TUK2yQfsSUBGrlCIAJ-jEquXN-7Ey5-qlTOLhhUthA,722
+not1mm/data/dxcc_tracker.ui,sha256=BzIdljdJ4ZvRe3WwmahrCZzdKWwR5vcC2KAGSnpPZTY,725
 not1mm/data/editcontact.ui,sha256=ax-pm4TeECpHl3LSb5z4L403WjPWXZ9KV2it_6gIjqk,27404
 not1mm/data/editmacro.ui,sha256=wbLuNwLsMBd9hEKs_6sH3ir5BynH9Bk-u8nWRjNyQ8w,2689
 not1mm/data/greendot.png,sha256=El9TomJcGtViRcHOR7kMxGzjzvYs0TSAqOb3tZv0JDA,368
@@ -106,14 +106,14 @@ not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
 not1mm/lib/cat_interface.py,sha256=jADt45E5AcdEx8FHN4rSDbngeQqVzbtIy43luGWGDK0,27222
 not1mm/lib/cwinterface.py,sha256=rKUnqljHQC_Iljq4TCmAgSPe49lWbKcfxg58cE8YX5Y,5177
-not1mm/lib/database.py,sha256=RTlY_x_O7FguDQPU4gqUTrFv_0fL6LbIt4eyl-MAuCI,52088
+not1mm/lib/database.py,sha256=NYIUoQUPx9zGHATxZ5tQqpQyA2DC2FyJ5spPUGHX3Nw,53441
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
 not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
 not1mm/lib/edit_opon.py,sha256=j3qJ1aBsQoIOnQ9yiBl3lyeISvKTP0I_rtBYBPAfgeI,359
 not1mm/lib/edit_station.py,sha256=hUpqNgboNqhpFzHzjQI0FI8GId6muECRsaXaphN02kQ,1967
 not1mm/lib/fldigi_sendstring.py,sha256=EeXSBRKgyUEzNyHBjMtHiFe-iOU3TcWcCCX77t0ur_I,602
 not1mm/lib/ft8_watcher.py,sha256=BFmVIsnbwuRMWoe-dIBybuCgi0WFmr8Km0O9l4eiwMM,4624
-not1mm/lib/ham_utility.py,sha256=WMmYLDI_fJHHsn0wkpGVit2Hv8fo6r9ybexXROia8Cg,11967
+not1mm/lib/ham_utility.py,sha256=7vsnk_nPAOHoP5XhMCDX6ll0F8Sm9XOI-DFMjB80ZFI,12105
 not1mm/lib/lookup.py,sha256=KECMDi9tflRDzgTLeDfDl7HGWWRHvW3HCjNHyyjoWaY,10835
 not1mm/lib/multicast.py,sha256=KJcruI-bOuHfHXPjl3SGQhL6I9sKrygy-sdFSvxffUM,3255
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
@@ -122,7 +122,7 @@ not1mm/lib/plugin_common.py,sha256=nqiUq11T9Wz8RDrRen4Zvp-KXVWUYcIp5JPZwqmu2Oo,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=5xnsagH48qGeCDhfxPWW9yaXtv8wT13yoIVvYt8h_Qs,16023
 not1mm/lib/super_check_partial.py,sha256=jX7DjHesEV4KNVQbddJui0wAsYHerikH7W0iPv7PXQw,3110
-not1mm/lib/version.py,sha256=9mncf9eD9aRy6OSYsdL-31n5tWanOgAsV_qnaWSZOg4,47
+not1mm/lib/version.py,sha256=sXRrPfTyvfpaX9z-c1mGF5B_4fqe5Zv7Ppj4gk6oCG4,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=oJh3JKqjOpnWElSlZpiQ631UnaOd8qra5s9bl_QoInk,14783
 not1mm/plugins/10_10_spring_cw.py,sha256=p7dSDtbFK0e6Xouw2V6swYn3VFVgHKyx4IfRWyBjMZY,14786
@@ -186,9 +186,9 @@ not1mm/plugins/ukeidx.py,sha256=ZsIFXgOSwjuKNmN4W_C0TAgGqgnabJGNLMHwGkl3_bk,1910
 not1mm/plugins/vhf_sprint.py,sha256=a9QFTpv8XUbZ_GLjdVCh7svykFa-gXOWwKFZ6MD3uQM,19289
 not1mm/plugins/weekly_rtty.py,sha256=C8Xs3Q5UgSYx-mFFar8BVARWtmqlyrbeC98Ubzb4UN8,20128
 not1mm/plugins/winter_field_day.py,sha256=hmAMgkdqIXtnCNyUp8J9Bb8liN8wj10wps6ROuG-Bok,15284
-not1mm-25.6.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.6.8.dist-info/METADATA,sha256=FhPJkZvJlJt3LAV1lYhxQMRhzed2UFpckHwTsffW2ao,35011
-not1mm-25.6.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-not1mm-25.6.8.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.6.8.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.6.8.dist-info/RECORD,,
+not1mm-25.6.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.6.10.dist-info/METADATA,sha256=PgwRNo6RTuKpAR6IKbPGFhVQ4CGN14wxhPu_480m7MU,35108
+not1mm-25.6.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+not1mm-25.6.10.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.6.10.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.6.10.dist-info/RECORD,,