not1mm 25.3.2__py3-none-any.whl → 25.3.5__py3-none-any.whl

not1mm/__main__.py

@@ -692,8 +692,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionBandmap.setChecked(self.pref.get("bandmapwindow", False))
         if self.actionBandmap.isChecked():
             self.bandmap_window.show()
+            self.bandmap_window.setActive(True)
         else:
             self.bandmap_window.hide()
+            self.bandmap_window.setActive(False)
 
         self.actionCheck_Window.setChecked(self.pref.get("checkwindow", False))
         if self.actionCheck_Window.isChecked():
@@ -1854,8 +1856,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.write_preference()
         if self.actionBandmap.isChecked():
             self.bandmap_window.show()
+            self.bandmap_window.setActive(True)
         else:
             self.bandmap_window.hide()
+            self.bandmap_window.setActive(False)
 
     def launch_check_window(self) -> None:
         """Launch the check window"""
@@ -3733,6 +3737,8 @@ class MainWindow(QtWidgets.QMainWindow):
         vfo = the_dict.get("vfoa", "")
         mode = the_dict.get("mode", "")
         bw = the_dict.get("bw", "")
+        if bw == "NONE":
+            bw = "0"
         online = the_dict.get("online", False)
 
         if online is False:
@@ -3763,7 +3769,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         if mode in ("CW", "CW-U", "CW-L", "CWR"):
             self.setmode(mode)
-        if mode == "LSB" or mode == "USB":
+        if mode in ("LSB", "USB", "FM", "AM"):
             self.setmode("SSB")
         if mode in (
             "RTTY",
@@ -3774,20 +3780,23 @@ class MainWindow(QtWidgets.QMainWindow):
             "FM-D",
             "DIGI-U",
             "DIGI-L",
+            "DIG",
             "RTTYR",
             "PKTLSB",
             "PKTUSB",
+            "FSK",
+            "PKT",
         ):
             self.setmode("RTTY")
 
-        cmd = {}
-        cmd["cmd"] = "RADIO_STATE"
-        cmd["band"] = band
-        cmd["vfoa"] = vfo
-        cmd["mode"] = mode
-        cmd["bw"] = bw
-        if self.bandmap_window:
-            self.bandmap_window.msg_from_main(cmd)
+        # cmd = {}
+        # cmd["cmd"] = "RADIO_STATE"
+        # cmd["band"] = band
+        # cmd["vfoa"] = vfo
+        # cmd["mode"] = mode
+        # cmd["bw"] = bw
+        # if self.bandmap_window:
+        #     self.bandmap_window.msg_from_main(cmd)
         if info_dirty:
             try:
                 logger.debug("VFO: %s  MODE: %s BW: %s", vfo, mode, bw)
@@ -3895,10 +3904,14 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         macro_file = self.get_macro_filename()
-
         try:
             with open(macro_file, "r", encoding="utf-8") as file_descriptor:
                 for line in file_descriptor:
+                    line = line.strip()
+                    if not line:
+                        continue
+                    if line.startswith("#"):
+                        continue
                     mode, fkey, buttonname, cwtext = line.split("|")
                     if mode.strip().upper() == "R" and self.pref.get("run_state"):
                         self.fkeys[fkey.strip()] = (buttonname.strip(), cwtext.strip())

not1mm/bandmap.py

@@ -339,6 +339,7 @@ class BandMapWindow(QDockWidget):
 
     def __init__(self):
         super().__init__()
+        self.active = False
         self._udpwatch = None
 
         uic.loadUi(fsutils.APP_DATA_PATH / "bandmap.ui", self)
@@ -373,6 +374,9 @@ class BandMapWindow(QDockWidget):
         self.request_workedlist()
         self.request_contest()
 
+    def setActive(self, mode: bool):
+        self.active = bool(mode)
+
     def get_settings(self) -> dict:
         """Get the settings."""
         if os.path.exists(fsutils.CONFIG_FILE):
@@ -381,6 +385,8 @@ class BandMapWindow(QDockWidget):
 
     def msg_from_main(self, packet):
         """"""
+        if self.active is False:
+            return
         if packet.get("cmd", "") == "RADIO_STATE":
             self.set_band(packet.get("band") + "m", False)
             try:
@@ -577,6 +583,8 @@ class BandMapWindow(QDockWidget):
             self.update_timer.setInterval(UPDATE_INTERVAL)
         except AttributeError:
             ...
+        # if self.active is False:
+        #     return
         self.clear_all_callsign_from_scene()
         self.clear_freq_mark(self.rxMark)
         self.clear_freq_mark(self.txMark)
@@ -709,6 +717,8 @@ class BandMapWindow(QDockWidget):
     def update_stations(self):
         """doc"""
         self.update_timer.setInterval(UPDATE_INTERVAL)
+        if self.active is False:
+            return
         self.clear_all_callsign_from_scene()
         self.spot_aging()
         step, _digits = self.determine_step_digits()
@@ -877,7 +887,7 @@ class BandMapWindow(QDockWidget):
         """Send a command to the cluster."""
         cmd += "\r\n"
         tosend = bytes(cmd, encoding="ascii")
-        logger.debug("%s", f"{tosend}")
+        logger.debug("Command sent to the cluster")
         if self.socket:
             if self.socket.isOpen():
                 self.socket.write(tosend)

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.3.2"
+__version__ = "25.3.5"

{not1mm-25.3.2.dist-info → not1mm-25.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.3.2
+Version: 25.3.5
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -240,12 +240,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-5] Added checks for blank/comment lines in the macros
 - [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
 - [25-3-1] Add {OTHER1} and {OTHER2} macros.
-- [25-2-26] Switch to a Run state if engaging auto_cq.
-- [25-2-22] Add Auto CQ.
-- [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
-- [25-2-6] Trimmed out newer tags from UI files, 'cause stuff be old sometimes.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-25.3.2.dist-info → not1mm-25.3.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=tg3pyejQnZILEIPLvjEjMWHsLmNDtOgEMVwk_G-hGgI,148362
-not1mm/bandmap.py,sha256=vaOeqv_gW0-K0P3xA9JYcuiFILiKw601tjHQCwuoV-s,31260
+not1mm/__main__.py,sha256=ImYkGDI_vV26zkLHRhpABSaCcVV5mdHzV2I3g0aQXTc,148862
+not1mm/bandmap.py,sha256=mdSK6oj8plEmr6WVYkzPTCfsHWKl9lea3R14cmRsAI4,31531
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
@@ -116,7 +116,7 @@ not1mm/lib/plugin_common.py,sha256=M5reDYM-v5IjAa2yTROvZTeTDkXYHb3U52W9mc9GxwA,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=mXffn8Xaj5KATPQinNBR0V5DbHWQPsRfh24_axWGYuk,15254
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=-mF3zNQ_0SuY4YjPsNBWWP6ynQSBQBM0qzuBG8dN1ks,47
+not1mm/lib/version.py,sha256=gi_0LSINxGfRh30abAqZxn7WgqDMd2zYr9AyHT3YSPc,47
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=5QUyGMvGBC-HxcY_z9QbfuxSg3f7p6C9K4qhTxgZE7k,14719
 not1mm/plugins/10_10_spring_cw.py,sha256=XjYFM263WYyG6nVQzPObW4YC7Z9L93rixSOcVsxPvH4,14722
@@ -167,9 +167,9 @@ not1mm/plugins/ref_ssb.py,sha256=Z_XmMpYKcI5dZh4TQqvQDcz-cLpMzpDEKBnb5iHeBLQ,215
 not1mm/plugins/stew_perry_topband.py,sha256=D1hekmMbx-i4BhaP2uzOK3OzaVVMMdgcN3RmfweNqHo,15341
 not1mm/plugins/weekly_rtty.py,sha256=rdlIrsxBeuj-RQc5OStVNF7sGCtBK5t6inN5Z7DI4tw,20066
 not1mm/plugins/winter_field_day.py,sha256=JK4r1vfxs7aADR7ZYbjZniz3f5s3_ipSQDZ0GRNWC7I,15222
-not1mm-25.3.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.3.2.dist-info/METADATA,sha256=clCdCTSM3ZTo9WJQG1-tKUyNtX5w8OoPpzcmJHIA4BQ,36448
-not1mm-25.3.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-not1mm-25.3.2.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.3.2.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.3.2.dist-info/RECORD,,
+not1mm-25.3.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.3.5.dist-info/METADATA,sha256=_V3E4nKSoKm9lxIMjmwt4u7Gx1q4PpOfn4gCg3HjgMs,36289
+not1mm-25.3.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+not1mm-25.3.5.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.3.5.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.3.5.dist-info/RECORD,,