not1mm 25.6.8__tar.gz → 25.6.10__tar.gz

{not1mm-25.6.8 → not1mm-25.6.10}/PKG-INFO

@@ -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 → not1mm-25.6.10}/README.md

@@ -213,7 +213,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 → not1mm-25.6.10}/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-25.6.10/not1mm/dxcc_tracker.py

@@ -0,0 +1,139 @@
+from PyQt6.QtWidgets import QDockWidget
+from PyQt6.QtGui import QBrush, QColor
+
+# from PyQt6.QtCore import Qt
+from PyQt6.QtCore import pyqtSignal
+from PyQt6 import uic, QtWidgets
+import not1mm.fsutils as fsutils
+from not1mm.lib.database import DataBase
+import os
+from json import loads
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+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.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 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:
+        """
+        Loads the preferences from the config file into the self.pref dictionary.
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        None
+        """
+        try:
+            if os.path.exists(fsutils.CONFIG_FILE):
+                with open(
+                    fsutils.CONFIG_FILE, "rt", encoding="utf-8"
+                ) as file_descriptor:
+                    self.pref = loads(file_descriptor.read())
+                    logger.info("%s", self.pref)
+            else:
+                self.pref["current_database"] = "ham.db"
+
+        except IOError as exception:
+            logger.critical("Error: %s", exception)
+
+    def load_new_db(self) -> None:
+        """
+        If the database changes reload it.
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        None
+        """
+        self.load_pref()
+        self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
+            "current_database", "ham.db"
+        )
+        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 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-25.6.8 → not1mm-25.6.10}/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-25.6.8 → not1mm-25.6.10}/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-25.6.8 → not1mm-25.6.10}/not1mm/lib/version.py

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

not1mm-25.6.10/not1mm/test.py

@@ -0,0 +1,5 @@
+from not1mm.lib.rot_interface import RotatorInterface
+
+rotator = RotatorInterface()
+if rotator.connected is True:
+    print(f"{rotator.get_position()=}")

{not1mm-25.6.8 → not1mm-25.6.10}/not1mm.egg-info/PKG-INFO

@@ -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 → not1mm-25.6.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "25.6.8"
+version = "25.6.10"
 description = "NOT1MM Logger"
 license = { text = "GPL-3.0-or-later" }
 readme = "README.md"

not1mm-25.6.8/not1mm/dxcc_tracker.py

@@ -1,132 +0,0 @@
-from PyQt6.QtWidgets import QDockWidget, QTableView
-from PyQt6.QtSql import QSqlDatabase, QSqlQueryModel, QSqlQuery
-from PyQt6.QtGui import QBrush, QColor
-from PyQt6.QtCore import Qt
-from PyQt6.QtCore import pyqtSignal
-from PyQt6 import uic
-import not1mm.fsutils as fsutils
-import os
-from json import loads
-
-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 = {}
-
-    def __init__(self):
-        super().__init__()
-        self.active = False
-        uic.loadUi(fsutils.APP_DATA_PATH / "dxcc_tracker.ui", self)
-        self.setWindowTitle("DXCC Tracker")
-        self.load_pref()
-        self.db = QSqlDatabase.addDatabase("QSQLITE")
-        self.tableView.verticalHeader().setVisible(False)
-
-    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 load_pref(self) -> None:
-        """
-        Loads the preferences from the config file into the self.pref dictionary.
-
-        Parameters
-        ----------
-        None
-
-        Returns
-        -------
-        None
-        """
-        try:
-            if os.path.exists(fsutils.CONFIG_FILE):
-                with open(
-                    fsutils.CONFIG_FILE, "rt", encoding="utf-8"
-                ) as file_descriptor:
-                    self.pref = loads(file_descriptor.read())
-                    logger.info("%s", self.pref)
-            else:
-                self.pref["current_database"] = "ham.db"
-
-        except IOError as exception:
-            logger.critical("Error: %s", exception)
-
-    def load_new_db(self) -> None:
-        """
-        If the database changes reload it.
-
-        Parameters
-        ----------
-        None
-
-        Returns
-        -------
-        None
-        """
-        self.load_pref()
-        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
-
-    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()

not1mm-25.6.8/not1mm/test.py

@@ -1,37 +0,0 @@
-import datetime
-
-
-# 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."
-        )