not1mm 24.10.5__tar.gz → 24.10.6__tar.gz

{not1mm-24.10.5 → not1mm-24.10.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.5
+Version: 24.10.6
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -219,6 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-6] Removed 60, 30, 17 and 12M from the default list of bands.
+- [24-10-5-1] Store the bandmap spots age timer in the preferences.
 - [24-10-5] Force reselction of contest after different DB opened.
 - [24-10-2] Add WPX RTTY.
 - [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
@@ -566,7 +568,7 @@ onscreen icon for CAT status. Green good, Red bad, Grey neither.
 ### CW Keyer interface
 
 Under the `CW` TAB, There are three options. `cwdaemon`, which normally uses IP
-`127.0.0.1` and port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` and
+`127.0.0.1`port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` port `8000` and
 `CAT` which if your radio supports it, sends Morse characters via rigctld. As far
 as I can tell rigctld does not support setting the radios internal keyer speed. So
 the CW speed control widget will not be functional and you'd need to control the

{not1mm-24.10.5 → not1mm-24.10.6}/README.md

@@ -188,6 +188,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-6] Removed 60, 30, 17 and 12M from the default list of bands.
+- [24-10-5-1] Store the bandmap spots age timer in the preferences.
 - [24-10-5] Force reselction of contest after different DB opened.
 - [24-10-2] Add WPX RTTY.
 - [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
@@ -535,7 +537,7 @@ onscreen icon for CAT status. Green good, Red bad, Grey neither.
 ### CW Keyer interface
 
 Under the `CW` TAB, There are three options. `cwdaemon`, which normally uses IP
-`127.0.0.1` and port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` and
+`127.0.0.1`port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` port `8000` and
 `CAT` which if your radio supports it, sends Morse characters via rigctld. As far
 as I can tell rigctld does not support setting the radios internal keyer speed. So
 the CW speed control widget will not be functional and you'd need to control the

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm/__main__.py

@@ -95,7 +95,7 @@ class MainWindow(QtWidgets.QMainWindow):
         "command_buttons": False,
         "cw_macros": True,
         "bands_modes": True,
-        "bands": ["160", "80", "60", "40", "30", "20", "17", "15", "12", "10"],
+        "bands": ["160", "80", "40", "20", "15", "10"],
         "current_database": "ham.db",
         "contest": "",
         "multicast_group": "239.1.1.1",
@@ -125,6 +125,7 @@ class MainWindow(QtWidgets.QMainWindow):
         "cluster_port": 7373,
         "cluster_filter": "Set DX Filter SpotterCont=NA",
         "cluster_mode": "OPEN",
+        "cluster_expire": 1,
         "logwindow": False,
         "bandmapwindow": False,
         "checkwindow": False,
@@ -600,6 +601,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.bandmap_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
         self.bandmap_window.hide()
+        self.bandmap_window.cluster_expire.connect(self.cluster_expire_updated)
 
         self.show_splash_msg("Setting up CheckWindow.")
         self.check_window = CheckWindow()
@@ -658,6 +660,11 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         QCoreApplication.processEvents()
 
+    def cluster_expire_updated(self, number):
+        """signal from bandmap"""
+        self.pref["cluster_expire"] = int(number)
+        self.write_preference()
+
     def fldigi_qso(self, result: str):
         """
         gets called when there is a new fldigi qso logged.
@@ -2585,7 +2592,6 @@ class MainWindow(QtWidgets.QMainWindow):
             self.radio_thread.finished.connect(self.rig_control.deleteLater)
             self.rig_control.poll_callback.connect(self.poll_radio)
             self.radio_thread.start()
-            # self.rig_control.delta = 1
 
         if self.pref.get("userigctld", False):
             logger.debug(
@@ -2602,7 +2608,6 @@ class MainWindow(QtWidgets.QMainWindow):
             self.radio_thread.finished.connect(self.rig_control.deleteLater)
             self.rig_control.poll_callback.connect(self.poll_radio)
             self.radio_thread.start()
-            # self.rig_control.delta = 1
 
         if self.pref.get("cwtype", 0) == 0:
             self.cw = None
@@ -3597,6 +3602,21 @@ def run() -> None:
     """
     Main Entry
     """
+    splash.show()
+    # app.processEvents()
+    splash.showMessage(
+        "Starting Up",
+        alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
+        color=QColor(255, 255, 0),
+    )
+    QCoreApplication.processEvents()
+
+    families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
+    logger.info(f"font families {families}")
+    window = MainWindow(splash)
+    window.callsign.setFocus()
+    splash.finish(window)
+    window.show()
     logger.debug(
         f"Resolved OS file system paths: MODULE_PATH {fsutils.MODULE_PATH}, USER_DATA_PATH {fsutils.USER_DATA_PATH}, CONFIG_PATH {fsutils.CONFIG_PATH}"
     )
@@ -3620,25 +3640,11 @@ logging.basicConfig(
 )
 logging.getLogger("PyQt6.uic.uiparser").setLevel("INFO")
 logging.getLogger("PyQt6.uic.properties").setLevel("INFO")
+
 app = QtWidgets.QApplication(sys.argv)
 
 pixmap = QPixmap(f"{os.fspath(fsutils.APP_DATA_PATH)}/splash.png")
 splash = QSplashScreen(pixmap)
-splash.show()
-# app.processEvents()
-splash.showMessage(
-    "Starting Up",
-    alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
-    color=QColor(255, 255, 0),
-)
-QCoreApplication.processEvents()
-
-families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
-logger.info(f"font families {families}")
-window = MainWindow(splash)
-window.callsign.setFocus()
-splash.finish(window)
-window.show()
 
 if __name__ == "__main__":
     run()

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm/bandmap.py

@@ -21,6 +21,7 @@ from json import loads
 from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
 from PyQt6.QtGui import QColorConstants, QPalette, QColor
 from PyQt6.QtWidgets import QDockWidget
+from PyQt6.QtCore import pyqtSignal
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.multicast import Multicast
@@ -322,6 +323,7 @@ class BandMapWindow(QDockWidget):
     worked_list = {}
     multicast_interface = None
     text_color = QColor(45, 45, 45)
+    cluster_expire = pyqtSignal(str)
 
     def __init__(self):
         super().__init__()
@@ -329,6 +331,9 @@ class BandMapWindow(QDockWidget):
 
         uic.loadUi(fsutils.APP_DATA_PATH / "bandmap.ui", self)
         self.settings = self.get_settings()
+        self.clear_spot_olderSpinBox.setValue(
+            int(self.settings.get("cluster_expire", 1))
+        )
         self.agetime = self.clear_spot_olderSpinBox.value()
         self.clear_spot_olderSpinBox.valueChanged.connect(self.spot_aging_changed)
         self.clearButton.clicked.connect(self.clear_spots)
@@ -876,6 +881,7 @@ class BandMapWindow(QDockWidget):
     def spot_aging_changed(self) -> None:
         """Called when spot aging spinbox is changed."""
         self.agetime = self.clear_spot_olderSpinBox.value()
+        self.cluster_expire.emit(str(self.agetime))
 
     def showContextMenu(self) -> None:
         """doc string for the linter"""

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm/lib/multicast.py

@@ -31,11 +31,11 @@ class Multicast:
             int(self.multicast_port),
             QtNetwork.QAbstractSocket.BindFlag.ReuseAddressHint,
         )
-        logger.warn(f"multicast bind {b_result}")
+        logger.warning(f"multicast bind {b_result}")
         join_result = self.server_udp.joinMulticastGroup(
             QtNetwork.QHostAddress(self.multicast_group)
         )
-        logger.warn(f"joinMulticastGroup result {join_result}")
+        logger.warning(f"joinMulticastGroup result {join_result}")
 
     def has_pending_datagrams(self) -> bool:
         """Check if there is a pending datagram"""

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.10.5"
+__version__ = "24.10.6"

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm/plugins/cq_wpx_rtty.py

@@ -491,7 +491,7 @@ def ft8_handler(the_packet: dict):
         ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
         ALTEREGO.contact["SNT"] = ALTEREGO.sent.text()
         ALTEREGO.contact["RCV"] = ALTEREGO.receive.text()
-        ALTEREGO.contact["Exchange1"] = f"{the_packet.get("STATE", "")}".strip()
+        ALTEREGO.contact["Exchange1"] = f'{the_packet.get("STATE", "")}'.strip()
         ALTEREGO.contact["ZN"] = the_packet.get("CQZ", "")
         ALTEREGO.contact["Mode"] = the_packet.get("MODE", "ERR")
         ALTEREGO.contact["Freq"] = round(float(the_packet.get("FREQ", "0.0")) * 1000, 2)
@@ -502,6 +502,6 @@ def ft8_handler(the_packet: dict):
             str(int(float(the_packet.get("FREQ", "0.0")) * 1000000))
         )
         logger.debug(f"{ALTEREGO.contact=}")
-        ALTEREGO.other_1.setText(f"{the_packet.get("STX", "")}".strip())
-        ALTEREGO.other_2.setText(f"{the_packet.get("SRX", "")}".strip())
+        ALTEREGO.other_1.setText(f'{the_packet.get("STX", "")}'.strip())
+        ALTEREGO.other_2.setText(f'{the_packet.get("SRX", "")}'.strip())
         ALTEREGO.save_contact()

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm/plugins/cq_ww_rtty.py

@@ -477,7 +477,7 @@ def ft8_handler(the_packet: dict):
         ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
         ALTEREGO.contact["SNT"] = ALTEREGO.sent.text()
         ALTEREGO.contact["RCV"] = ALTEREGO.receive.text()
-        ALTEREGO.contact["Exchange1"] = f"{the_packet.get("STATE", "")}".strip()
+        ALTEREGO.contact["Exchange1"] = f'{the_packet.get("STATE", "")}'.strip()
         ALTEREGO.contact["ZN"] = the_packet.get("CQZ", "")
         ALTEREGO.contact["Mode"] = the_packet.get("MODE", "ERR")
         ALTEREGO.contact["Freq"] = round(float(the_packet.get("FREQ", "0.0")) * 1000, 2)
@@ -489,5 +489,5 @@ def ft8_handler(the_packet: dict):
         )
         logger.debug(f"{ALTEREGO.contact=}")
         ALTEREGO.other_1.setText(str(the_packet.get("CQZ", "ERR")))
-        ALTEREGO.other_2.setText(f"{the_packet.get("STATE", "")}".strip())
+        ALTEREGO.other_2.setText(f'{the_packet.get("STATE", "")}'.strip())
         ALTEREGO.save_contact()

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.5
+Version: 24.10.6
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -219,6 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-6] Removed 60, 30, 17 and 12M from the default list of bands.
+- [24-10-5-1] Store the bandmap spots age timer in the preferences.
 - [24-10-5] Force reselction of contest after different DB opened.
 - [24-10-2] Add WPX RTTY.
 - [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
@@ -566,7 +568,7 @@ onscreen icon for CAT status. Green good, Red bad, Grey neither.
 ### CW Keyer interface
 
 Under the `CW` TAB, There are three options. `cwdaemon`, which normally uses IP
-`127.0.0.1` and port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` and
+`127.0.0.1`port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` port `8000` and
 `CAT` which if your radio supports it, sends Morse characters via rigctld. As far
 as I can tell rigctld does not support setting the radios internal keyer speed. So
 the CW speed control widget will not be functional and you'd need to control the

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm.egg-info/SOURCES.txt

@@ -165,4 +165,5 @@ not1mm/plugins/phone_weekly_test.py
 not1mm/plugins/ref_cw.py
 not1mm/plugins/stew_perry_topband.py
 not1mm/plugins/weekly_rtty.py
-not1mm/plugins/winter_field_day.py
+not1mm/plugins/winter_field_day.py
+test/contests.py

{not1mm-24.10.5 → not1mm-24.10.6}/not1mm.egg-info/top_level.txt

@@ -2,3 +2,5 @@ dist
 not1mm
 pic
 research
+test
+venv

{not1mm-24.10.5 → not1mm-24.10.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.10.5"
+version = "24.10.6"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"