not1mm 24.4.30__py3-none-any.whl → 24.5.1__py3-none-any.whl

not1mm/__main__.py

@@ -35,7 +35,6 @@ except OSError as exception:
     print(exception)
     print("portaudio is not installed")
     sd = None
-import soundfile as sf
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt, QThread
 from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
@@ -75,6 +74,7 @@ from not1mm.checkwindow import CheckWindow
 from not1mm.bandmap import BandMapWindow
 from not1mm.vfo import VfoWindow
 from not1mm.radio import Radio
+from not1mm.voice_keying import Voice
 
 poll_time = datetime.datetime.now()
 
@@ -188,6 +188,7 @@ class MainWindow(QtWidgets.QMainWindow):
     current_palette = None
 
     radio_thread = QThread()
+    voice_thread = QThread()
 
     rig_control = None
     log_window = None
@@ -479,6 +480,18 @@ class MainWindow(QtWidgets.QMainWindow):
         with open(fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8") as c_file:
             self.ctyfile = loads(c_file.read())
         self.readpreferences()
+
+        self.voice_process = Voice()
+        self.voice_process.moveToThread(self.voice_thread)
+        self.voice_thread.started.connect(self.voice_process.run)
+        self.voice_thread.finished.connect(self.voice_process.deleteLater)
+        self.voice_process.ptt_on.connect(self.ptt_on)
+        self.voice_process.ptt_off.connect(self.ptt_off)
+        self.voice_process.current_op = self.current_op
+        self.voice_process.data_path = fsutils.USER_DATA_PATH
+        self.voice_process.sounddevice = self.pref.get("sounddevice", "default")
+        self.voice_thread.start()
+
         self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
             "current_database", "ham.db"
         )
@@ -492,6 +505,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.station = {}
         self.contact = self.database.empty_contact
         self.current_op = self.station.get("Call", "")
+        self.voice_process.current_op = self.current_op
         self.make_op_dir()
         self.read_cw_macros()
         self.clearinputs()
@@ -922,6 +936,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.station is None:
                 self.station = {}
             self.current_op = self.station.get("Call", "")
+            self.voice_process.current_op = self.current_op
             self.make_op_dir()
             cmd = {}
             cmd["cmd"] = "NEWDB"
@@ -958,6 +973,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.station.get("Call", "") == "":
                 self.edit_station_settings()
             self.current_op = self.station.get("Call", "")
+            self.voice_process.current_op = self.current_op
             self.make_op_dir()
             cmd = {}
             cmd["cmd"] = "NEWDB"
@@ -2118,6 +2134,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.settings_dialog.close()
         if self.current_op == "":
             self.current_op = self.station.get("Call", "")
+            self.voice_process.current_op = self.current_op
             self.make_op_dir()
         contest_count = self.database.fetch_all_contests()
         if len(contest_count) == 0:
@@ -2199,61 +2216,6 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         return macro
 
-    def voice_string(self, the_string: str) -> None:
-        """
-        voices string using nato phonetics.
-
-        Parameters
-        ----------
-        the_string : str
-        String to voicify.
-
-        Returns
-        -------
-        None
-        """
-
-        logger.debug("Voicing: %s", the_string)
-        if sd is None:
-            logger.warning("Sounddevice/portaudio not installed.")
-            return
-        op_path = fsutils.USER_DATA_PATH / self.current_op
-        if "[" in the_string:
-            sub_string = the_string.strip("[]").lower()
-            filename = f"{str(op_path)}/{sub_string}.wav"
-            if Path(filename).is_file():
-                logger.debug("Voicing: %s", filename)
-                data, _fs = sf.read(filename, dtype="float32")
-                self.ptt_on()
-                try:
-                    sd.default.device = self.pref.get("sounddevice", "default")
-                    sd.default.samplerate = 44100.0
-                    sd.play(data, blocking=False)
-                    # _status = sd.wait()
-                    # https://snyk.io/advisor/python/sounddevice/functions/sounddevice.PortAudioError
-                except sd.PortAudioError as err:
-                    logger.warning("%s", f"{err}")
-
-                self.ptt_off()
-            return
-        self.ptt_on()
-        for letter in the_string.lower():
-            if letter in "abcdefghijklmnopqrstuvwxyz 1234567890":
-                if letter == " ":
-                    letter = "space"
-                filename = f"{str(op_path)}/{letter}.wav"
-                if Path(filename).is_file():
-                    logger.debug("Voicing: %s", filename)
-                    data, _fs = sf.read(filename, dtype="float32")
-                    try:
-                        sd.default.device = self.pref.get("sounddevice", "default")
-                        sd.default.samplerate = 44100.0
-                        sd.play(data, blocking=False)
-                        logger.debug("%s", f"{sd.wait()}")
-                    except sd.PortAudioError as err:
-                        logger.warning("%s", f"{err}")
-        self.ptt_off()
-
     def ptt_on(self) -> None:
         """
         Turn on ptt for rig.
@@ -2285,6 +2247,7 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
+
         logger.debug("PTT Off")
         if self.rig_control:
             self.leftdot.setPixmap(self.reddot)
@@ -2309,7 +2272,8 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.n1mm:
             self.n1mm.radio_info["FunctionKeyCaption"] = function_key.text()
         if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(function_key.toolTip()))
+            self.voice_process.voice_string(self.process_macro(function_key.toolTip()))
+            # self.voice_string(self.process_macro(function_key.toolTip()))
             return
         if self.cw:
             if self.pref.get("cwtype") == 3 and self.rig_control is not None:
@@ -3103,6 +3067,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         if self.opon_dialog.NewOperator.text():
             self.current_op = self.opon_dialog.NewOperator.text().upper()
+            self.voice_process.current_op = self.current_op
         self.opon_dialog.close()
         logger.debug("New Op: %s", self.current_op)
         self.make_op_dir()

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.30"
+__version__ = "24.5.1"

not1mm/voice_keying.py

@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+
+"""
+Not1MM Contest logger
+Email: michael.bridak@gmail.com
+GPL V3
+"""
+
+# pylint: disable=unused-import, c-extension-no-member, no-member, invalid-name, too-many-lines
+# pylint: disable=logging-fstring-interpolation, line-too-long, no-name-in-module
+
+import logging
+from pathlib import Path
+
+try:
+    import sounddevice as sd
+except OSError as exception:
+    print(exception)
+    print("portaudio is not installed")
+    sd = None
+import soundfile as sf
+
+from PyQt6.QtCore import QObject, pyqtSignal, QThread
+
+logger = logging.getLogger("cat_interface")
+
+
+class Voice(QObject):
+    """Voice class"""
+
+    ptt_on = pyqtSignal()
+    ptt_off = pyqtSignal()
+    data_path = None
+    current_op = None
+    sounddevice = None
+    voicings = []
+
+    def __init__(self) -> None:
+        super().__init__()
+        """setup interface"""
+
+    def run(self):
+        while True:
+            keyed = False
+            while len(self.voicings):
+                if not keyed:
+                    self.ptt_on.emit()
+                    keyed = True
+                filename = self.voicings.pop(0)
+                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}")
+            if keyed:
+                self.ptt_off.emit()
+            QThread.msleep(100)
+
+    def voice_string(self, the_string: str) -> None:
+        """
+        voices string using nato phonetics.
+
+        Parameters
+        ----------
+        the_string : str
+        String to voicify.
+
+        Returns
+        -------
+        None
+        """
+
+        logger.debug("Voicing: %s", the_string)
+        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()
+            filename = f"{str(op_path)}/{sub_string}.wav"
+            if Path(filename).is_file():
+                self.voicings.append(filename)
+            return
+        for letter in the_string.lower():
+            if letter in "abcdefghijklmnopqrstuvwxyz 1234567890":
+                if letter == " ":
+                    letter = "space"
+                filename = f"{str(op_path)}/{letter}.wav"
+                if Path(filename).is_file():
+                    logger.debug("Voicing: %s", filename)
+                    self.voicings.append(filename)

{not1mm-24.4.30.dist-info → not1mm-24.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.30
+Version: 24.5.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -180,24 +180,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-4-30] Allowsending CW via rigctld if your radio supports it.
-- [24-4-27] Cleaned up dark mode code.
-- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
-- [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
-- [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
-- [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.
-- [24-4-15] checkwindow.py Tighter results. Changed the call selection to use a single click.
-- [24-4-9-4] Check for portaudio instead of crash boom. Removed empty dockwidget. Tested on Plasma 6.
-- [24-4-9-3] Ugh. It's not a real day unless you forget to test.
-- [24-4-9-2] Put back the floatable dock widgets, 'cause Wayland strikes again.
-- [24-4-9-1] Removed DockWidgetFloatable from the dock widgets since my wee brain can't figure out how to add a dragable window frame to them once they are floating. Added a minimum size for the VFO LCD digits. Defaulted bandmap window to the right.
-- [24-4-9] Fixed Checkwindow not showing calls from logged contacts.
-- [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.
-- [24-4-1] Removed some un-needed loops and widgets from the check window. Fixed docking to the left side.
+- [24-5-1] Moved the voice keying into it's own thread.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.4.30.dist-info → not1mm-24.5.1.dist-info}/RECORD

@@ -1,11 +1,12 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=B2BSFagNTFJ6jWChOEj41TAtsWZ4rXo59sDiKp4rie0,121264
+not1mm/__main__.py,sha256=Y-caHjEPyBoWQwEPcaXGB_dv-OGYcemu4v2N8n7mBes,120135
 not1mm/bandmap.py,sha256=DyAIgEfV_Ceg_BuBwvV3a2aRHTG3M63ZokoULS0wTdk,32071
 not1mm/checkwindow.py,sha256=PHQhyN-25ZugbxKKjSxs0wqD80GTHYdIs1IIBjCGVc8,10278
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=MpEVvnuQh9P5Z8kK2MozAaMCNSx1C4isAEYCETI7SjI,44285
 not1mm/radio.py,sha256=R_RaxdiqcMzIQN2za7qBsStrT5X0AwZcz8xtiCwsYdE,3097
 not1mm/vfo.py,sha256=7CMI0h9jCEhaonOIvN_7wSiEnsSSxsB1IvOYC9bML6w,11889
+not1mm/voice_keying.py,sha256=JBesl98FKjW57E84UMFRsa9roUIVOTmA6D1RB-wB6A0,3028
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=1vQRvEZ865brfmmajp-Lj-hgWejVGI992q8o971bUV8,366478
 not1mm/data/about.ui,sha256=7TqvtXFFm0Rmcu0bmLupwpO1CsK8MekfZ09_xn6kZrQ,2067
@@ -106,7 +107,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=zA20U-5Ca6bsgBYAJw2MX5JgzAAvPdJ2B59giQAav24,48
+not1mm/lib/version.py,sha256=X6y94UOK3VvJjiS_mmZqSRNwFVaWCYBQqbO-fuTep4Q,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
@@ -140,9 +141,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.30.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.4.30.dist-info/METADATA,sha256=KBVE9BJ01q8RlE8BBesdoAtBiMt5m0z_tnkQnNGyZAY,28897
-not1mm-24.4.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.4.30.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.4.30.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.4.30.dist-info/RECORD,,
+not1mm-24.5.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.5.1.dist-info/METADATA,sha256=h9kkaE9SwKUVJZbzLDhtE2JuYrk0c3DeFwU_l_c9JZs,27103
+not1mm-24.5.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.5.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.5.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.5.1.dist-info/RECORD,,