not1mm 24.4.17__py3-none-any.whl → 24.4.24__py3-none-any.whl

not1mm/__main__.py

@@ -37,7 +37,7 @@ except OSError as exception:
     sd = None
 import soundfile as sf
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
-from PyQt6.QtCore import QDir, Qt
+from PyQt6.QtCore import QDir, Qt, QThread
 from PyQt6.QtGui import QFontDatabase, QColorConstants
 from PyQt6.QtWidgets import QFileDialog
 
@@ -75,11 +75,7 @@ from not1mm.logwindow import LogWindow
 from not1mm.checkwindow import CheckWindow
 from not1mm.bandmap import BandMapWindow
 from not1mm.vfo import VfoWindow
-
-CTYFILE = {}
-
-with open(fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8") as c_file:
-    CTYFILE = loads(c_file.read())
+from not1mm.radio import Radio
 
 poll_time = datetime.datetime.now()
 
@@ -111,6 +107,7 @@ class MainWindow(QtWidgets.QMainWindow):
     The main window
     """
 
+    ctyfile = {}
     pref_ref = {
         "sounddevice": "default",
         "useqrz": False,
@@ -190,6 +187,9 @@ class MainWindow(QtWidgets.QMainWindow):
     text_color = QColorConstants.Black
     current_palette = None
 
+    radio_thread = QThread()
+
+    rig_control = None
     log_window = None
     check_window = None
     bandmap_window = None
@@ -476,6 +476,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.setWindowIcon(
             QtGui.QIcon(str(fsutils.APP_DATA_PATH / "k6gte.not1mm-32.png"))
         )
+        with open(fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8") as c_file:
+            self.ctyfile = loads(c_file.read())
         self.readpreferences()
         self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
             "current_database", "ham.db"
@@ -1340,7 +1342,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 with open(
                     fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8"
                 ) as ctyfile:
-                    globals()["CTYFILE"] = loads(ctyfile.read())
+                    self.ctyfile = loads(ctyfile.read())
             else:
                 self.show_message_box("An Error occured updating file.")
         else:
@@ -1589,7 +1591,9 @@ class MainWindow(QtWidgets.QMainWindow):
         callsign = callsign.upper()
         for count in reversed(range(len(callsign))):
             searchitem = callsign[: count + 1]
-            result = {key: val for key, val in CTYFILE.items() if key == searchitem}
+            result = {
+                key: val for key, val in self.ctyfile.items() if key == searchitem
+            }
             if not result:
                 continue
             if result.get(searchitem).get("exact_match"):
@@ -2489,29 +2493,48 @@ class MainWindow(QtWidgets.QMainWindow):
             self.setDarkMode(False)
             self.actionDark_Mode_2.setChecked(False)
 
-        self.rig_control = None
+        try:
+            if self.radio_thread.isRunning():
+                self.rig_control.time_to_quit = True
+                self.radio_thread.quit()
+                self.radio_thread.wait(1000)
+
+        except (RuntimeError, AttributeError):
+            ...
 
         if self.pref.get("useflrig", False):
             logger.debug(
                 "Using flrig: %s",
                 f"{self.pref.get('CAT_ip')} {self.pref.get('CAT_port')}",
             )
-            self.rig_control = CAT(
+            self.rig_control = Radio(
                 "flrig",
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 12345)),
             )
+            self.rig_control.moveToThread(self.radio_thread)
+            self.radio_thread.started.connect(self.rig_control.run)
+            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(
                 "Using rigctld: %s",
                 f"{self.pref.get('CAT_ip')} {self.pref.get('CAT_port')}",
             )
-            self.rig_control = CAT(
+            self.rig_control = Radio(
                 "rigctld",
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 4532)),
             )
+            self.rig_control.moveToThread(self.radio_thread)
+            self.radio_thread.started.connect(self.rig_control.run)
+            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
@@ -3173,81 +3196,67 @@ class MainWindow(QtWidgets.QMainWindow):
                         logger.debug("Destination: %s", str(destination_file))
                         destination_file.write_bytes(child.read_bytes())
 
-    def poll_radio(self) -> None:
-        """
-        Poll radio for VFO, mode, bandwidth.
-        Send state via multicast.
+    def poll_radio(self, the_dict):
+        """catch"""
+        self.set_radio_icon(0)
+        print(f"{the_dict=}")
+        info_dirty = False
+        vfo = the_dict.get("vfoa", "")
+        mode = the_dict.get("mode", "")
+        bw = the_dict.get("bw", "")
+        online = the_dict.get("online", False)
+
+        if online is False:
+            self.set_radio_icon(1)
+        else:
+            self.set_radio_icon(2)
 
-        Parameters
-        ----------
-        None
+            if mode == "CW":
+                self.setmode(mode)
+            if mode == "LSB" or mode == "USB":
+                self.setmode("SSB")
+            if mode == "RTTY":
+                self.setmode("RTTY")
 
-        Returns
-        -------
-        None
-        """
+            if vfo == "":
+                return
+            if self.radio_state.get("vfoa") != vfo:
+                info_dirty = True
+                self.radio_state["vfoa"] = vfo
+            band = getband(str(vfo))
+            self.radio_state["band"] = band
+            self.contact["Band"] = get_logged_band(str(vfo))
+            self.set_band_indicator(band)
 
-        self.set_radio_icon(0)
-        if self.rig_control:
-            if self.rig_control.online is False:
-                self.set_radio_icon(1)
-                self.rig_control.reinit()
-            if self.rig_control.online:
-                self.set_radio_icon(2)
-                info_dirty = False
-                vfo = self.rig_control.get_vfo()
-                mode = self.rig_control.get_mode()
-                bw = self.rig_control.get_bw()
-
-                if mode == "CW":
-                    self.setmode(mode)
-                if mode == "LSB" or mode == "USB":
-                    self.setmode("SSB")
-                if mode == "RTTY":
-                    self.setmode("RTTY")
-
-                if vfo == "":
-                    return
-                if self.radio_state.get("vfoa") != vfo:
-                    info_dirty = True
-                    self.radio_state["vfoa"] = vfo
-                band = getband(str(vfo))
-                self.radio_state["band"] = band
-                self.contact["Band"] = get_logged_band(str(vfo))
-                self.set_band_indicator(band)
-
-                if self.radio_state.get("mode") != mode:
-                    info_dirty = True
-                    self.radio_state["mode"] = mode
-
-                if self.radio_state.get("bw") != bw:
-                    info_dirty = True
-                    self.radio_state["bw"] = bw
-
-                if datetime.datetime.now() > globals()["poll_time"] or info_dirty:
-                    logger.debug("VFO: %s  MODE: %s BW: %s", vfo, mode, bw)
-                    self.set_window_title()
-                    cmd = {}
-                    cmd["cmd"] = "RADIO_STATE"
-                    cmd["station"] = platform.node()
-                    cmd["band"] = band
-                    cmd["vfoa"] = vfo
-                    cmd["mode"] = mode
-                    cmd["bw"] = bw
-                    self.multicast_interface.send_as_json(cmd)
-                    if self.n1mm:
-                        if self.n1mm.send_radio_packets:
-                            self.n1mm.radio_info["Freq"] = vfo[:-1]
-                            self.n1mm.radio_info["TXFreq"] = vfo[:-1]
-                            self.n1mm.radio_info["Mode"] = mode
-                            self.n1mm.radio_info["OpCall"] = self.current_op
-                            self.n1mm.radio_info["IsRunning"] = str(
-                                self.pref.get("run_state", False)
-                            )
-                            self.n1mm.send_radio()
-                    globals()[
-                        "poll_time"
-                    ] = datetime.datetime.now() + datetime.timedelta(seconds=10)
+            if self.radio_state.get("mode") != mode:
+                info_dirty = True
+                self.radio_state["mode"] = mode
+
+            if self.radio_state.get("bw") != bw:
+                info_dirty = True
+                self.radio_state["bw"] = bw
+
+            if info_dirty:
+                logger.debug("VFO: %s  MODE: %s BW: %s", vfo, mode, bw)
+                self.set_window_title()
+                cmd = {}
+                cmd["cmd"] = "RADIO_STATE"
+                cmd["station"] = platform.node()
+                cmd["band"] = band
+                cmd["vfoa"] = vfo
+                cmd["mode"] = mode
+                cmd["bw"] = bw
+                self.multicast_interface.send_as_json(cmd)
+                if self.n1mm:
+                    if self.n1mm.send_radio_packets:
+                        self.n1mm.radio_info["Freq"] = vfo[:-1]
+                        self.n1mm.radio_info["TXFreq"] = vfo[:-1]
+                        self.n1mm.radio_info["Mode"] = mode
+                        self.n1mm.radio_info["OpCall"] = self.current_op
+                        self.n1mm.radio_info["IsRunning"] = str(
+                            self.pref.get("run_state", False)
+                        )
+                        self.n1mm.send_radio()
 
     def edit_cw_macros(self) -> None:
         """
@@ -3447,7 +3456,7 @@ def run() -> None:
         f"Resolved OS file system paths: MODULE_PATH {fsutils.MODULE_PATH}, USER_DATA_PATH {fsutils.USER_DATA_PATH}, CONFIG_PATH {fsutils.CONFIG_PATH}"
     )
     install_icons()
-    timer.start(250)
+    # timer.start(250)
     sys.exit(app.exec())
 
 
@@ -3478,8 +3487,8 @@ y = window.pref.get("window_y", -1)
 window.setGeometry(x, y, width, height)
 window.callsign.setFocus()
 window.show()
-timer = QtCore.QTimer()
-timer.timeout.connect(window.poll_radio)
+# timer = QtCore.QTimer()
+# timer.timeout.connect(window.poll_radio)
 
 if __name__ == "__main__":
     run()

not1mm/checkwindow.py

@@ -35,8 +35,9 @@ class CheckWindow(QDockWidget):
     dxcLayout: QVBoxLayout = None
     qsoLayout: QVBoxLayout = None
 
-    character_remove_color = "#cc3333"
-    character_add_color = "#3333cc"
+    character_remove_color = "#dd3333"
+    character_add_color = "#3333dd"
+    character_match_color = "#33dd33"
 
     masterScrollWidget: QWidget = None
 
@@ -162,7 +163,7 @@ class CheckWindow(QDockWidget):
         None
         """
         while self.multicast_interface.server_udp.hasPendingDatagrams():
-            logger.error("Got multicast ")
+            logger.debug("Got multicast ")
             json_data = self.multicast_interface.read_datagram_as_json()
 
             if json_data.get("station", "") != platform.node():
@@ -283,6 +284,8 @@ class CheckWindow(QDockWidget):
                         elif tag == "insert" or tag == "delete":
                             label_text += f"<span style='background-color: {self.character_add_color};'>{call[i1:i2]}</span>"
                             diff_score += max((i2 - i1), (j2 - j1)) * (len(call) - i2)
+                    if call == self.call:
+                        label_text = f"<span style='background-color: {self.character_match_color};'>{call}</span>"
                     call_items.append((diff_score, label_text, call))
 
         call_items = sorted(call_items, key=lambda x: x[0])

not1mm/lib/ft8_watcher.py

@@ -8,7 +8,7 @@ GPL V3
 
 from PyQt6 import QtNetwork
 
-# import struct
+import struct
 
 
 class FT8Watcher:
@@ -86,21 +86,15 @@ class FT8Watcher:
 
         if packettype == 1:  # Status
             ...
-            # [dialfreq] = struct.unpack(">Q", payload[0:8])
-            # modelen = self.getint(payload[8:12])
-            # mode = payload[12 : 12 + modelen].decode()
-            # payload = payload[12 + modelen :]
-            # dxcalllen = self.getint(payload[0:4])
-            # dxcall = payload[4 : 4 + dxcalllen].decode()
-            # print(
-            #     "Status: sv:%s p:%s u:%s df:%s m:%s dxc:%s",
-            #     version,
-            #     packettype,
-            #     unique,
-            #     dialfreq,
-            #     mode,
-            #     dxcall,
-            # )
+            [dialfreq] = struct.unpack(">Q", payload[0:8])
+            modelen = self.getint(payload[8:12])
+            mode = payload[12 : 12 + modelen].decode()
+            payload = payload[12 + modelen :]
+            dxcalllen = self.getint(payload[0:4])
+            dxcall = payload[4 : 4 + dxcalllen].decode()
+            print(
+                f"Status: sv:{version} p:{packettype} u:{unique} df:{dialfreq} m:{mode} dxc:{dxcall}"
+            )
 
             # if f"{dxcall}{self.band}{self.mode}" in self.dupdict:
             #     self.ft8dupe = f"{dxcall} {self.band}M {self.mode} FT8 Dupe!"

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.17"
+__version__ = "24.4.24"

not1mm/radio.py

@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+
+"""
+Not1MM Contest logger
+Email: michael.bridak@gmail.com
+GPL V3
+"""
+
+# pylint: disable=unused-import, c-extension-no-member, no-member, invalid-name, too-many-lines
+# pylint: disable=logging-fstring-interpolation, line-too-long, no-name-in-module
+
+import datetime
+
+from PyQt6.QtCore import QObject, pyqtSignal
+from not1mm.lib.cat_interface import CAT
+
+
+class Radio(QObject):
+    """Radio class"""
+
+    poll_callback = pyqtSignal(dict)
+
+    cat = None
+    vfoa = "14030000"
+    mode = "CW"
+    bw = "500"
+    delta = 10
+    poll_time = datetime.datetime.now() + datetime.timedelta(seconds=delta)
+    time_to_quit = False
+    online = False
+    interface = None
+    host = None
+    port = None
+
+    def __init__(self, interface: str, host: str, port: int) -> None:
+        super().__init__()
+        """setup interface"""
+        self.interface = interface
+        self.host = host
+        self.port = port
+
+    def run(self):
+        try:
+            self.cat = CAT(self.interface, self.host, self.port)
+        except ConnectionResetError:
+            ...
+        while not self.time_to_quit:
+            if datetime.datetime.now() > self.poll_time:
+                self.poll_time = datetime.datetime.now() + datetime.timedelta(
+                    seconds=self.delta
+                )
+                vfoa = self.cat.get_vfo()
+                self.online = False
+                if vfoa:
+                    self.vfoa = vfoa
+                    self.online = True
+                mode = self.cat.get_mode()
+                if mode:
+                    self.mode = mode
+                    self.online = True
+                bw = self.cat.get_bw()
+                if bw:
+                    self.bw = bw
+                    self.online = True
+                self.poll_callback.emit(
+                    {
+                        "vfoa": self.vfoa,
+                        "mode": self.mode,
+                        "bw": self.bw,
+                        "online": self.online,
+                    }
+                )
+
+    def set_vfo(self, vfo):
+        if self.cat:
+            self.cat.set_vfo(vfo)
+        self.vfoa = vfo
+
+    def set_mode(self, mode):
+        if self.cat:
+            self.cat.set_mode(mode)
+        self.mode = mode
+
+    def ptt_on(self):
+        if self.cat:
+            self.cat.ptt_on()
+
+    def ptt_off(self):
+        if self.cat:
+            self.cat.ptt_off()

{not1mm-24.4.17.dist-info → not1mm-24.4.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.17
+Version: 24.4.24
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -177,6 +177,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
 - [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.
 - [24-4-15] checkwindow.py Tighter results. Changed the call selection to use a single click.
 - [24-4-9-4] Check for portaudio instead of crash boom. Removed empty dockwidget. Tested on Plasma 6.

{not1mm-24.4.17.dist-info → not1mm-24.4.24.dist-info}/RECORD

@@ -1,9 +1,10 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=Lnwp-STJRcTvjH65oYBTIHcjQ-l0tN0pVsRJylkLJds,123143
+not1mm/__main__.py,sha256=MaYfjKcnvksXTKe65bYRMsmS9uEaRuQv26SspQ02zJM,123596
 not1mm/bandmap.py,sha256=3kmRYItrBqpjudFb2NnkGNJpDWkwOpGPQbKwHmYnQ-o,34021
-not1mm/checkwindow.py,sha256=JiVjJO2RJlFDybeVnBQ8yi-1DnS5aiWs2QTHp_bbn5M,10381
+not1mm/checkwindow.py,sha256=9ueFgYLM4RFmroMJBXXn98XWO9ZJ-Dop6MwZUXRNFF0,10577
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=UcO8mgs_E7ier2gg_1ESTaRxABEvcpCwKmSibm7hl74,44603
+not1mm/radio.py,sha256=Goz-5TWSWpz5o488HJj1QJ6o5gjE2wP6sWiL1hubk5Y,2414
 not1mm/vfo.py,sha256=pRRj0XTbeTU9noo3nC1dbg26VYj6gHEw_srUDbyYqC0,12169
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=1vQRvEZ865brfmmajp-Lj-hgWejVGI992q8o971bUV8,366478
@@ -95,7 +96,7 @@ not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,35
 not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
 not1mm/lib/edit_opon.py,sha256=j3qJ1aBsQoIOnQ9yiBl3lyeISvKTP0I_rtBYBPAfgeI,359
 not1mm/lib/edit_station.py,sha256=doL21Hs6jzIE43ohAopdFt_iqnRJZHFcqzcnCS0-iio,1965
-not1mm/lib/ft8_watcher.py,sha256=rqvv7v2CXus0U8bekDenHvFVxFpYpzuApW-SA-SdtIA,4220
+not1mm/lib/ft8_watcher.py,sha256=ISfXjs-Mgbz_lE5SThEnFoCe8apNLElgSuECAMCH18I,4080
 not1mm/lib/ham_utility.py,sha256=pUrysod3wGk4BYOWDAKJxZZTiUNDE4ZzRk8S5ZnllNA,10978
 not1mm/lib/lookup.py,sha256=F2fl5QkMxaGSxl1XMWnLUub3T9Mt7LhCX4acOlAsks4,13952
 not1mm/lib/multicast.py,sha256=bnFUNHyy82GmIb3_88EPBVVssj7-HzkJPaH671cK8Qw,3249
@@ -105,7 +106,7 @@ not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=i4Za_BZDl9UotB10o8sjIkzRdR0493rMI5VaQltUZHA,9054
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=lp8En1g4BUa0u7XbiLsPUscE8NtGX9YMYd2kh52bs_M,48
+not1mm/lib/version.py,sha256=aH3z1Y5ZCxw5yrWiPyG8ZqCLurkMWME0k5P186pnRmA,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=fUjfwjuscDjicXIxsO0JHh7xTR9Vu0iPsrOLb896Qak,10873
 not1mm/plugins/10_10_spring_cw.py,sha256=WNaJP5mBQfaB6SxnFI0Vawt3AKDr94tKVtAK-EVhtUY,10878
@@ -139,9 +140,9 @@ not1mm/plugins/naqp_ssb.py,sha256=IWksulcb2_DxlkeW0h3048t8I-u00G_67KBVKkp-TV4,11
 not1mm/plugins/phone_weekly_test.py,sha256=gCX0ESUoiQzDp9puwibt9-dRembNsiuEeBdawCVvjHA,12316
 not1mm/plugins/stew_perry_topband.py,sha256=DIMI3mGMKokXXb9pPLqdhBI6JVnnIs7ZnAL23nFmshE,10588
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.4.17.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.4.17.dist-info/METADATA,sha256=ukzMJCzVTz35GsO7Fw9cV5dL5DjnwDqKZ9DJnna9m9Q,27573
-not1mm-24.4.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.4.17.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.4.17.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.4.17.dist-info/RECORD,,
+not1mm-24.4.24.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.4.24.dist-info/METADATA,sha256=CLe_G-OcQDrhUASnzk0xmU4A5aUeZLQ1KdCJaoa9rz0,27677
+not1mm-24.4.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.4.24.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.4.24.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.4.24.dist-info/RECORD,,