not1mm 24.10.1__tar.gz → 24.10.5__tar.gz

{not1mm-24.10.1 → not1mm-24.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.1
+Version: 24.10.5
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -201,7 +201,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ARRL Sweepstakes CW, SSB
 - ARRL VHF January, June, September
 - CQ 160 CW, SSB
-- CQ WPX CW, SSB
+- CQ WPX CW, RTTY, SSB
 - CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
@@ -219,6 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-5] Force reselction of contest after different DB opened.
+- [24-10-2] Add WPX RTTY.
 - [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
@@ -294,16 +296,18 @@ source .profile
 
 ```bash
 sudo dnf upgrade --refresh
-sudo dnf install python3-pip portaudio
-pip install not1mm
+sudo dnf install python3-pip pipx portaudio
+pipx install not1mm
+pipx ensurepath
 ```
 
 #### Fedora 40
 
 ```bash
 sudo dnf upgrade --refresh
-sudo dnf install python3-pip python3-pyqt6 portaudio
-pip install not1mm
+sudo dnf install python3-pip pipx python3-pyqt6 portaudio
+pipx install not1mm
+pipx ensurepath
 ```
 
 </details>
@@ -335,10 +339,6 @@ pipx ensurepath
 </details>
 <br>
 
-You can now open a new terminal and type not1mm. On it's first run, it may or
-may not install a lovely non AI generated icon, which you can later click on to
-launch the application.
-
 ### Python, PyPI, pip and pipx
 
 This software is a Python package hosted on PyPI, and installable with the pip
@@ -598,7 +598,13 @@ appear. Those without will not.
 
 ## Logging WSJT-X FT8/FT4/ETC and FLDIGI RTTY contacts
 
-**Digital modes only working for ARRL Field Day, ARRL VHF, and Weekly RTTY**
+**Digital modes only working for:**
+
+- ARRL Field Day
+- ARRL VHF
+- Weekly RTTY
+- CQ WW DX RTTY
+- CQ WPX RTTY
 
 not1mm listens for WSJT-X UDP traffic on the Multicast address 224.0.0.1:2237.
 No setup is needed to be done on not1mm's side. That's good because I'm lazy.
@@ -607,6 +613,10 @@ not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather
 way. It just keeps asking what was the last QSO and compares it to the previous response.
 If it's different, it's new. I've added the Weekly RTTY Test so this can be tested.
 
+The F1-F12 function keys be sent to fldigi via XMLRPC. Fldigi will be placed into TX
+mode, the message will be sent and a ^r will be tacked onto the end to place it back into
+RX mode.
+
 Unlike WSJT, fldigi needs to be setup for this to work. The XMLRPC interface needs to be
 active. And in fldigi's config dialog go to CONTESTS -> General -> CONTEST and select
 Generic Contest. Make sure the Text Capture Order field says CALL EXCHANGE.
@@ -624,7 +634,7 @@ field.
 
 To edit the macros, choose `File` > `Edit Macros`. This will open your systems
 registered text editor with current macros loaded. When your done just save the
-file and close the editor. The file loaded to edit, CW or SSB, will be
+file and close the editor. The file loaded to edit, CW, SSB or RTTY, will be
 determined by your current operating mode.
 
 After editing and saving the macro file. You can force the logger to reload the
@@ -707,7 +717,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [Shift-Tab] | Move cursor left One field. |
 | [SPACE] | When in the callsign field, will move the input to the first field needed for the exchange. |
 | [Enter] | Submits the fields to the log. |
-| [F1-F12] | Send (CW or Voice) macros. |
+| [F1-F12] | Send (CW/RTTY/Voice) macros. |
 | [CTRL-S] | Spot Callsign to the cluster. |
 | [CTRL-M] | Mark Callsign to the bandmap window to work later. |
 | [CTRL-G] | Tune to a spot matching partial text in the callsign entry field (CAT Required). |

{not1mm-24.10.1 → not1mm-24.10.5}/README.md

@@ -170,7 +170,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ARRL Sweepstakes CW, SSB
 - ARRL VHF January, June, September
 - CQ 160 CW, SSB
-- CQ WPX CW, SSB
+- CQ WPX CW, RTTY, SSB
 - CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
@@ -188,6 +188,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-5] Force reselction of contest after different DB opened.
+- [24-10-2] Add WPX RTTY.
 - [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
@@ -263,16 +265,18 @@ source .profile
 
 ```bash
 sudo dnf upgrade --refresh
-sudo dnf install python3-pip portaudio
-pip install not1mm
+sudo dnf install python3-pip pipx portaudio
+pipx install not1mm
+pipx ensurepath
 ```
 
 #### Fedora 40
 
 ```bash
 sudo dnf upgrade --refresh
-sudo dnf install python3-pip python3-pyqt6 portaudio
-pip install not1mm
+sudo dnf install python3-pip pipx python3-pyqt6 portaudio
+pipx install not1mm
+pipx ensurepath
 ```
 
 </details>
@@ -304,10 +308,6 @@ pipx ensurepath
 </details>
 <br>
 
-You can now open a new terminal and type not1mm. On it's first run, it may or
-may not install a lovely non AI generated icon, which you can later click on to
-launch the application.
-
 ### Python, PyPI, pip and pipx
 
 This software is a Python package hosted on PyPI, and installable with the pip
@@ -567,7 +567,13 @@ appear. Those without will not.
 
 ## Logging WSJT-X FT8/FT4/ETC and FLDIGI RTTY contacts
 
-**Digital modes only working for ARRL Field Day, ARRL VHF, and Weekly RTTY**
+**Digital modes only working for:**
+
+- ARRL Field Day
+- ARRL VHF
+- Weekly RTTY
+- CQ WW DX RTTY
+- CQ WPX RTTY
 
 not1mm listens for WSJT-X UDP traffic on the Multicast address 224.0.0.1:2237.
 No setup is needed to be done on not1mm's side. That's good because I'm lazy.
@@ -576,6 +582,10 @@ not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather
 way. It just keeps asking what was the last QSO and compares it to the previous response.
 If it's different, it's new. I've added the Weekly RTTY Test so this can be tested.
 
+The F1-F12 function keys be sent to fldigi via XMLRPC. Fldigi will be placed into TX
+mode, the message will be sent and a ^r will be tacked onto the end to place it back into
+RX mode.
+
 Unlike WSJT, fldigi needs to be setup for this to work. The XMLRPC interface needs to be
 active. And in fldigi's config dialog go to CONTESTS -> General -> CONTEST and select
 Generic Contest. Make sure the Text Capture Order field says CALL EXCHANGE.
@@ -593,7 +603,7 @@ field.
 
 To edit the macros, choose `File` > `Edit Macros`. This will open your systems
 registered text editor with current macros loaded. When your done just save the
-file and close the editor. The file loaded to edit, CW or SSB, will be
+file and close the editor. The file loaded to edit, CW, SSB or RTTY, will be
 determined by your current operating mode.
 
 After editing and saving the macro file. You can force the logger to reload the
@@ -676,7 +686,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [Shift-Tab] | Move cursor left One field. |
 | [SPACE] | When in the callsign field, will move the input to the first field needed for the exchange. |
 | [Enter] | Submits the fields to the log. |
-| [F1-F12] | Send (CW or Voice) macros. |
+| [F1-F12] | Send (CW/RTTY/Voice) macros. |
 | [CTRL-S] | Spot Callsign to the cluster. |
 | [CTRL-M] | Mark Callsign to the bandmap window to work later. |
 | [CTRL-G] | Tune to a spot matching partial text in the callsign entry field (CAT Required). |

{not1mm-24.10.1 → not1mm-24.10.5}/not1mm/__main__.py

@@ -175,10 +175,10 @@ class MainWindow(QtWidgets.QMainWindow):
     lookup_service = None
     fldigi_util = None
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, splash):
+        super().__init__()
         logger.info("MainWindow: __init__")
-
+        self.splash = splash
         self.dock_loc = {
             "Top": Qt.DockWidgetArea.TopDockWidgetArea,
             "Right": Qt.DockWidgetArea.RightDockWidgetArea,
@@ -519,6 +519,8 @@ class MainWindow(QtWidgets.QMainWindow):
             QtGui.QIcon(str(fsutils.APP_DATA_PATH / "k6gte.not1mm-32.png"))
         )
 
+        self.show_splash_msg("Loading CTY file.")
+
         try:
             with open(
                 fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8"
@@ -527,11 +529,15 @@ class MainWindow(QtWidgets.QMainWindow):
         except (IOError, JSONDecodeError, TypeError):
             logging.CRITICAL("There was an error parsing the BigCity file.")
 
+        self.show_splash_msg("Starting LookUp Service.")
+
         self.lookup_service = LookupService()
         self.lookup_service.hide()
 
+        self.show_splash_msg("Reading preferences.")
         self.readpreferences()
 
+        self.show_splash_msg("Starting voice thread.")
         self.voice_process = Voice()
         self.voice_process.moveToThread(self.voice_thread)
         self.voice_thread.started.connect(self.voice_process.run)
@@ -560,7 +566,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.make_op_dir()
 
         self.clearinputs()
+        self.show_splash_msg("Loading contest.")
         self.load_contest()
+        self.show_splash_msg("Reading macros.")
         self.read_cw_macros()
 
         # Featureset for wayland
@@ -569,6 +577,7 @@ class MainWindow(QtWidgets.QMainWindow):
             | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
         )
 
+        self.show_splash_msg("Starting FlDigi watcher.")
         self.fldigi_watcher = FlDigiWatcher()
         self.fldigi_watcher.moveToThread(self.fldigi_thread)
         self.fldigi_thread.started.connect(self.fldigi_watcher.run)
@@ -576,6 +585,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.fldigi_watcher.poll_callback.connect(self.fldigi_qso)
         self.fldigi_thread.start()
 
+        self.show_splash_msg("Setting up LogWindow.")
         self.log_window = LogWindow()
         self.log_window.setObjectName("log-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -583,6 +593,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
         self.log_window.hide()
 
+        self.show_splash_msg("Setting up BandMapWindow.")
         self.bandmap_window = BandMapWindow()
         self.bandmap_window.setObjectName("bandmap-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -590,6 +601,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
         self.bandmap_window.hide()
 
+        self.show_splash_msg("Setting up CheckWindow.")
         self.check_window = CheckWindow()
         self.check_window.setObjectName("check-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -597,6 +609,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
         self.check_window.hide()
 
+        self.show_splash_msg("Setting up VFOWindow.")
         self.vfo_window = VfoWindow()
         self.vfo_window.setObjectName("vfo-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -604,6 +617,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
         self.vfo_window.hide()
 
+        self.show_splash_msg("Restoring window states.")
         self.settings = QSettings("K6GTE", "not1mm")
         if self.settings.value("windowState") is not None:
             self.restoreState(self.settings.value("windowState"))
@@ -635,6 +649,15 @@ class MainWindow(QtWidgets.QMainWindow):
                     "You can udate to the current version by using:\npip install -U not1mm"
                 )
 
+    def show_splash_msg(self, msg: str) -> None:
+        """Show text message in the splash window."""
+        self.splash.showMessage(
+            msg,
+            alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
+            color=QColor(255, 255, 0),
+        )
+        QCoreApplication.processEvents()
+
     def fldigi_qso(self, result: str):
         """
         gets called when there is a new fldigi qso logged.
@@ -1061,6 +1084,7 @@ class MainWindow(QtWidgets.QMainWindow):
             cmd["station"] = platform.node()
             self.multicast_interface.send_as_json(cmd)
             self.clearinputs()
+            self.open_contest()
 
     def new_contest(self) -> None:
         """Create new contest in existing database."""
@@ -3601,7 +3625,7 @@ app = QtWidgets.QApplication(sys.argv)
 pixmap = QPixmap(f"{os.fspath(fsutils.APP_DATA_PATH)}/splash.png")
 splash = QSplashScreen(pixmap)
 splash.show()
-app.processEvents()
+# app.processEvents()
 splash.showMessage(
     "Starting Up",
     alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
@@ -3611,10 +3635,10 @@ QCoreApplication.processEvents()
 
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
-window = MainWindow()
+window = MainWindow(splash)
 window.callsign.setFocus()
-window.show()
 splash.finish(window)
+window.show()
 
 if __name__ == "__main__":
     run()

{not1mm-24.10.1 → not1mm-24.10.5}/not1mm/data/new_contest.ui

@@ -277,6 +277,11 @@
        <string>CQ WPX CW</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>CQ WPX RTTY</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>CQ WPX SSB</string>

{not1mm-24.10.1 → not1mm-24.10.5}/not1mm/lib/cwinterface.py

@@ -55,7 +55,7 @@ class CW:
                 self._sendcw_xmlrpc(texttosend)
             if self.servertype == 1:
                 self._sendcw_udp(texttosend)
-            if self.servertype == 3 and self.cw is not None:
+            if self.servertype == 3:
                 self._sendcwcat(texttosend)
 
     def _sendcw_xmlrpc(self, texttosend):

{not1mm-24.10.1 → not1mm-24.10.5}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.10.1"
+__version__ = "24.10.5"