not1mm 23.10.28__tar.gz → 23.10.31__tar.gz

{not1mm-23.10.28 → not1mm-23.10.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.10.28
+Version: 23.10.31
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -154,7 +154,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [23-10-28] Merged PR from #qsantos, fixing crash related to zombie processes.
+- [23-10-31] Fix crash if flrig wasn't running. Add CAT status icon.
+- [23-10-28] Merged PR from #qsantos and #bseidenberg, fixing crash related to zombie processes.
 - [23-10-22] Where've I been? Sorry, I've been caring for a family member. Be back soon.
 - [23-9-3] Added some accessibility stuff for screen readers. Fixed crash when entering invalid frequency in log window. You can now edit cells in the focused half of the log window.
 - [23-9-2] CTRL+SHIFT+K to open CW text entry field.
@@ -345,7 +346,7 @@ Choose the sound output device for the voice keyer.
 
 ### CAT
 
-Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really?
+Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really? There's an onscreen icon for CAT status. Green good, Red bad, Grey neither.
 
 ### CW Keyer interface
 

{not1mm-23.10.28 → not1mm-23.10.31}/README.md

@@ -126,7 +126,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [23-10-28] Merged PR from #qsantos, fixing crash related to zombie processes.
+- [23-10-31] Fix crash if flrig wasn't running. Add CAT status icon.
+- [23-10-28] Merged PR from #qsantos and #bseidenberg, fixing crash related to zombie processes.
 - [23-10-22] Where've I been? Sorry, I've been caring for a family member. Be back soon.
 - [23-9-3] Added some accessibility stuff for screen readers. Fixed crash when entering invalid frequency in log window. You can now edit cells in the focused half of the log window.
 - [23-9-2] CTRL+SHIFT+K to open CW text entry field.
@@ -317,7 +318,7 @@ Choose the sound output device for the voice keyer.
 
 ### CAT
 
-Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really?
+Under the `CAT` TAB, you can choose either `rigctld` normally with an IP of `127.0.0.1` and a port of `4532`. Or `flrig`, IP normally of `127.0.0.1` and a port of `12345`. `None` is always an option, but is it really? There's an onscreen icon for CAT status. Green good, Red bad, Grey neither.
 
 ### CW Keyer interface
 

{not1mm-23.10.28 → not1mm-23.10.31}/not1mm/__main__.py

@@ -105,9 +105,7 @@ def check_process(name: str) -> bool:
             if len(proc.cmdline()) == 2:
                 if name in proc.cmdline()[1]:
                     return True
-        except psutil.NoSuchProcess:
-            continue
-        except psutil.ZombieProcess:
+        except (psutil.NoSuchProcess, psutil.ZombieProcess):
             continue
     return False
 
@@ -262,6 +260,11 @@ class MainWindow(QtWidgets.QMainWindow):
         self.leftdot.setPixmap(self.greendot)
         self.rightdot.setPixmap(self.reddot)
 
+        self.radio_grey = QtGui.QPixmap(icon_path + "radio_grey.png")
+        self.radio_red = QtGui.QPixmap(icon_path + "radio_red.png")
+        self.radio_green = QtGui.QPixmap(icon_path + "radio_green.png")
+        self.radio_icon.setPixmap(self.radio_grey)
+
         self.F1.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.F1.customContextMenuRequested.connect(self.edit_F1)
         self.F1.clicked.connect(self.sendf1)
@@ -378,6 +381,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 "You can udate to the current version by using:\npip install -U not1mm"
             )
 
+    def set_radio_icon(self, state: int) -> None:
+        """change CAT icon state"""
+        displaystate = [self.radio_grey, self.radio_red, self.radio_green]
+        try:
+            self.radio_icon.setPixmap(displaystate[state])
+        except (IndexError, TypeError) as err:
+            logger.debug(err)
+
     def toggle_cw_entry(self) -> None:
         """Toggle the CW entry field on and off."""
         self.cw_entry_visible = not self.cw_entry_visible
@@ -842,15 +853,7 @@ class MainWindow(QtWidgets.QMainWindow):
         try:
             cty = notctyparser.BigCty(WORKING_PATH + "/data/cty.json")
             update_available = cty.check_update()
-        except AttributeError as the_error:
-            logger.debug("cty parser returned an error: %s", the_error)
-            return
-        except ValueError as the_error:
-            print("cty parser returned an error: %s", the_error)
-            logger.debug("cty parser returned an error: %s", the_error)
-            return
-        except locale.Error as the_error:
-            print("cty parser returned an error: %s", the_error)
+        except (AttributeError, ValueError, locale.Error) as the_error:
             logger.debug("cty parser returned an error: %s", the_error)
             return
         logger.debug("Newer cty file available %s", str(update_available))
@@ -1884,6 +1887,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 12345)),
             )
+
         if self.pref.get("userigctld", False):
             logger.debug(
                 "Using rigctld: %s",
@@ -2325,10 +2329,13 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def poll_radio(self) -> None:
         """stub"""
+        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()