not1mm 24.10.5.1__py3-none-any.whl → 24.10.8__py3-none-any.whl

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",
@@ -2609,13 +2609,16 @@ class MainWindow(QtWidgets.QMainWindow):
             self.rig_control.poll_callback.connect(self.poll_radio)
             self.radio_thread.start()
 
-        if self.pref.get("cwtype", 0) == 0:
-            self.cw = None
-        else:
+        self.cw = None
+        if (
+            self.pref.get("cwport")
+            and self.pref.get("cwip")
+            and self.pref.get("cwtype")
+        ):
             self.cw = CW(
                 int(self.pref.get("cwtype")),
                 self.pref.get("cwip"),
-                int(self.pref.get("cwport", 6789)),
+                int(self.pref.get("cwport")),
             )
             self.cw.speed = 20
             if self.cw.servertype == 2:
@@ -2646,13 +2649,9 @@ class MainWindow(QtWidgets.QMainWindow):
             self.pref["bands"] = [
                 "160",
                 "80",
-                "60",
                 "40",
-                "30",
                 "20",
-                "17",
                 "15",
-                "12",
                 "10",
             ]
 
@@ -2711,7 +2710,8 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.callsign_changed()
                     self.callsign.setFocus()
                     self.callsign.activateWindow()
-                    window.raise_()
+                    # This broke somehow.
+                    # window.raise_()
                     continue
 
                 if (
@@ -3602,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}"
     )
@@ -3625,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/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/lib/settings.py

@@ -20,6 +20,9 @@ class Settings(QtWidgets.QDialog):
         self.logger = logging.getLogger("settings")
         uic.loadUi(app_data_path / "configuration.ui", self)
         self.buttonBox.accepted.connect(self.save_changes)
+        self.usecwdaemon_radioButton.clicked.connect(self.set_cwdaemon_port_hint)
+        self.usepywinkeyer_radioButton.clicked.connect(self.set_winkeyer_port_hint)
+        self.usecwviacat_radioButton.clicked.connect(self.set_catforcw_port_hint)
         self.preference = pref
         if sd:
             self.devices = sd.query_devices()
@@ -37,7 +40,6 @@ class Settings(QtWidgets.QDialog):
         if index != -1:
             self.sounddevice.setCurrentIndex(index)
         self.useqrz_radioButton.setChecked(bool(self.preference.get("useqrz")))
-        # self.usehamdb_radioButton.setChecked(bool(self.preference.get("usehamdb")))
         self.usehamqth_radioButton.setChecked(bool(self.preference.get("usehamqth")))
         self.lookup_user_name_field.setText(
             str(self.preference.get("lookupusername", ""))
@@ -51,7 +53,10 @@ class Settings(QtWidgets.QDialog):
         self.useflrig_radioButton.setChecked(bool(self.preference.get("useflrig")))
 
         self.cwip_field.setText(str(self.preference.get("cwip", "")))
-        self.cwport_field.setText(str(self.preference.get("cwport", "")))
+        if self.preference.get("cwport", ""):
+            self.cwport_field.setText(str(self.preference.get("cwport", "")))
+        else:
+            self.cwport_field.setText("")
         self.usecwdaemon_radioButton.setChecked(
             bool(self.preference.get("cwtype") == 1)
         )
@@ -61,6 +66,13 @@ class Settings(QtWidgets.QDialog):
         self.usecwviacat_radioButton.setChecked(
             bool(self.preference.get("cwtype") == 3)
         )
+        if self.preference.get("cwtype") == 1:
+            self.set_cwdaemon_port_hint()
+        elif self.preference.get("cwtype") == 2:
+            self.set_winkeyer_port_hint()
+        elif self.preference.get("cwtype") == 3:
+            self.set_catforcw_port_hint()
+
         self.connect_to_server.setChecked(bool(self.preference.get("useserver")))
         self.multicast_group.setText(str(self.preference.get("multicast_group", "")))
         self.multicast_port.setText(str(self.preference.get("multicast_port", "")))
@@ -73,13 +85,14 @@ class Settings(QtWidgets.QDialog):
             str(self.preference.get("n1mm_station_name", ""))
         )
         self.n1mm_operator.setText(str(self.preference.get("n1mm_operator", "")))
-        # self.n1mm_ip.setText(str(self.preference.get("n1mm_ip", "")))
         self.n1mm_radioport.setText(str(self.preference.get("n1mm_radioport", "")))
         self.n1mm_contactport.setText(str(self.preference.get("n1mm_contactport", "")))
         self.n1mm_lookupport.setText(str(self.preference.get("n1mm_lookupport", "")))
         self.n1mm_scoreport.setText(str(self.preference.get("n1mm_scoreport", "")))
         self.send_n1mm_radio.setChecked(bool(self.preference.get("send_n1mm_radio")))
-        self.send_n1mm_contact.setChecked(bool(self.preference.get("send_n1mm_contact")))
+        self.send_n1mm_contact.setChecked(
+            bool(self.preference.get("send_n1mm_contact"))
+        )
         self.send_n1mm_lookup.setChecked(bool(self.preference.get("send_n1mm_lookup")))
         self.send_n1mm_score.setChecked(bool(self.preference.get("send_n1mm_score")))
 
@@ -105,11 +118,28 @@ class Settings(QtWidgets.QDialog):
         self.activate_6m.setChecked(bool("6" in self.preference.get("bands", [])))
         self.activate_4m.setChecked(bool("4" in self.preference.get("bands", [])))
         self.activate_2m.setChecked(bool("2" in self.preference.get("bands", [])))
-        self.activate_1dot25.setChecked(bool("1.25" in self.preference.get("bands", [])))
+        self.activate_1dot25.setChecked(
+            bool("1.25" in self.preference.get("bands", []))
+        )
         self.activate_70cm.setChecked(bool("70cm" in self.preference.get("bands", [])))
         self.activate_33cm.setChecked(bool("33cm" in self.preference.get("bands", [])))
         self.activate_23cm.setChecked(bool("23cm" in self.preference.get("bands", [])))
 
+    def set_cwdaemon_port_hint(self):
+        """Sets placeholder hint for the CW interface."""
+        self.cwip_field.setPlaceholderText("127.0.0.1")
+        self.cwport_field.setPlaceholderText("6789")
+
+    def set_winkeyer_port_hint(self):
+        """Sets placeholder hint for the CW interface."""
+        self.cwip_field.setPlaceholderText("127.0.0.1")
+        self.cwport_field.setPlaceholderText("8000")
+
+    def set_catforcw_port_hint(self):
+        """Sets placeholder hint for the CW interface."""
+        self.cwip_field.setPlaceholderText("")
+        self.cwport_field.setPlaceholderText("")
+
     def save_changes(self):
         """
         Write preferences to json file.
@@ -131,6 +161,7 @@ class Settings(QtWidgets.QDialog):
         try:
             self.preference["cwport"] = int(self.cwport_field.text())
         except ValueError:
+            self.preference["cwport"] = None
             ...
         self.preference["cwtype"] = 0
         if self.usecwdaemon_radioButton.isChecked():

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.10.5.1"
+__version__ = "24.10.8"

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/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.1.dist-info → not1mm-24.10.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.5.1
+Version: 24.10.8
 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-8] Fix crash on Tune to spot. Change placeholder text for the CW port for those unable to read documentation.
+- [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.
@@ -567,7 +569,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.1.dist-info → not1mm-24.10.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=8bgimshIW_mPwFTv6_j2cKutj3PNYyZgB3zqRzKrhKU,131487
+not1mm/__main__.py,sha256=IjYrGDuq8T-Noe8gJ736-Mo7pyVepAHDGcMUigUGb-Y,131546
 not1mm/bandmap.py,sha256=P91rYGmd8r5K6TRNZt7kqqW6zCBVlFA1_n9-V7as1WE,31672
 not1mm/checkwindow.py,sha256=aI-nr8OF90IWV7R_XRdmitvBJ9M85evCs72HoU3Jnvc,10374
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -106,15 +106,15 @@ not1mm/lib/fldigi_watcher.py,sha256=reZz3fZLDoJVVZhJD9nIssk2aczCzadDSQTVu-5mTCM,
 not1mm/lib/ft8_watcher.py,sha256=BFmVIsnbwuRMWoe-dIBybuCgi0WFmr8Km0O9l4eiwMM,4624
 not1mm/lib/ham_utility.py,sha256=WMmYLDI_fJHHsn0wkpGVit2Hv8fo6r9ybexXROia8Cg,11967
 not1mm/lib/lookup.py,sha256=_Awt1HjiuSrhLTrwoF8EoFQC_bYYH1vqfAo_HSaMb00,10838
-not1mm/lib/multicast.py,sha256=bnFUNHyy82GmIb3_88EPBVVssj7-HzkJPaH671cK8Qw,3249
+not1mm/lib/multicast.py,sha256=KJcruI-bOuHfHXPjl3SGQhL6I9sKrygy-sdFSvxffUM,3255
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/playsound.py,sha256=kxkcitBFbZCXJ2wxQ1lxg4rBwfxiSpuNpJSXHOPCoXA,9241
 not1mm/lib/plugin_common.py,sha256=TbFUbftjELFt4QRdsjSHbqnXSngZOlSwlCTClqosDXA,9727
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
-not1mm/lib/settings.py,sha256=0Su8BQM4haVhc_P74q8UhzRZxtgWhM40UmVtQdMJQeM,10022
+not1mm/lib/settings.py,sha256=YYAAdvhqlQ6y4GOJSxNmE4eDlgsIt2MvLxxOAbcpscY,11184
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=5uwpZq4lmKw9eq6mo-j6TGPKC-i7jRbA_5Tg5_AjOyo,50
+not1mm/lib/version.py,sha256=UYQ03Ct1PZCaboAlM47NoWvd3H9bDtVzUrLc-mKQ5h8,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -135,10 +135,10 @@ not1mm/plugins/canada_day.py,sha256=OVpcCl1Chse_zLHf6PayTrgawWM4W-pmrTw40Al-o9s,
 not1mm/plugins/cq_160_cw.py,sha256=5s6rIZdJEnmWe1SI06BEyz7p5vP0N2n9mI4l_mZ0icw,14139
 not1mm/plugins/cq_160_ssb.py,sha256=zIwSMAjHSt6W2edrDzVbyTf860JowHoFkU9BKO8Enag,14182
 not1mm/plugins/cq_wpx_cw.py,sha256=9aNzAR-KhznIwUlxUFjAi_hbiw_6RrCMwUBk9I2f6Hs,14037
-not1mm/plugins/cq_wpx_rtty.py,sha256=d0YsC_RDNEhp0mFGxtm7Ao7tI8wEeJJOACYAXdSWiWw,16473
+not1mm/plugins/cq_wpx_rtty.py,sha256=PpU_PxjQGeMjzbofYNsl-No37s7IgkPyW2bKFRkN9jU,16473
 not1mm/plugins/cq_wpx_ssb.py,sha256=-hGRovqHR9rfOUnG4LPOoABTb4heH8VAX6rYdJbCqsw,12687
 not1mm/plugins/cq_ww_cw.py,sha256=m4Xkqb_qFyXWEgkxqbanvtiCTvI8NNPKNXzHgFZzhnE,12340
-not1mm/plugins/cq_ww_rtty.py,sha256=N0togQbMSpRyRpGoYvnlGC3mpduR82g-D39Swtp5wjI,16772
+not1mm/plugins/cq_ww_rtty.py,sha256=WnqSfCNX6ieLZlUg_P_vx-Z2iY0lxdwEgPuT9aax1JU,16772
 not1mm/plugins/cq_ww_ssb.py,sha256=hZwG88-hPLmwIGXHX_S_ty8Nhn1kIuPjSuTRpCWoN9g,12631
 not1mm/plugins/cwt.py,sha256=KvvkEfQrYSra0y8qE4yThvZNLrZcslt0IqYEomDpf-M,12774
 not1mm/plugins/general_logging.py,sha256=n-2es7erqK1ptwq_wwIKIwktptKN7ra2eWjAQlpXUac,3479
@@ -157,9 +157,9 @@ not1mm/plugins/ref_cw.py,sha256=aWjHHkqIKutjRUtzh09y5haFfnZK9poRQDWRQMDRxxU,1632
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/weekly_rtty.py,sha256=DQcy3SY0Zn56EdlYGf3NxrRhTnkNa5IqRQPRQdKDSPs,14255
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.10.5.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.10.5.1.dist-info/METADATA,sha256=Cto5bth3V2_4VBPF_bV9cenpvAdRaLJ2xo_p6Xh3Mgk,30662
-not1mm-24.10.5.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-not1mm-24.10.5.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.10.5.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.10.5.1.dist-info/RECORD,,
+not1mm-24.10.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.10.8.dist-info/METADATA,sha256=Fkd1pSMlrrpa3X5I6LYhg_L0Ul2ZI1ntz1WJAjqCDJ8,30857
+not1mm-24.10.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+not1mm-24.10.8.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.10.8.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.10.8.dist-info/RECORD,,