not1mm 24.10.27__py3-none-any.whl → 24.10.27.2__py3-none-any.whl

not1mm/__main__.py

@@ -37,6 +37,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt, QThread, QSettings, QCoreApplication
 from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor, QPixmap
 from PyQt6.QtWidgets import QFileDialog, QSplashScreen, QApplication
+from PyQt6.QtCore import QT_VERSION_STR, PYQT_VERSION_STR
 
 from not1mm.lib.about import About
 from not1mm.lib.cwinterface import CW
@@ -589,7 +590,21 @@ class MainWindow(QtWidgets.QMainWindow):
         self.voice_process.current_op = self.current_op
         self.make_op_dir()
 
-        # Featureset for wayland
+        logger.debug(f"{QT_VERSION_STR=} {PYQT_VERSION_STR=}")
+        x = PYQT_VERSION_STR.split(".")
+        old_Qt = True
+        # test if pyqt version is at least 6.7.1
+        if len(x) == 1:
+            if int(x[0]) > 6:
+                old_Qt = False
+        elif len(x) == 2:
+            if int(x[0]) >= 6 and int(x[1]) > 8:
+                old_Qt = False
+        elif len(x) == 3:
+            if int(x[0]) >= 6 and int(x[1]) >= 7 and int(x[2]) >= 2:
+                old_Qt = False
+
+        # Featureset for wayland if pyqt is older that 6.7.1
         dockfeatures = (
             QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable
             | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
@@ -598,7 +613,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up BandMapWindow.")
         self.bandmap_window = BandMapWindow()
         self.bandmap_window.setObjectName("bandmap-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.bandmap_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
         self.bandmap_window.hide()
@@ -609,7 +624,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up CheckWindow.")
         self.check_window = CheckWindow()
         self.check_window.setObjectName("check-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.check_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
         self.check_window.hide()
@@ -618,7 +633,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up VFOWindow.")
         self.vfo_window = VfoWindow()
         self.vfo_window.setObjectName("vfo-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.vfo_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
         self.vfo_window.hide()
@@ -626,7 +641,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Setting up LogWindow.")
         self.log_window = LogWindow()
         self.log_window.setObjectName("log-window")
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.log_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
         self.log_window.hide()
@@ -1041,7 +1056,9 @@ class MainWindow(QtWidgets.QMainWindow):
         if mode in ["CW", "SSB", "RTTY"]:
             freq = fakefreq(str(band), mode)
             self.change_freq(freq)
-            self.change_mode(mode)
+            vfo = float(freq)
+            vfo = int(vfo * 1000)
+            self.change_mode(mode, intended_freq=vfo)
 
     def quit_app(self) -> None:
         """
@@ -3107,6 +3124,9 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.lookup_service:
                 self.lookup_service.msg_from_main(cmd)
             self.next_field.setFocus()
+            if self.contest:
+                if "CQ WW" in self.contest.name or "IARU HF" in self.contest.name:
+                    self.contest.prefill(self)
             return
         cmd = {}
         cmd["cmd"] = "CALLCHANGED"
@@ -3125,12 +3145,12 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def change_freq(self, stripped_text: str) -> None:
         """
-        Change VFO to given frequency in Khz and set the band indicator.
-        Send the new frequency to the rig control.
+        Change Radios VFO to given frequency in Khz.
 
         Parameters
         ----------
-        stripped_text : str
+        stripped_text: str
+
         Stripped of any spaces.
 
         Returns
@@ -3160,7 +3180,7 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.bandmap_window:
             self.bandmap_window.msg_from_main(cmd)
 
-    def change_mode(self, mode: str) -> None:
+    def change_mode(self, mode: str, intended_freq=None) -> None:
         """
         Change mode to given mode.
         Send the new mode to the rig control.
@@ -3208,10 +3228,16 @@ class MainWindow(QtWidgets.QMainWindow):
             self.read_cw_macros()
             return
         if mode == "SSB":
-            if int(self.radio_state.get("vfoa", 0)) > 10000000:
+            if intended_freq:
+                freq = intended_freq
+            else:
+                freq = int(self.radio_state.get("vfoa", 0))
+
+            if freq > 10000000:
                 self.radio_state["mode"] = "USB"
             else:
                 self.radio_state["mode"] = "LSB"
+
             if self.rig_control and self.rig_control.online:
                 self.rig_control.set_mode(self.radio_state.get("mode"))
             else:
@@ -3270,7 +3296,11 @@ class MainWindow(QtWidgets.QMainWindow):
                 )
                 if len(callsign) > 2:
                     if self.contest:
-                        self.contest.prefill(self)
+                        if (
+                            "CQ WW" not in self.contest.name
+                            and "IARU HF" not in self.contest.name
+                        ):
+                            self.contest.prefill(self)
 
     def check_dupe(self, call: str) -> bool:
         """Checks if a callsign is a dupe on current band/mode."""

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.10.27"
+__version__ = "24.10.27.2"

{not1mm-24.10.27.dist-info → not1mm-24.10.27.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.27
+Version: 24.10.27.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -232,6 +232,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-10-27-2] Changed CQ zone auto population for CQ WW, it now waits for the user to exit the callsign entry window before auto filling the zone.
+- [24-10-27-1] Fixed setting radios ssb mode when crossing 10M boundary.
 - [24-10-27] Fix bug where a contacts info could be carried over to new contact if no new value was written.
 - [24-10-26] Clear inputs when seeking to a call from the bandmap via the arrow up and down. Fixed bandmap crash from bad telnet data. Drop beacons from bandmap.
 - [24-10-25] Add File Menu option to create either an ASCII or UTF8 Cabrillo.

{not1mm-24.10.27.dist-info → not1mm-24.10.27.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=JPKFnKAh1GZEH3NOidGpy86TcDZqm8gMABPR7VQiP3s,135485
+not1mm/__main__.py,sha256=AWA2Dud5vG75fjxlS0gGnWrKJJaYV_rkO7-yREQWCIA,136633
 not1mm/bandmap.py,sha256=X6mMHXS1kXBbUPZCaKgiVJ6Dz6DE6LEQqtEXfT3telg,30811
 not1mm/checkwindow.py,sha256=F6hNCbVSLG2PPY2afgmwlBWeqr1Uj4-n__AivDLVQ_0,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -115,7 +115,7 @@ not1mm/lib/plugin_common.py,sha256=TbFUbftjELFt4QRdsjSHbqnXSngZOlSwlCTClqosDXA,9
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=7_JFDSKPOd35Gwzqhrbed4EfrlYUm7AEnz2xBRioc-g,13280
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=QxrGgy8tR7cnyUhE8alHEwdXU9Kmlr6zOuorgYRplTw,49
+not1mm/lib/version.py,sha256=t_SYOIINyKke0cb6vNpdKmuJ7yZ3cV5iXEIae-BqEQU,51
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=QQjEgWQRT35qG1bi87QhoUIOzGbN8C27WIUhhoFNsAI,11866
 not1mm/plugins/10_10_spring_cw.py,sha256=nGznP9VLooaDnHi0JXttosqAtSRH32oXwWmMrXf95A0,11871
@@ -160,9 +160,9 @@ not1mm/plugins/ref_ssb.py,sha256=UC8xwl4uRihTvlYsITCvfTCPVbNXpnO91T8qMDKaW8E,209
 not1mm/plugins/stew_perry_topband.py,sha256=UOK9M23eMkcEB83kL8NPHl6QDBJFCXKZpBRlhfuEH2c,11581
 not1mm/plugins/weekly_rtty.py,sha256=WoMfQXJczvoHQB04i6TAvL6MF91uOOQ9ZmB9BpUkOfo,19098
 not1mm/plugins/winter_field_day.py,sha256=wPxHKPPeyE2XlRT6Unnz09evFwd0ghWtXU5l-nMr3aI,14492
-not1mm-24.10.27.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.10.27.dist-info/METADATA,sha256=x0lp0IkthtaRZecYrTklYNMDChhthPypCAlNwWAQVNU,35544
-not1mm-24.10.27.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-not1mm-24.10.27.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.10.27.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.10.27.dist-info/RECORD,,
+not1mm-24.10.27.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.10.27.2.dist-info/METADATA,sha256=rRd4LhDlcAwDLmN-QGrE352ykLrXt2M0kXOZ1y_pmk4,35767
+not1mm-24.10.27.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+not1mm-24.10.27.2.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.10.27.2.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.10.27.2.dist-info/RECORD,,