not1mm 24.7.29__py3-none-any.whl → 24.8.17__py3-none-any.whl

not1mm/__main__.py

@@ -16,11 +16,8 @@ import locale
 import logging
 from logging.handlers import RotatingFileHandler
 import os
-
 import platform
-import re
 import socket
-
 import sys
 import threading
 import uuid
@@ -30,7 +27,6 @@ from pathlib import Path
 from shutil import copyfile
 
 import notctyparser
-import psutil
 
 try:
     import sounddevice as sd
@@ -82,28 +78,6 @@ from not1mm.voice_keying import Voice
 poll_time = datetime.datetime.now()
 
 
-def check_process(name: str) -> bool:
-    """
-    Checks to see if the name of the program is in the active process list.
-
-    Parameters
-    ----------
-    name : str
-
-    Returns
-    -------
-    Bool
-    """
-    for proc in psutil.process_iter():
-        try:
-            if len(proc.cmdline()) == 2:
-                if name in proc.cmdline()[1] and "python" in proc.cmdline()[0]:
-                    return True
-        except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
-            continue
-    return False
-
-
 class MainWindow(QtWidgets.QMainWindow):
     """
     The main window
@@ -522,23 +496,37 @@ class MainWindow(QtWidgets.QMainWindow):
             self.load_contest()
         self.read_cw_macros()
 
+        # Featureset for wayland
+        dockfeatures = (
+            QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetClosable
+            | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
+        )
+
         self.log_window = LogWindow()
         self.log_window.setObjectName("log-window")
+        if os.environ.get("WAYLAND_DISPLAY"):
+            self.log_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
         self.log_window.hide()
 
         self.bandmap_window = BandMapWindow()
         self.bandmap_window.setObjectName("bandmap-window")
+        if os.environ.get("WAYLAND_DISPLAY"):
+            self.bandmap_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
         self.bandmap_window.hide()
 
         self.check_window = CheckWindow()
         self.check_window.setObjectName("check-window")
+        if os.environ.get("WAYLAND_DISPLAY"):
+            self.check_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
         self.check_window.hide()
 
         self.vfo_window = VfoWindow()
         self.vfo_window.setObjectName("vfo-window")
+        if os.environ.get("WAYLAND_DISPLAY"):
+            self.vfo_window_window.setFeatures(dockfeatures)
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
         self.vfo_window.hide()
 
@@ -782,25 +770,6 @@ class MainWindow(QtWidgets.QMainWindow):
         self.multicast_interface.send_as_json(cmd)
         app.quit()
 
-    @staticmethod
-    def check_process(name: str) -> bool:
-        """
-        Checks to see if program is in the active process list.
-
-        Parameters
-        ----------
-        name : str
-
-        Returns
-        -------
-        Bool
-        """
-
-        for proc in psutil.process_iter():
-            if bool(re.match(name, proc.name().lower())):
-                return True
-        return False
-
     def show_message_box(self, message: str) -> None:
         """
         Displays a dialog box with a message.
@@ -2233,14 +2202,22 @@ class MainWindow(QtWidgets.QMainWindow):
         if next_serial == "None":
             next_serial = "1"
         macro = macro.upper()
-        macro = macro.replace("#", next_serial)
+        if self.radio_state.get("mode") == "CW":
+            macro = macro.replace("#", next_serial.rjust(3, "T"))
+        else:
+            macro = macro.replace("#", next_serial)
         macro = macro.replace("{MYCALL}", self.station.get("Call", ""))
         macro = macro.replace("{HISCALL}", self.callsign.text())
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace("{SNT}", self.sent.text().replace("9", "n"))
         else:
             macro = macro.replace("{SNT}", self.sent.text())
-        macro = macro.replace("{SENTNR}", self.other_1.text())
+        if self.radio_state.get("mode") == "CW":
+            macro = macro.replace(
+                "{SENTNR}", self.other_1.text().lstrip("0").rjust(3, "T")
+            )
+        else:
+            macro = macro.replace("{SENTNR}", self.other_1.text())
         macro = macro.replace(
             "{EXCH}", self.contest_settings.get("SentExchange", "xxx")
         )

not1mm/bandmap.py

@@ -659,20 +659,9 @@ class BandMapWindow(QDockWidget):
     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)
         )
-        # This does not work... Have no idea why.
-        # anim = QtCore.QPropertyAnimation(
-        #     self.scrollArea.verticalScrollBar(), "value".encode()
-        # )
-        # anim.setDuration(300)
-        # anim.setStartValue(self.scrollArea.verticalScrollBar().value())
-        # anim.setEndValue(int(freq_pos - (self.height() / 2) + 80))
-        # anim.start(QtCore.QAbstractAnimation.DeletionPolicy.DeleteWhenStopped)
 
     def drawfreqmark(self, freq, _step, color, currentPolygon) -> None:
         """doc"""
@@ -842,7 +831,6 @@ class BandMapWindow(QDockWidget):
                 dx = parts[4]
                 _time = parts[-1]
                 comment = " ".join(parts[5:-1])
-                # spot = DxSpot()
                 spot = {}
                 spot["ts"] = datetime.now(timezone.utc).isoformat(" ")[:19]
                 spot["callsign"] = dx
@@ -856,13 +844,11 @@ class BandMapWindow(QDockWidget):
                     logger.debug(f"couldn't parse freq from datablock {data}")
                 return
             if self.callsignField.text().upper() in data:
-                # self.connectButton.setStyleSheet("color: green;")
                 self.connectButton.setText("Connected")
                 logger.debug(f"callsign login acknowledged {data}")
 
     def maybeconnected(self) -> None:
         """Update visual state of the connect button."""
-        # self.connectButton.setStyleSheet("color: yellow;")
         self.connectButton.setText("Connecting")
 
     def socket_error(self) -> None:

not1mm/checkwindow.py

@@ -111,7 +111,6 @@ class CheckWindow(QDockWidget):
             )
 
             self.setPalette(darkPalette)
-            # self.CheckPartialWindow.setPalette(darkPalette)
         else:
             palette = self.style().standardPalette()
             self.setPalette(palette)

not1mm/lib/version.py

@@ -1,4 +1,4 @@
 """It's the version"""
 
-__version__ = "24.7.29"
+__version__ = "24.8.17"
 

not1mm/vfo.py

@@ -162,7 +162,6 @@ class VfoWindow(QDockWidget):
 
         devices = None
         data = None
-        # app.processEvents()
         try:
             devices = os.listdir("/dev/serial/by-id")
         except FileNotFoundError:
@@ -216,7 +215,6 @@ class VfoWindow(QDockWidget):
                     "Unable to locate or open the VFO knob serial device."
                 )
             self.lcdNumber.setStyleSheet("QLCDNumber { color: red; }")
-        # app.processEvents()
 
     def watch_udp(self) -> None:
         """
@@ -263,7 +261,6 @@ class VfoWindow(QDockWidget):
         if len(dvfo) > 6:
             dnum = f"{dvfo[:len(dvfo)-6]}.{dvfo[-6:-3]}.{dvfo[-3:]}"
             self.lcdNumber.display(dnum)
-            # app.processEvents()
 
     def poll_radio(self) -> None:
         """
@@ -285,8 +282,6 @@ class VfoWindow(QDockWidget):
                     self.old_vfo = vfo
                     logger.debug(f"{vfo}")
                     self.showNumber(vfo)
-                    # self.lcdNumber.display(dnum)
-                    # app.processEvents()
                     cmd = f"F {vfo}\r"
                     self.device_reconnect = False
                     try:
@@ -313,8 +308,6 @@ class VfoWindow(QDockWidget):
                         if self.rig_control:
                             self.rig_control.set_vfo(result)
                             self.showNumber(result)
-                            # self.lcdNumber.display(result)
-                            # app.processEvents()
             else:
                 self.setup_serial(supress_msg=True)
         except OSError:
@@ -323,7 +316,6 @@ class VfoWindow(QDockWidget):
         except AttributeError:
             logger.critical("Unable to write to serial device.")
             self.pico = None
-        # app.processEvents()
 
     def show_message_box(self, message: str) -> None:
         """

not1mm/voice_keying.py

@@ -53,12 +53,10 @@ class Voice(QObject):
                 if Path(filename).is_file():
                     logger.debug("Voicing: %s", filename)
                     data, _fs = sf.read(filename, dtype="float32")
-                    # self.ptt_on.emit()
                     try:
                         sd.default.device = self.sounddevice
                         sd.default.samplerate = 44100.0
                         sd.play(data, blocking=True)
-                        # _status = sd.wait()
                         # https://snyk.io/advisor/python/sounddevice/functions/sounddevice.PortAudioError
                     except sd.PortAudioError as err:
                         logger.warning("%s", f"{err}")
@@ -84,8 +82,6 @@ class Voice(QObject):
         if sd is None:
             logger.warning("Sounddevice/portaudio not installed.")
             return
-        # fsutils.USER_DATA_PATH
-        # self.current_op
         op_path = self.data_path / self.current_op
         if "[" in the_string:
             sub_string = the_string.strip("[]").lower()

{not1mm-24.7.29.dist-info → not1mm-24.8.17.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.29
+Version: 24.8.17
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
 Project-URL: Bug Tracker, https://github.com/mbridak/not1mm/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Environment :: X11 Applications :: Qt
 Classifier: Operating System :: POSIX :: Linux
@@ -20,7 +20,6 @@ Requires-Dist: PyQt6
 Requires-Dist: requests
 Requires-Dist: dicttoxml
 Requires-Dist: xmltodict
-Requires-Dist: psutil
 Requires-Dist: pyserial
 Requires-Dist: sounddevice
 Requires-Dist: soundfile
@@ -223,13 +222,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-7-29] Add flrig cw speed change via onscreen widget.
-- [24-7-28] Second try at flrig CW.
-- [24-7-25-1] Have VFO dock widget handle disconnect/reconnect events of the USB VFO knob more gracefully.
-- [24-7-25] Updated application categories for the desktop file.
-- [24-7-25] Maybe let flrig send CW... Probably not.
-- [24-7-19] Use Qt's QSettings to store window and dockwidgets states.
-- [24-7-13] Trap Exceptions in flrig xmlrpc client.
+- [24-8-17] Removed some cruft. Made dockable widgets not floatable since Wayland breaks this.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.7.29.dist-info → not1mm-24.8.17.dist-info}/RECORD

@@ -1,13 +1,13 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=-zzE1QUDpuVKwgWJeoEPJ7ceCCvx0YLBISw24xQJgs4,121481
-not1mm/bandmap.py,sha256=Ml5DDoybk_I56q2WLYDKE4lfmh6pb9XxW0qpl5nDFYY,32161
-not1mm/checkwindow.py,sha256=zHxkCQ4BJ-pN80dSTQdiKq8RqY4oWzJveXZhQ2bu3PY,10436
+not1mm/__main__.py,sha256=Mc_XbbwjiWXL_OS3Xqvr4GGIVKcxlc7i7AZaCDFDw-o,121462
+not1mm/bandmap.py,sha256=1b5tXCfGTnpqqn6hPNt7zRA8SmuwSXzSwNHZXhCRt70,31434
+not1mm/checkwindow.py,sha256=aI-nr8OF90IWV7R_XRdmitvBJ9M85evCs72HoU3Jnvc,10374
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=pwhiwolmGnW01LF4sjlu3ywLsgfxL6KuGuKuYKYmgeY,44403
 not1mm/playsoundtest.py,sha256=_kvvOfgs-u-H4kVSiSlnDtn9HWv0RiJQybkv24CEngc,464
 not1mm/radio.py,sha256=eiB04LPMPBeMrBRI021Z7VXth66EOYb0Ujh11T9877c,3362
-not1mm/vfo.py,sha256=ZJYJHMUrvAWX_c4xXDOuxkbE9sFuF8THoqJXaz0e_AU,12663
-not1mm/voice_keying.py,sha256=fkexCCwWcZsXxYVAk0QGcpGbLjbS10ToxWtdKihIVM4,3152
+not1mm/vfo.py,sha256=IvmUQYMIPzLJw_BHQGis4J_IEW-vlBtdfxZLXPh7OzI,12335
+not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=CEjRJNnjBZJlhCi3UFS1qCVMjDqQwhlfk0yZ_os6myI,366153
 not1mm/data/about.ui,sha256=7TqvtXFFm0Rmcu0bmLupwpO1CsK8MekfZ09_xn6kZrQ,2067
@@ -109,7 +109,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=MWiKXbasaFbzeHTjfzTaTqbCBrIijudP_-0a5jNmUAA,9265
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=BMpTloYgDxnJAW_gTC-FRCBOqBhNTglZbFeS_OdpJiQ,49
+not1mm/lib/version.py,sha256=KD1zLDozF_Qq38UeKdujPpZCSLz8rpM_O0OYAp9XwDg,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -145,9 +145,9 @@ not1mm/plugins/naqp_ssb.py,sha256=VLWVrSzI0UP1AhSXYn61eZ7or1rz6a_pS_xCKfgS4Jw,11
 not1mm/plugins/phone_weekly_test.py,sha256=fLpMe03WB9_KgRl6vMgQQt_aktFdqfNt2Sw81CTRAUs,12325
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.7.29.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.7.29.dist-info/METADATA,sha256=gxO9nKYQuDwbFIRsySM-8YZydIx54Nn5gF8W8UUhUAY,29506
-not1mm-24.7.29.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-not1mm-24.7.29.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.7.29.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.7.29.dist-info/RECORD,,
+not1mm-24.8.17.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.8.17.dist-info/METADATA,sha256=vP3alPhxvOCEhnCN_U3qgbQ-Jk2OY6xdBrZVaIi5124,29149
+not1mm-24.8.17.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+not1mm-24.8.17.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.8.17.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.8.17.dist-info/RECORD,,

{not1mm-24.7.29.dist-info → not1mm-24.8.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any