not1mm 23.12.20__py3-none-any.whl → 23.12.24__py3-none-any.whl

not1mm/__main__.py

@@ -127,7 +127,7 @@ class MainWindow(QtWidgets.QMainWindow):
         "command_buttons": False,
         "cw_macros": True,
         "bands_modes": True,
-        "bands": ["160m", "80m", "40m", "20m", "15m", "10m"],
+        "bands": ["160", "80", "40", "20", "15", "10"],
         "window_height": 200,
         "window_width": 600,
         "window_x": 120,
@@ -270,80 +270,148 @@ class MainWindow(QtWidgets.QMainWindow):
         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)
+        self.F1.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F1))
+        self.F1.clicked.connect(lambda x: self.process_function_key(self.F1))
         self.F2.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F2.customContextMenuRequested.connect(self.edit_F2)
-        self.F2.clicked.connect(self.sendf2)
+        self.F2.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F2))
+        self.F2.clicked.connect(lambda x: self.process_function_key(self.F2))
         self.F3.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F3.customContextMenuRequested.connect(self.edit_F3)
-        self.F3.clicked.connect(self.sendf3)
+        self.F3.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F3))
+        self.F3.clicked.connect(lambda x: self.process_function_key(self.F3))
         self.F4.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F4.customContextMenuRequested.connect(self.edit_F4)
-        self.F4.clicked.connect(self.sendf4)
+        self.F4.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F4))
+        self.F4.clicked.connect(lambda x: self.process_function_key(self.F4))
         self.F5.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F5.customContextMenuRequested.connect(self.edit_F5)
-        self.F5.clicked.connect(self.sendf5)
+        self.F5.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F5))
+        self.F5.clicked.connect(lambda x: self.process_function_key(self.F5))
         self.F6.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F6.customContextMenuRequested.connect(self.edit_F6)
-        self.F6.clicked.connect(self.sendf6)
+        self.F6.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F6))
+        self.F6.clicked.connect(lambda x: self.process_function_key(self.F6))
         self.F7.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F7.customContextMenuRequested.connect(self.edit_F7)
-        self.F7.clicked.connect(self.sendf7)
+        self.F7.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F7))
+        self.F7.clicked.connect(lambda x: self.process_function_key(self.F7))
         self.F8.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F8.customContextMenuRequested.connect(self.edit_F8)
-        self.F8.clicked.connect(self.sendf8)
+        self.F8.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F8))
+        self.F8.clicked.connect(lambda x: self.process_function_key(self.F8))
         self.F9.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F9.customContextMenuRequested.connect(self.edit_F9)
-        self.F9.clicked.connect(self.sendf9)
+        self.F9.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F9))
+        self.F9.clicked.connect(lambda x: self.process_function_key(self.F9))
         self.F10.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F10.customContextMenuRequested.connect(self.edit_F10)
-        self.F10.clicked.connect(self.sendf10)
+        self.F10.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F10))
+        self.F10.clicked.connect(lambda x: self.process_function_key(self.F10))
         self.F11.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F11.customContextMenuRequested.connect(self.edit_F11)
-        self.F11.clicked.connect(self.sendf11)
+        self.F11.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F11))
+        self.F11.clicked.connect(lambda x: self.process_function_key(self.F11))
         self.F12.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
-        self.F12.customContextMenuRequested.connect(self.edit_F12)
-        self.F12.clicked.connect(self.sendf12)
-
-        self.cw_band_160.mousePressEvent = self.click_160_cw
-        self.cw_band_80.mousePressEvent = self.click_80_cw
-        self.cw_band_40.mousePressEvent = self.click_40_cw
-        self.cw_band_20.mousePressEvent = self.click_20_cw
-        self.cw_band_15.mousePressEvent = self.click_15_cw
-        self.cw_band_10.mousePressEvent = self.click_10_cw
-        self.cw_band_6.mousePressEvent = self.click_6_cw
-        self.cw_band_2.mousePressEvent = self.click_2_cw
-        self.cw_band_125.mousePressEvent = self.click_125_cw
-        self.cw_band_70cm.mousePressEvent = self.click_70cm_cw
-        self.cw_band_33cm.mousePressEvent = self.click_33cm_cw
-        self.cw_band_23cm.mousePressEvent = self.click_23cm_cw
-
-        self.ssb_band_160.mousePressEvent = self.click_160_ssb
-        self.ssb_band_80.mousePressEvent = self.click_80_ssb
-        self.ssb_band_40.mousePressEvent = self.click_40_ssb
-        self.ssb_band_20.mousePressEvent = self.click_20_ssb
-        self.ssb_band_15.mousePressEvent = self.click_15_ssb
-        self.ssb_band_10.mousePressEvent = self.click_10_ssb
-        self.ssb_band_6.mousePressEvent = self.click_6_ssb
-        self.ssb_band_2.mousePressEvent = self.click_2_ssb
-        self.ssb_band_125.mousePressEvent = self.click_125_ssb
-        self.ssb_band_70cm.mousePressEvent = self.click_70cm_ssb
-        self.ssb_band_33cm.mousePressEvent = self.click_33cm_ssb
-        self.ssb_band_23cm.mousePressEvent = self.click_23cm_ssb
-
-        self.rtty_band_160.mousePressEvent = self.click_160_rtty
-        self.rtty_band_80.mousePressEvent = self.click_80_rtty
-        self.rtty_band_40.mousePressEvent = self.click_40_rtty
-        self.rtty_band_20.mousePressEvent = self.click_20_rtty
-        self.rtty_band_15.mousePressEvent = self.click_15_rtty
-        self.rtty_band_10.mousePressEvent = self.click_10_rtty
-        self.rtty_band_6.mousePressEvent = self.click_6_rtty
-        self.rtty_band_2.mousePressEvent = self.click_2_rtty
-        self.rtty_band_125.mousePressEvent = self.click_125_rtty
-        self.rtty_band_70cm.mousePressEvent = self.click_70cm_rtty
-        self.rtty_band_33cm.mousePressEvent = self.click_33cm_rtty
-        self.rtty_band_23cm.mousePressEvent = self.click_23cm_rtty
+        self.F12.customContextMenuRequested.connect(lambda x: self.edit_macro(self.F12))
+        self.F12.clicked.connect(lambda x: self.process_function_key(self.F12))
+
+        self.cw_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            160, "CW"
+        )
+        self.cw_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            80, "CW"
+        )
+        self.cw_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            40, "CW"
+        )
+        self.cw_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            20, "CW"
+        )
+        self.cw_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            15, "CW"
+        )
+        self.cw_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            10, "CW"
+        )
+        self.cw_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(6, "CW")
+        self.cw_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(2, "CW")
+        self.cw_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            222, "CW"
+        )
+        self.cw_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            432, "CW"
+        )
+        self.cw_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            902, "CW"
+        )
+        self.cw_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            1240, "CW"
+        )
+
+        self.ssb_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            160, "SSB"
+        )
+        self.ssb_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            80, "SSB"
+        )
+        self.ssb_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            40, "SSB"
+        )
+        self.ssb_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            20, "SSB"
+        )
+        self.ssb_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            15, "SSB"
+        )
+        self.ssb_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            10, "SSB"
+        )
+        self.ssb_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            6, "SSB"
+        )
+        self.ssb_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            2, "SSB"
+        )
+        self.ssb_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            222, "SSB"
+        )
+        self.ssb_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            432, "SSB"
+        )
+        self.ssb_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            902, "SSB"
+        )
+        self.ssb_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            1240, "SSB"
+        )
+
+        self.rtty_band_160.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            160, "RTTY"
+        )
+        self.rtty_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            80, "RTTY"
+        )
+        self.rtty_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            40, "RTTY"
+        )
+        self.rtty_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            20, "RTTY"
+        )
+        self.rtty_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            15, "RTTY"
+        )
+        self.rtty_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            10, "RTTY"
+        )
+        self.rtty_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            6, "RTTY"
+        )
+        self.rtty_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            2, "RTTY"
+        )
+        self.rtty_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            222, "RTTY"
+        )
+        self.rtty_band_70cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            432, "RTTY"
+        )
+        self.rtty_band_33cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            902, "RTTY"
+        )
+        self.rtty_band_23cm.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            1240, "RTTY"
+        )
 
         self.band_indicators_cw = {
             "160": self.cw_band_160,
@@ -454,159 +522,27 @@ class MainWindow(QtWidgets.QMainWindow):
             self.cw.sendcw(newtext[len(self.oldtext) :])
         self.oldtext = newtext
 
-    def click_160_cw(self, _event) -> None:
-        """Handle clicked on label"""
-        self.change_to_band_and_mode(160, "CW")
-
-    def click_80_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(80, "CW")
-
-    def click_40_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(40, "CW")
-
-    def click_20_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(20, "CW")
-
-    def click_15_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(15, "CW")
-
-    def click_10_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(10, "CW")
-
-    def click_6_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(6, "CW")
-
-    def click_2_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(2, "CW")
-
-    def click_125_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(222, "CW")
-
-    def click_70cm_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(432, "CW")
-
-    def click_33cm_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(902, "CW")
-
-    def click_23cm_cw(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(1240, "CW")
-
-    def click_160_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(160, "SSB")
-
-    def click_80_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(80, "SSB")
-
-    def click_40_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(40, "SSB")
-
-    def click_20_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(20, "SSB")
-
-    def click_15_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(15, "SSB")
-
-    def click_10_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(10, "SSB")
-
-    def click_6_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(6, "SSB")
-
-    def click_2_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(2, "SSB")
-
-    def click_125_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(222, "SSB")
-
-    def click_70cm_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(432, "SSB")
-
-    def click_33cm_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(902, "SSB")
-
-    def click_23cm_ssb(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(1240, "SSB")
-
-    def click_160_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(160, "RTTY")
-
-    def click_80_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(80, "RTTY")
-
-    def click_40_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(40, "RTTY")
-
-    def click_20_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(20, "RTTY")
-
-    def click_15_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(15, "RTTY")
-
-    def click_10_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(10, "RTTY")
-
-    def click_6_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(6, "RTTY")
-
-    def click_2_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(2, "RTTY")
-
-    def click_125_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(222, "RTTY")
-
-    def click_70cm_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(432, "RTTY")
-
-    def click_33cm_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(902, "RTTY")
+    def change_to_band_and_mode(self, band: int, mode: str) -> None:
+        """
+        Gets a sane frequency for the chosen band and mode.
+        Then changes to that,
 
-    def click_23cm_rtty(self, _event) -> None:
-        """doc"""
-        self.change_to_band_and_mode(1240, "RTTY")
+        Parameters
+        ----------
+        band : int
+        mode : str
 
-    def change_to_band_and_mode(self, band, mode) -> None:
-        """doc"""
+        Returns
+        -------
+        Nothing
+        """
         if mode in ["CW", "SSB", "RTTY"]:
             freq = fakefreq(str(band), mode)
             self.change_freq(freq)
             self.change_mode(mode)
 
     def quit_app(self) -> None:
-        """doc"""
+        """Send multicast quit message, then quit the program."""
         cmd = {}
         cmd["cmd"] = "HALT"
         cmd["station"] = platform.node()
@@ -1298,29 +1234,29 @@ class MainWindow(QtWidgets.QMainWindow):
                     next_tab.end(False)
                 return
         if event.key() == Qt.Key_F1:
-            self.sendf1()
+            self.process_function_key(self.F1)
         if event.key() == Qt.Key_F2:
-            self.sendf2()
+            self.process_function_key(self.F2)
         if event.key() == Qt.Key_F3:
-            self.sendf3()
+            self.process_function_key(self.F3)
         if event.key() == Qt.Key_F4:
-            self.sendf4()
+            self.process_function_key(self.F4)
         if event.key() == Qt.Key_F5:
-            self.sendf5()
+            self.process_function_key(self.F5)
         if event.key() == Qt.Key_F6:
-            self.sendf6()
+            self.process_function_key(self.F6)
         if event.key() == Qt.Key_F7:
-            self.sendf7()
+            self.process_function_key(self.F7)
         if event.key() == Qt.Key_F8:
-            self.sendf8()
+            self.process_function_key(self.F8)
         if event.key() == Qt.Key_F9:
-            self.sendf9()
+            self.process_function_key(self.F9)
         if event.key() == Qt.Key_F10:
-            self.sendf10()
+            self.process_function_key(self.F10)
         if event.key() == Qt.Key_F11:
-            self.sendf11()
+            self.process_function_key(self.F11)
         if event.key() == Qt.Key_F12:
-            self.sendf12()
+            self.process_function_key(self.F12)
 
     def set_window_title(self) -> None:
         """Set window title"""
@@ -1461,12 +1397,6 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.n1mm.contact_info["zn"] = self.contact["ZN"]
                 self.n1mm.contact_info["power"] = self.contact["Power"]
                 self.n1mm.contact_info["band"] = self.contact["Band"]
-                # self.n1mm.contact_info['']
-                # self.n1mm.contact_info['']
-                # self.n1mm.contact_info['']
-                # self.n1mm.contact_info['']
-                # self.n1mm.contact_info['']
-                # self.n1mm.contact_info['']
                 logger.debug("%s", f"{self.n1mm.contact_info}")
                 self.n1mm.send_contact_info()
 
@@ -1480,39 +1410,6 @@ class MainWindow(QtWidgets.QMainWindow):
         cmd["station"] = platform.node()
         self.multicast_interface.send_as_json(cmd)
 
-        # self.contact["ContestName"] = self.contest.name
-        # self.contact["SNT"] = self.sent.text()
-        # self.contact["RCV"] = self.receive.text()
-        # self.contact["CountryPrefix"]
-        # self.contact["StationPrefix"] = self.pref.get("callsign", "")
-        # self.contact["QTH"]
-        # self.contact["Name"] = self.other_1.text()
-        # self.contact["Comment"] = self.other_2.text()
-        # self.contact["NR"]
-        # self.contact["Sect"]
-        # self.contact["Prec"]
-        # self.contact["CK"]
-        # self.contact["ZN"]
-        # self.contact["SentNr"]
-        # self.contact["Points"]
-        # self.contact["IsMultiplier1"]
-        # self.contact["IsMultiplier2"]
-        # self.contact["Power"]
-        # self.contact["Band"]
-        # self.contact["WPXPrefix"] = calculate_wpx_prefix(self.callsign.text())
-        # self.contact["Exchange1"]
-        # self.contact["RadioNR"]
-        # self.contact["isMultiplier3"]
-        # self.contact["MiscText"]
-        # self.contact["ContactType"]
-        # self.contact["Run1Run2"]
-        # self.contact["GridSquare"]
-        # self.contact["Continent"]
-        # self.contact["RoverLocation"]
-        # self.contact["RadioInterfaced"]
-        # self.contact["NetworkedCompNr"]
-        # self.contact["CLAIMEDQSO"]
-
     def new_contest_dialog(self) -> None:
         """Show new contest dialog"""
         logger.debug("New contest Dialog")
@@ -1638,66 +1535,6 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         self.edit_macro_dialog.close()
 
-    def edit_F1(self) -> None:
-        """stub"""
-        logger.debug("F1 Right Clicked.")
-        self.edit_macro(self.F1)
-
-    def edit_F2(self) -> None:
-        """stub"""
-        logger.debug("F2 Right Clicked.")
-        self.edit_macro(self.F2)
-
-    def edit_F3(self) -> None:
-        """stub"""
-        logger.debug("F3 Right Clicked.")
-        self.edit_macro(self.F3)
-
-    def edit_F4(self) -> None:
-        """stub"""
-        logger.debug("F4 Right Clicked.")
-        self.edit_macro(self.F4)
-
-    def edit_F5(self) -> None:
-        """stub"""
-        logger.debug("F5 Right Clicked.")
-        self.edit_macro(self.F5)
-
-    def edit_F6(self) -> None:
-        """stub"""
-        logger.debug("F6 Right Clicked.")
-        self.edit_macro(self.F6)
-
-    def edit_F7(self) -> None:
-        """stub"""
-        logger.debug("F7 Right Clicked.")
-        self.edit_macro(self.F7)
-
-    def edit_F8(self) -> None:
-        """stub"""
-        logger.debug("F8 Right Clicked.")
-        self.edit_macro(self.F8)
-
-    def edit_F9(self) -> None:
-        """stub"""
-        logger.debug("F9 Right Clicked.")
-        self.edit_macro(self.F9)
-
-    def edit_F10(self) -> None:
-        """stub"""
-        logger.debug("F10 Right Clicked.")
-        self.edit_macro(self.F10)
-
-    def edit_F11(self) -> None:
-        """stub"""
-        logger.debug("F11 Right Clicked.")
-        self.edit_macro(self.F11)
-
-    def edit_F12(self) -> None:
-        """stub"""
-        logger.debug("F12 Right Clicked.")
-        self.edit_macro(self.F12)
-
     def process_macro(self, macro: str) -> str:
         """Process CW macro substitutions"""
         result = self.database.get_serial()
@@ -1772,137 +1609,16 @@ class MainWindow(QtWidgets.QMainWindow):
             app.processEvents()
             self.rig_control.ptt_off()
 
-    def sendf1(self) -> None:
-        """stub"""
+    def process_function_key(self, function_key) -> None:
+        """Called when a function key is clicked."""
         logger.debug("F1 Clicked")
         if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F1.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F1.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F1.toolTip()))
-
-    def sendf2(self) -> None:
-        """stub"""
-        logger.debug("F2 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F2.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F2.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F2.toolTip()))
-
-    def sendf3(self) -> None:
-        """stub"""
-        logger.debug("F3 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F3.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F3.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F3.toolTip()))
-
-    def sendf4(self) -> None:
-        """stub"""
-        logger.debug("F4 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F4.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F4.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F4.toolTip()))
-
-    def sendf5(self) -> None:
-        """stub"""
-        logger.debug("F5 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F5.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F5.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F5.toolTip()))
-
-    def sendf6(self) -> None:
-        """stub"""
-        logger.debug("F6 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F6.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F6.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F6.toolTip()))
-
-    def sendf7(self) -> None:
-        """stub"""
-        logger.debug("F7 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F7.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F7.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F7.toolTip()))
-
-    def sendf8(self) -> None:
-        """stub"""
-        logger.debug("F8 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F8.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F8.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F8.toolTip()))
-
-    def sendf9(self) -> None:
-        """stub"""
-        logger.debug("F9 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F9.text()
+            self.n1mm.radio_info["FunctionKeyCaption"] = function_key.text()
         if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F9.toolTip()))
+            self.voice_string(self.process_macro(function_key.toolTip()))
             return
         if self.cw:
-            self.cw.sendcw(self.process_macro(self.F9.toolTip()))
-
-    def sendf10(self) -> None:
-        """stub"""
-        logger.debug("F10 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F10.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F10.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F10.toolTip()))
-
-    def sendf11(self) -> None:
-        """stub"""
-        logger.debug("F11 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F11.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F11.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F11.toolTip()))
-
-    def sendf12(self) -> None:
-        """stub"""
-        logger.debug("F12 Clicked")
-        if self.n1mm:
-            self.n1mm.radio_info["FunctionKeyCaption"] = self.F12.text()
-        if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(self.F12.toolTip()))
-            return
-        if self.cw:
-            self.cw.sendcw(self.process_macro(self.F12.toolTip()))
+            self.cw.sendcw(self.process_macro(function_key.toolTip()))
 
     def run_sp_buttons_clicked(self) -> None:
         """Handle run/s&p mode"""
@@ -2399,7 +2115,7 @@ class MainWindow(QtWidgets.QMainWindow):
         return result.get("isdupe", False)
 
     def setmode(self, mode: str) -> None:
-        """stub for when the mode changes."""
+        """Call when the mode changes."""
         if mode == "CW":
             if self.current_mode != "CW":
                 self.current_mode = "CW"
@@ -2455,7 +2171,10 @@ class MainWindow(QtWidgets.QMainWindow):
                         destination_file.write_bytes(child.read_bytes())
 
     def poll_radio(self) -> None:
-        """stub"""
+        """
+        Poll radio for VFO, mode, bandwidth.
+        Send state via multicast.
+        """
         self.set_radio_icon(0)
         if self.rig_control:
             if self.rig_control.online is False:

not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.12.20"
+__version__ = "23.12.24"

{not1mm-23.12.20.dist-info → not1mm-23.12.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.12.20
+Version: 23.12.24
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -163,6 +163,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [23-12-24] Fixed bug where no bands showed onscreen during initial launch.
+- [23-12-22] Refactored a bunch of code.
 - [23-12-20] Add ARRL VHF Jun and Sep.
 - [23-12-19] Add ARRL VHF contest. Add VHF frequencies. Add Bands TAB to configuration dialog to select active bands you want displayed.
 - [23-12-17] Add ARRL 10M contest. Fixed crash in RAC Canada Day

{not1mm-23.12.20.dist-info → not1mm-23.12.24.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=xqXClbUKw1kN2J6cNhtipRU-yVkHQMRmtMvUDIjM9oU,106935
+not1mm/__main__.py,sha256=-5tC2r82VbzfBPIlFbw_dhlNFWyqLyRb2kfezzDRrtI,98409
 not1mm/bandmap.py,sha256=WBCy3erbsmDTNQ5e3H7e1Fl1iQcYljeJRvW5Yqg32sc,28917
 not1mm/checkwindow.py,sha256=CbdE_q2Ozo3mL04R18gSwjrP2Tr3pFRFXcCkr92IH60,7249
 not1mm/logwindow.py,sha256=Rw2393HcyXvP5MQXI0nPxEoD0eCT_PiD3S2Ni9dJS38,41889
@@ -102,7 +102,7 @@ not1mm/lib/plugin_common.py,sha256=5IWIy24NpAuuzzPEjmaqeKyFHllkOgVN1gEu8vkCZsg,7
 not1mm/lib/select_contest.py,sha256=XQdRUkPAIHIMVsilm82M54b_v9yWpYrZ1nfInJrtZoo,363
 not1mm/lib/settings.py,sha256=t_JLJPnDBtMGAvJMAF1AL1eVB7MyucqlksVTU47yxvk,8933
 not1mm/lib/super_check_partial.py,sha256=GlXgtIblL602iW-V6Mmdf5S4FxtzJ95TbPMMa9xXUfg,1692
-not1mm/lib/version.py,sha256=yutKiLqpElTLpXV05cIZkNlqZqTS_YWHci05JjIyUng,48
+not1mm/lib/version.py,sha256=3WnTu2qu8QdFaxkHJJ9eZvjyCrfoPEspL1IZ_vQOy1k,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=yGMRxMXE6NW2Qie4olq1E9YziHOLCXp4_ZP7LXvbYf0,10307
 not1mm/plugins/10_10_spring_cw.py,sha256=J3FrRQbkA3dMEQiY7-cWJ0lGCakT1hhl8yynNszQ9qI,10313
@@ -139,9 +139,9 @@ not1mm/testing/n1mm_listener.py,sha256=UD-qyKEnppQua330WEFKMvMJaNjnYKi7dDuX_RGB5
 not1mm/testing/test.py,sha256=wGblvMlyOCVkEiHbxE6wvLsorim15ehL72_EZLQeWkk,1660
 testing/test.py,sha256=q7socQaMu46q-I-1fYgmQhnygrrC5NjAUM5yuySo4fA,249
 usb_vfo_knob/code.py,sha256=h59iPPlcYbkXmRcYPQHDBP0yfLEl7fY3VkiIszdQeyI,1057
-not1mm-23.12.20.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-23.12.20.dist-info/METADATA,sha256=oLFBE9CpHNPS80SGF2WGdO5F5XGXlD8LxRTF7_5jnNk,25772
-not1mm-23.12.20.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-not1mm-23.12.20.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-23.12.20.dist-info/top_level.txt,sha256=PBUZJeDgW5ta7ghk__UYh_ygOFIhe9ymJDaxEuVumFU,28
-not1mm-23.12.20.dist-info/RECORD,,
+not1mm-23.12.24.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-23.12.24.dist-info/METADATA,sha256=QJ2imQYe9VIapjvSkVSnQiRmFKs42Zne_X_uySJNVwI,25890
+not1mm-23.12.24.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+not1mm-23.12.24.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-23.12.24.dist-info/top_level.txt,sha256=PBUZJeDgW5ta7ghk__UYh_ygOFIhe9ymJDaxEuVumFU,28
+not1mm-23.12.24.dist-info/RECORD,,