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

not1mm/__main__.py

@@ -42,7 +42,6 @@ from PyQt6.QtGui import QFontDatabase, QColorConstants
 from PyQt6.QtWidgets import QFileDialog
 
 from not1mm.lib.about import About
-from not1mm.lib.cat_interface import CAT
 from not1mm.lib.cwinterface import CW
 from not1mm.lib.database import DataBase
 from not1mm.lib.edit_macro import EditMacro
@@ -504,7 +503,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.log_window.close()
         if self.actionLog_Window.isChecked():
             self.log_window = LogWindow()
-            self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_window)
+            self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
             self.log_window.show()
 
         self.actionBandmap.setChecked(self.pref.get("bandmapwindow", False))
@@ -1471,7 +1470,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.log_window.close()
         if self.actionLog_Window.isChecked():
             self.log_window = LogWindow()
-            self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_window)
+            self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
             self.log_window.show()
 
     def launch_bandmap_window(self) -> None:
@@ -3197,9 +3196,12 @@ class MainWindow(QtWidgets.QMainWindow):
                         destination_file.write_bytes(child.read_bytes())
 
     def poll_radio(self, the_dict):
-        """catch"""
+        """
+        Gets called by thread worker radio.py
+        Passing in a dictionary object with the
+        vfo freq, mode, bandwidth, and online state of the radio.
+        """
         self.set_radio_icon(0)
-        print(f"{the_dict=}")
         info_dirty = False
         vfo = the_dict.get("vfoa", "")
         mode = the_dict.get("mode", "")
@@ -3211,52 +3213,52 @@ class MainWindow(QtWidgets.QMainWindow):
         else:
             self.set_radio_icon(2)
 
-            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 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("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 self.radio_state.get("bw") != bw:
-                info_dirty = True
-                self.radio_state["bw"] = bw
+        if mode == "CW":
+            self.setmode(mode)
+        if mode == "LSB" or mode == "USB":
+            self.setmode("SSB")
+        if mode == "RTTY":
+            self.setmode("RTTY")
 
-            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()
+        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:
         """

not1mm/lib/version.py

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

not1mm/radio.py

@@ -11,7 +11,7 @@ GPL V3
 
 import datetime
 
-from PyQt6.QtCore import QObject, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtSignal, QThread
 from not1mm.lib.cat_interface import CAT
 
 
@@ -24,7 +24,7 @@ class Radio(QObject):
     vfoa = "14030000"
     mode = "CW"
     bw = "500"
-    delta = 10
+    delta = 1
     poll_time = datetime.datetime.now() + datetime.timedelta(seconds=delta)
     time_to_quit = False
     online = False
@@ -70,16 +70,33 @@ class Radio(QObject):
                         "online": self.online,
                     }
                 )
+            QThread.msleep(100)
 
     def set_vfo(self, vfo):
         if self.cat:
             self.cat.set_vfo(vfo)
         self.vfoa = vfo
+        self.poll_callback.emit(
+            {
+                "vfoa": self.vfoa,
+                "mode": self.mode,
+                "bw": self.bw,
+                "online": self.online,
+            }
+        )
 
     def set_mode(self, mode):
         if self.cat:
             self.cat.set_mode(mode)
         self.mode = mode
+        self.poll_callback.emit(
+            {
+                "vfoa": self.vfoa,
+                "mode": self.mode,
+                "bw": self.bw,
+                "online": self.online,
+            }
+        )
 
     def ptt_on(self):
         if self.cat:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.24
+Version: 24.4.25.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -177,6 +177,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
+- [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
 - [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.

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

@@ -1,10 +1,10 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=MaYfjKcnvksXTKe65bYRMsmS9uEaRuQv26SspQ02zJM,123596
+not1mm/__main__.py,sha256=TPnGFy4UQkvMBpjW1xyK1iPUNrj16nIAA6SS6IP5yF0,123515
 not1mm/bandmap.py,sha256=3kmRYItrBqpjudFb2NnkGNJpDWkwOpGPQbKwHmYnQ-o,34021
 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/radio.py,sha256=im14hFLKu0NreymcYoeSE3gyFHoXygP8azY0nsfBLP0,2876
 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
@@ -106,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=aH3z1Y5ZCxw5yrWiPyG8ZqCLurkMWME0k5P186pnRmA,48
+not1mm/lib/version.py,sha256=5VfzMqJpSG9cTllQxeEteOeBs_mZEETIMigeCC1OoCI,50
 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
@@ -140,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.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,,
+not1mm-24.4.25.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.4.25.1.dist-info/METADATA,sha256=BSMf_2zOxDbDk8E4rgSG9kr8X6itsdP00ZY8KEIxGgo,27891
+not1mm-24.4.25.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.4.25.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.4.25.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.4.25.1.dist-info/RECORD,,