not1mm 25.6.8.1__tar.gz → 25.6.10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.8.1
+Version: 25.6.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -245,6 +245,7 @@ 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.

{not1mm-25.6.8.1 → not1mm-25.6.10}/README.md

@@ -213,6 +213,7 @@ 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.

{not1mm-25.6.8.1 → not1mm-25.6.10}/not1mm/dxcc_tracker.py

@@ -1,6 +1,7 @@
 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, QtWidgets
 import not1mm.fsutils as fsutils
@@ -13,19 +14,6 @@ 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

{not1mm-25.6.8.1 → 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.10/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__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.1 → not1mm-25.6.10}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.8.1
+Version: 25.6.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -245,6 +245,7 @@ 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.

{not1mm-25.6.8.1 → not1mm-25.6.10}/pyproject.toml

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

not1mm-25.6.8.1/not1mm/lib/version.py

@@ -1,3 +0,0 @@
-"""It's the version"""
-
-__version__ = "25.6.8.1"

not1mm-25.6.8.1/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."
-        )