not1mm 24.4.4__py3-none-any.whl → 24.4.8__py3-none-any.whl

not1mm/__main__.py

@@ -62,6 +62,7 @@ from not1mm.lib.select_contest import SelectContest
 from not1mm.lib.settings import Settings
 from not1mm.lib.version import __version__
 from not1mm.lib.versiontest import VersionTest
+from not1mm.lib.ft8_watcher import FT8Watcher
 
 import not1mm.fsutils as fsutils
 from not1mm.logwindow import LogWindow
@@ -199,6 +200,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.leftdot.hide()
         self.rightdot.hide()
         self.n1mm = N1MM()
+        self.ft8 = FT8Watcher()
+        self.ft8.set_callback(self.ft8_result)
         self.mscp = SCP(fsutils.APP_DATA_PATH)
         self.next_field = self.other_2
         self.dupe_indicator.hide()
@@ -461,7 +464,7 @@ class MainWindow(QtWidgets.QMainWindow):
         }
 
         self.setWindowIcon(
-            QtGui.QIcon(str(fsutils.APP_DATA_PATH / "k6gte.not1mm-64.png"))
+            QtGui.QIcon(str(fsutils.APP_DATA_PATH / "k6gte.not1mm-32.png"))
         )
         self.readpreferences()
         self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
@@ -484,6 +487,40 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.pref.get("contest"):
             self.load_contest()
 
+        self.actionLog_Window.setChecked(self.pref.get("logwindow", False))
+        if self.log_window:
+            self.log_window.close()
+        if self.actionLog_Window.isChecked():
+            self.log_window = LogWindow()
+            self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_window)
+            self.log_window.show()
+
+        self.actionBandmap.setChecked(self.pref.get("bandmapwindow", False))
+        if self.bandmap_window:
+            self.bandmap_window.close()
+        if self.actionBandmap.isChecked():
+            self.bandmap_window = BandMapWindow()
+            self.addDockWidget(
+                Qt.DockWidgetArea.RightDockWidgetArea, self.bandmap_window
+            )
+            self.bandmap_window.show()
+
+        self.actionCheck_Window.setChecked(self.pref.get("checkwindow", False))
+        if self.check_window:
+            self.check_window.close()
+        if self.actionCheck_Window.isChecked():
+            self.check_window = CheckWindow()
+            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
+            self.check_window.show()
+
+        self.actionVFO.setChecked(self.pref.get("vfowindow", False))
+        if self.vfo_window:
+            self.vfo_window.close()
+        if self.actionVFO.isChecked():
+            self.vfo_window = VfoWindow()
+            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
+            self.vfo_window.show()
+
         if not DEBUG_ENABLED:
             if VersionTest(__version__).test():
                 self.show_message_box(
@@ -491,6 +528,33 @@ class MainWindow(QtWidgets.QMainWindow):
                     "You can udate to the current version by using:\npip install -U not1mm"
                 )
 
+    def ft8_result(self, result: dict):
+        """
+        Callback for ft8 watcher
+
+        {
+            'CALL': 'KE0OG',
+            'GRIDSQUARE': 'DM10AT',
+            'MODE': 'FT8',
+            'RST_SENT': '',
+            'RST_RCVD': '',
+            'QSO_DATE': '20210329',
+            'TIME_ON': '183213',
+            'QSO_DATE_OFF': '20210329',
+            'TIME_OFF': '183213',
+            'BAND': '20M',
+            'FREQ': '14.074754',
+            'STATION_CALLSIGN': 'K6GTE',
+            'MY_GRIDSQUARE': 'DM13AT',
+            'CONTEST_ID': 'ARRL-FIELD-DAY',
+            'SRX_STRING': '1D UT',
+            'CLASS': '1D',
+            'ARRL_SECT': 'UT'
+        }
+
+        """
+        print(f"{result=}")
+
     def setDarkMode(self, dark):
         """testing"""
 
@@ -1389,35 +1453,49 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def launch_log_window(self) -> None:
         """Launch the log window"""
+        self.pref["logwindow"] = self.actionLog_Window.isChecked()
+        self.write_preference()
         if self.log_window:
             self.log_window.close()
-        self.log_window = LogWindow()
-        self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_window)
-        self.log_window.show()
+        if self.actionLog_Window.isChecked():
+            self.log_window = LogWindow()
+            self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_window)
+            self.log_window.show()
 
     def launch_bandmap_window(self) -> None:
         """Launch the bandmap window"""
+        self.pref["bandmapwindow"] = self.actionBandmap.isChecked()
+        self.write_preference()
         if self.bandmap_window:
             self.bandmap_window.close()
-        self.bandmap_window = BandMapWindow()
-        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.bandmap_window)
-        self.bandmap_window.show()
+        if self.actionBandmap.isChecked():
+            self.bandmap_window = BandMapWindow()
+            self.addDockWidget(
+                Qt.DockWidgetArea.RightDockWidgetArea, self.bandmap_window
+            )
+            self.bandmap_window.show()
 
     def launch_check_window(self) -> None:
         """Launch the check window"""
+        self.pref["checkwindow"] = self.actionCheck_Window.isChecked()
+        self.write_preference()
         if self.check_window:
             self.check_window.close()
-        self.check_window = CheckWindow()
-        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
-        self.check_window.show()
+        if self.actionCheck_Window.isChecked():
+            self.check_window = CheckWindow()
+            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
+            self.check_window.show()
 
     def launch_vfo(self) -> None:
         """Launch the VFO window"""
+        self.pref["vfowindow"] = self.actionVFO.isChecked()
+        self.write_preference()
         if self.vfo_window:
             self.vfo_window.close()
-        self.vfo_window = VfoWindow()
-        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
-        self.vfo_window.show()
+        if self.actionVFO.isChecked():
+            self.vfo_window = VfoWindow()
+            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
+            self.vfo_window.show()
 
     def clear_band_indicators(self) -> None:
         """

not1mm/data/main.ui

@@ -894,7 +894,6 @@
           <item>
            <widget class="QFrame" name="Button_Row1">
             <layout class="QHBoxLayout" name="ButtonRow1">
-
              <property name="sizeConstraint">
               <enum>QLayout::SetNoConstraint</enum>
              </property>
@@ -1543,6 +1542,9 @@
    </property>
   </action>
   <action name="actionLog_Window">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>QSO Log</string>
    </property>
@@ -1708,6 +1710,9 @@
    </property>
   </action>
   <action name="actionBandmap">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Bandmap</string>
    </property>
@@ -1743,11 +1748,17 @@
    </property>
   </action>
   <action name="actionCheck_Window">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Check Partial</string>
    </property>
   </action>
   <action name="actionVFO">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>VFO</string>
    </property>

not1mm/lib/ft8_watcher.py

@@ -0,0 +1,132 @@
+#!/usr/bin/env python3
+"""
+WSJT-x UDP Packet Watcher
+Email: michael.bridak@gmail.com
+https://github.com/mbridak/not1mm
+GPL V3
+"""
+
+from PyQt6 import QtNetwork
+
+# import struct
+
+
+class FT8Watcher:
+    """Main Window"""
+
+    datadict = {}
+
+    def __init__(self, *args, **kwargs):
+        """Initialize"""
+        super().__init__(*args, **kwargs)
+        self.callback = None
+        self.udp_socket = QtNetwork.QUdpSocket()
+        self.udp_socket.bind(QtNetwork.QHostAddress.SpecialAddress.LocalHost, 2237)
+        self.udp_socket.readyRead.connect(self.on_udp_socket_ready_read)
+
+    def set_callback(self, callback):
+        """Set callback"""
+        self.callback = callback
+
+    @staticmethod
+    def getint(bytestring):
+        """
+        Returns an int from a bigendian signed 4 byte string
+        """
+        return int.from_bytes(bytestring, byteorder="big", signed=True)
+
+    @staticmethod
+    def getuint(bytestring):
+        """
+        Returns an int from a bigendian unsigned 4 byte string
+        """
+        return int.from_bytes(bytestring, byteorder="big", signed=False)
+
+    @staticmethod
+    def getbool(bytestring):
+        """
+        Returns a bool from a 1 byte string
+        """
+        return bool.from_bytes(bytestring, byteorder="big", signed=False)
+
+    def getvalue(self, item):
+        """I don't remember what this does."""
+        if item in self.datadict:
+            return self.datadict[item]
+        return "NOT_FOUND"
+
+    def on_udp_socket_ready_read(self):
+        """
+        This will process incomming UDP log packets from WSJT-X.
+        I Hope...
+        """
+        self.datadict = {}
+        datagram, sender_host, sender_port_number = self.udp_socket.readDatagram(
+            self.udp_socket.pendingDatagramSize()
+        )
+        # print("%s %s %s", sender_host, sender_port_number, datagram)
+
+        if datagram[0:4] != b"\xad\xbc\xcb\xda":
+            return  # bail if no wsjt-x magic number
+        version = self.getuint(datagram[4:8])
+        packettype = self.getuint(datagram[8:12])
+        uniquesize = self.getint(datagram[12:16])
+        unique = datagram[16 : 16 + uniquesize].decode()
+        payload = datagram[16 + uniquesize :]
+
+        if packettype == 0:  # Heartbeat
+            hbmaxschema = self.getuint(payload[0:4])
+            hbversion_len = self.getint(payload[4:8])
+            hbversion = payload[8 : 8 + hbversion_len].decode()
+            print(
+                f"heartbeat: sv:{version} p:{packettype} "
+                f"u:{unique}: ms:{hbmaxschema} av:{hbversion}"
+            )
+            return
+
+        if packettype == 1:  # Status
+            ...
+            # [dialfreq] = struct.unpack(">Q", payload[0:8])
+            # modelen = self.getint(payload[8:12])
+            # mode = payload[12 : 12 + modelen].decode()
+            # payload = payload[12 + modelen :]
+            # dxcalllen = self.getint(payload[0:4])
+            # dxcall = payload[4 : 4 + dxcalllen].decode()
+            # print(
+            #     "Status: sv:%s p:%s u:%s df:%s m:%s dxc:%s",
+            #     version,
+            #     packettype,
+            #     unique,
+            #     dialfreq,
+            #     mode,
+            #     dxcall,
+            # )
+
+            # if f"{dxcall}{self.band}{self.mode}" in self.dupdict:
+            #     self.ft8dupe = f"{dxcall} {self.band}M {self.mode} FT8 Dupe!"
+            return
+
+        if packettype == 2:  # Decode commented out because we really don't care
+            return
+
+        if packettype != 12:
+            return  # bail if not logged ADIF
+        # if log packet it will contain this nugget.
+        gotcall = datagram.find(b"<call:")
+        if gotcall != -1:
+            datagram = datagram[gotcall:]  # strip everything else
+        else:
+            return  # Otherwise we don't want to bother with this packet
+
+        data = datagram.decode()
+        splitdata = data.upper().split("<")
+
+        for data in splitdata:
+            if data:
+                tag = data.split(":")
+                if tag == ["EOR>"]:
+                    break
+                self.datadict[tag[0]] = tag[1].split(">")[1].strip()
+
+        if self.callback:
+            self.callback(self.datadict)

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.4"
+__version__ = "24.4.8"

{not1mm-24.4.4.dist-info → not1mm-24.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.4
+Version: 24.4.8
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -177,6 +177,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-7] Added FT8Watcher class to prep for FT8 support.
+- [24-4-4-1] Made docking widgets open state persistent.
 - [24-4-4] Added per-contest echange hint when adding new contest.
 - [24-4-2] Migrated to PyQt6. I'm sure there are broken things.
 - [24-4-1-2] Added color text indicators to the Check Partial window. Poached the code from @kyleboyle. Thanks! Fixed the Log, VFO and Check Partial windows to be actual docking widgets. Refocus call field after double clicking on item in the check partial window.

{not1mm-24.4.4.dist-info → not1mm-24.4.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=ofO8dhlMfS9G3ih_UEpxCCOWU1vmqMfH6CDCUqLbzOE,119858
+not1mm/__main__.py,sha256=3Bjmi5rr_yuJHSdMNNc26skepG40crADyIppNqKUdu8,122807
 not1mm/bandmap.py,sha256=-wHbUmj-zqefyFO_ydLECwTtWcs37tSkA7Xm2zOVcLA,34318
 not1mm/checkwindow.py,sha256=ncIOZmuhM_eLR1gb-St8FqEefbUkD9p9VltFDJVxLeY,10465
 not1mm/fsutils.py,sha256=Li8Tq9K7c_q7onOHOQ7u1dOOFfhIIz5Aj2LKuQtGOO4,1652
@@ -26,7 +26,7 @@ not1mm/data/k6gte.not1mm-32.png,sha256=XdTsCa3xqwTfn26Ga7RwO_Vlbg_77RKkSc8bMxVcC
 not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N90,2925
 not1mm/data/logwindow.ui,sha256=vfkNdzJgFs3tTOBKLDavF2zVMvNHWOZ82fAErRi6pQY,1436
 not1mm/data/logwindowx.ui,sha256=9FzDJtLRpagvAWcDjFdB9NnvNZ4bVxdTNHy1Jit2ido,1610
-not1mm/data/main.ui,sha256=X9sNqSZyKennX-7Ne4c8yLnkbN13T5YpDUeri-wPOn4,54070
+not1mm/data/main.ui,sha256=imj6FbVeYxz90Z4MuTy730GFjpeT0OYs7TvzybmcSY8,54341
 not1mm/data/new_contest.ui,sha256=Xubngdbs_V_-o8huXzKOOaQOfj1NSXu9giIcaL4d0qk,21823
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=mC4OhoVIfR1H9IqHAKXliPMm8VOVmxSEadpsFQ7XnS4,2247
@@ -95,6 +95,7 @@ not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,35
 not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
 not1mm/lib/edit_opon.py,sha256=j3qJ1aBsQoIOnQ9yiBl3lyeISvKTP0I_rtBYBPAfgeI,359
 not1mm/lib/edit_station.py,sha256=doL21Hs6jzIE43ohAopdFt_iqnRJZHFcqzcnCS0-iio,1965
+not1mm/lib/ft8_watcher.py,sha256=rqvv7v2CXus0U8bekDenHvFVxFpYpzuApW-SA-SdtIA,4220
 not1mm/lib/ham_utility.py,sha256=pUrysod3wGk4BYOWDAKJxZZTiUNDE4ZzRk8S5ZnllNA,10978
 not1mm/lib/lookup.py,sha256=F2fl5QkMxaGSxl1XMWnLUub3T9Mt7LhCX4acOlAsks4,13952
 not1mm/lib/multicast.py,sha256=bnFUNHyy82GmIb3_88EPBVVssj7-HzkJPaH671cK8Qw,3249
@@ -104,7 +105,7 @@ not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=tlXlJUUZP0IFwIDc9DboM5_1by_tHNtMXvyJ0E7B6RI,8877
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=HjO--fiMajqd0V_9fJOBO07Crj2XOf9gi0rZlRjUAi8,47
+not1mm/lib/version.py,sha256=STPOMn2n-xW7ukFItJ4ju86aXQxaBtskG8gPdqediQk,47
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=fUjfwjuscDjicXIxsO0JHh7xTR9Vu0iPsrOLb896Qak,10873
 not1mm/plugins/10_10_spring_cw.py,sha256=WNaJP5mBQfaB6SxnFI0Vawt3AKDr94tKVtAK-EVhtUY,10878
@@ -138,9 +139,9 @@ not1mm/plugins/naqp_ssb.py,sha256=IWksulcb2_DxlkeW0h3048t8I-u00G_67KBVKkp-TV4,11
 not1mm/plugins/phone_weekly_test.py,sha256=gCX0ESUoiQzDp9puwibt9-dRembNsiuEeBdawCVvjHA,12316
 not1mm/plugins/stew_perry_topband.py,sha256=DIMI3mGMKokXXb9pPLqdhBI6JVnnIs7ZnAL23nFmshE,10588
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.4.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.4.4.dist-info/METADATA,sha256=w-lyauvXXE_ExubDbet2No9aXr7fuL_hsNe09gx1pBk,26634
-not1mm-24.4.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.4.4.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.4.4.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.4.4.dist-info/RECORD,,
+not1mm-24.4.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.4.8.dist-info/METADATA,sha256=J4EAMhz2Bh-79rMLBXavJhMr0LHDxf-otsgz--OL8Gg,26750
+not1mm-24.4.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.4.8.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.4.8.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.4.8.dist-info/RECORD,,