not1mm 23.5.17__py3-none-any.whl → 23.5.18__py3-none-any.whl

not1mm/__main__.py

@@ -304,9 +304,6 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact = self.database.empty_contact
         self.current_op = self.station.get("Call", "")
         self.make_op_dir()
-        if self.pref.get("contest"):
-            self.load_contest()
-
         self.read_cw_macros()
         self.clearinputs()
 
@@ -343,6 +340,9 @@ class MainWindow(QtWidgets.QMainWindow):
             "RTTY": self.band_indicators_rtty,
         }
 
+        if self.pref.get("contest"):
+            self.load_contest()
+
     @staticmethod
     def check_process(name: str) -> bool:
         """checks to see if program of name is in the active process list"""
@@ -365,6 +365,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.about_dialog = About(WORKING_PATH)
         if self.pref.get("dark_mode"):
             self.about_dialog.setStyleSheet(DARK_STYLESHEET)
+        self.about_dialog.donors.setSource(
+            QtCore.QUrl.fromLocalFile(WORKING_PATH + "/data/donors.html")
+        )
         self.about_dialog.open()
 
     def edit_configuration_settings(self):
@@ -582,8 +585,30 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.set_window_title()
                     self.contest.init_contest(self)
                     self.hide_band_mode(self.contest_settings.get("ModeCategory", ""))
+                    logger.debug("%s", f"{self.contest_settings}")
+                    if self.contest_settings.get("ModeCategory", "") == "CW":
+                        self.setmode("CW")
+                        self.radio_state["mode"] = "CW"
+                        if self.rig_control:
+                            if self.rig_control.online:
+                                self.rig_control.set_mode("CW")
+                        band = getband(str(self.radio_state.get("vfoa", "0.0")))
+                        self.set_band_indicator(band)
+                        self.set_window_title()
+                    if self.contest_settings.get("ModeCategory", "") == "SSB":
+                        self.setmode("SSB")
+                        if int(self.radio_state.get("vfoa", 0)) > 10000000:
+                            self.radio_state["mode"] = "USB"
+                        else:
+                            self.radio_state["mode"] = "LSB"
+                        band = getband(str(self.radio_state.get("vfoa", "0.0")))
+                        self.set_band_indicator(band)
+                        self.set_window_title()
+                        if self.rig_control:
+                            self.rig_control.set_mode(self.radio_state.get("mode"))
 
                 if hasattr(self.contest, "mode"):
+                    logger.debug("%s", f"  ****  {self.contest}")
                     if self.contest.mode in ["CW", "BOTH"]:
                         self.cw_speed.show()
                     else:
@@ -1839,6 +1864,8 @@ class MainWindow(QtWidgets.QMainWindow):
     def poll_radio(self):
         """stub"""
         if self.rig_control:
+            if self.rig_control.online is False:
+                self.rig_control.reinit()
             if self.rig_control.online:
                 vfo = self.rig_control.get_vfo()
                 mode = self.rig_control.get_mode()

not1mm/bandmap.py

@@ -282,11 +282,15 @@ class MainWindow(QtWidgets.QMainWindow):
                 and packet.get("station", "") == platform.node()
             ):
                 self.set_band(packet.get("band") + "m", False)
-                self.rx_freq = float(packet.get("vfoa")) / 1000000
-                self.tx_freq = self.rx_freq
+                if self.rx_freq != float(packet.get("vfoa")) / 1000000:
+                    self.rx_freq = float(packet.get("vfoa")) / 1000000
+                    self.tx_freq = self.rx_freq
+                    self.center_on_rxfreq()
                 self.bandwidth = int(packet.get("bw", "0"))
                 step, _ = self.determine_step_digits()
                 self.drawTXRXMarks(step)
+                continue
+
             if (
                 packet.get("cmd", "") == "NEXTSPOT"
                 and packet.get("station", "") == platform.node()
@@ -454,6 +458,9 @@ class MainWindow(QtWidgets.QMainWindow):
     def center_on_rxfreq(self):
         """doc"""
         freq_pos = self.Freq2ScenePos(self.rx_freq).y()
+        # self.graphicsView.verticalScrollBar().setSliderPosition(
+        #     int(freq_pos - (self.height() / 2) + 80)
+        # )
         self.scrollArea.verticalScrollBar().setValue(
             int(freq_pos - (self.height() / 2) + 80)
         )

not1mm/data/about.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>345</width>
-    <height>176</height>
+    <height>376</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,21 +33,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="font">
-      <font>
-       <family>JetBrains Mono</family>
-      </font>
-     </property>
-     <property name="text">
-      <string>You're Welcome</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
@@ -61,6 +46,9 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QTextBrowser" name="donors"/>
+   </item>
   </layout>
  </widget>
  <resources/>

not1mm/lib/cat_interface.py

@@ -61,6 +61,10 @@ class CAT:
             logger.debug("%s", target)
             self.server = xmlrpc.client.ServerProxy(target)
             self.online = True
+            try:
+                _ = self.server.main.get_version()
+            except ConnectionRefusedError:
+                self.online = False
         if self.interface == "rigctld":
             self.__initialize_rigctrld()
 
@@ -80,6 +84,11 @@ class CAT:
             self.online = False
             logger.debug("%s", exception)
 
+    def reinit(self):
+        """reinitialise rigctl"""
+        if self.interface == "rigctld":
+            self.__initialize_rigctrld()
+
     def get_vfo(self) -> str:
         """Poll the radio for current vfo using the interface"""
         vfo = ""

not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.5.17"
+__version__ = "23.5.18"

{not1mm-23.5.17.dist-info → not1mm-23.5.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.5.17
+Version: 23.5.18
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -131,7 +131,8 @@ The current state is "**BETA**". I've used it for A few contests, and was able t
 
 ## Changes of note
 
-- [23-5-17] CTRL-G tunes to a spot matching text in the callsign entry field. Thanks to Martin, OK1RR for suggesting this.
+- [23-5-18] ReInit rigctld CAT when it goes offline and back.
+- [23-5-17] CTRL-G tunes to a spot matching text in the callsign entry field. Thanks to Martin, OK1RR for suggesting this. Bandmap centers on the VFO after frequency change. Set mode on startup based on the mode category set for the contest.
 - [23-5-15] CTRL-S in the main window will send a spot to the cluster.
 - [23-5-12] Bandmap, Reload system preferences before each connect. Increased the minimum Python version to 3.10. Main, Refactored UDP code to remove the use of timers and queues, replaced with readyRead signals.
 - [23-5-11] Added missing numpy package dependency to pyproject.toml. Added install steps for clean images of Fedora and Ubuntu. Entered frequencies when no CAT control are not sent to the bandmap. Added K1EL speed change via xmlrpc. One would need to update the pywinkeyerserial client.

{not1mm-23.5.17.dist-info → not1mm-23.5.18.dist-info}/RECORD

@@ -1,11 +1,11 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=QBenMNCqt2jBubBROhjY2qZmxKF_pQXf0rud5pmwnEo,81641
-not1mm/bandmap.py,sha256=nTPEN5zIJwo4NZpSzC7wuMY0Khcc8BW2raGR8ra02k0,25067
+not1mm/__main__.py,sha256=eRE2jtNNVMbBMqjPSMxXYnVypdqk8uPnlc8qbAWzKQk,83181
+not1mm/bandmap.py,sha256=2rbeMiTxL0zBk0LAYGfAr57jXku8rHCZSaerJ020jQo,25351
 not1mm/logwindow.py,sha256=irT5lrZq9D2Xyu-uSyIDczSjlmwc-vb5Moy1qcV-Y98,30275
 not1mm/data/Combinear.qss,sha256=SKqM0g8GvNXay1ovgtwCw3Egt0eLfN5P3iTREInC1eE,16590
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=oqUB3Fvy40vU-ra-R3-cvTeBnZWW04Da1Et011UITbI,542666
-not1mm/data/about.ui,sha256=ll-3ZSghbok0kW9MLSAoo2dW3EV3lM4m4nR-kUJ6oNw,2352
+not1mm/data/about.ui,sha256=7TqvtXFFm0Rmcu0bmLupwpO1CsK8MekfZ09_xn6kZrQ,2067
 not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6u5LUIqAYidOQ,224
 not1mm/data/bandmap.ui,sha256=FB2NaxSK-ZZvfYHU9Mu8FkQxTeVHcFGV40zIqgBXAFo,5246
 not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
@@ -78,7 +78,7 @@ not1mm/data/phonetics/yourcall.wav,sha256=4kheHJmCiRDL2kjhlgXQ8_u_eEMgKxiNGu5UBk
 not1mm/data/phonetics/z.wav,sha256=arafCi7fwmBLdVDI-PRyaL4U-03PIQDhffwY5noJ_2c,51768
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=O9i8ypv2W9KZkPAp2bcRI0J5RgPE5R1vMfU8ZGlok_E,379
-not1mm/lib/cat_interface.py,sha256=EWw22HAe-zEGNPL-hmeCHplgg7ID9kSaeCgn6ftdxrI,13705
+not1mm/lib/cat_interface.py,sha256=PHhVzzUxmNaQvuJxlkexnnAoV_6zHz_ylJDCfi51Nn0,13990
 not1mm/lib/cwinterface.py,sha256=fZ5BXVyF7by0yGTJVznUTjRCxRt3lJaUIsNC-_mCGP4,3123
 not1mm/lib/database.py,sha256=KD8KuEsPWJBq44S1UqlNIgmXKF94NrWqH-cKGfcl9ow,34193
 not1mm/lib/edit_contact.py,sha256=YwuX-BuIa7AuPtLRENs4jTzxOrtk6MCxZj3BR_bDPW8,357
@@ -92,7 +92,7 @@ not1mm/lib/n1mm.py,sha256=bK5d21Yfn6xRpQcu2RdpL2zR8lOlRWOadD6Ai4_lFdc,4434
 not1mm/lib/new_contest.py,sha256=mHKNCS3iKOKN-bT9d8ZK3JemThOZFQ0ikfUSS0-ZTpY,354
 not1mm/lib/select_contest.py,sha256=XQdRUkPAIHIMVsilm82M54b_v9yWpYrZ1nfInJrtZoo,363
 not1mm/lib/settings.py,sha256=InjbBzXikT9UqfWP_Tl35aGFaRM4URmgKeSUxXHH3VQ,6188
-not1mm/lib/version.py,sha256=-0R283pIp43JZV056hO8iLpBJEQu3F_uA7Evtt8cfdQ,47
+not1mm/lib/version.py,sha256=wPmqevlz9bS5AKXKew9TCT4neFwUgCCEOKh7kYzc2hY,47
 not1mm/plugins/10_10_fall_cw.py,sha256=EJ2CPLQUb_SNkbXJw8hGk-M74IDxjQZDl3imiebxYa0,13746
 not1mm/plugins/10_10_spring_cw.py,sha256=NqsV2cWsMVuqBM98SLhacladI_gFiOUnlaI7jPbiZoQ,13752
 not1mm/plugins/10_10_summer_phone.py,sha256=9sZdeon3pCIIfmKOXIt5kUIejmb_L0xb8CYx9bd8llk,13759
@@ -115,9 +115,9 @@ not1mm/plugins/jidx_ph.py,sha256=nM5iPKowCm7jOszPuAmNXB9gAC7VNtZ4N6g9MAdYcdk,138
 not1mm/plugins/winter_field_day.py,sha256=22mWjH4SwARTEEqb4ZUJSBk_gOG4pvvmGgTQuoSR7As,3121
 not1mm/testing/test.py,sha256=wGblvMlyOCVkEiHbxE6wvLsorim15ehL72_EZLQeWkk,1660
 testing/test.py,sha256=LeBddA3_XV49ma6lxwwaoEEnQKJ_qQcYKeU7kLTVNyc,206
-not1mm-23.5.17.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-23.5.17.dist-info/METADATA,sha256=EcLvHlsotQdACBa4C6XFtz6g1535hm2sRny0ky13oN8,27646
-not1mm-23.5.17.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-not1mm-23.5.17.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-23.5.17.dist-info/top_level.txt,sha256=-NwUrh4k1kzpOvf720xYWSTKSlr-zNSIz3D_eplrxLs,15
-not1mm-23.5.17.dist-info/RECORD,,
+not1mm-23.5.18.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-23.5.18.dist-info/METADATA,sha256=KwqXeFffAHHg8Eny7bz0q2PJf4-Ktwn0d9lDYyqnfKw,27827
+not1mm-23.5.18.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+not1mm-23.5.18.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-23.5.18.dist-info/top_level.txt,sha256=-NwUrh4k1kzpOvf720xYWSTKSlr-zNSIz3D_eplrxLs,15
+not1mm-23.5.18.dist-info/RECORD,,