not1mm 24.7.13__tar.gz → 24.7.25__tar.gz

{not1mm-24.7.13 → not1mm-24.7.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.13
+Version: 24.7.25
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -223,6 +223,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [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.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.7.13 → not1mm-24.7.25}/README.md

@@ -191,6 +191,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [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.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.7.13 → not1mm-24.7.25}/not1mm/__main__.py

@@ -39,7 +39,7 @@ except OSError as exception:
     print("portaudio is not installed")
     sd = None
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
-from PyQt6.QtCore import QDir, Qt, QThread
+from PyQt6.QtCore import QDir, Qt, QThread, QSettings
 from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
 from PyQt6.QtWidgets import QFileDialog
 
@@ -120,10 +120,6 @@ class MainWindow(QtWidgets.QMainWindow):
         "cw_macros": True,
         "bands_modes": True,
         "bands": ["160", "80", "40", "20", "15", "10"],
-        "window_height": 200,
-        "window_width": 600,
-        "window_x": 120,
-        "window_y": 120,
         "current_database": "ham.db",
         "contest": "",
         "multicast_group": "239.1.1.1",
@@ -202,6 +198,14 @@ class MainWindow(QtWidgets.QMainWindow):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         logger.info("MainWindow: __init__")
+
+        self.dock_loc = {
+            "Top": Qt.DockWidgetArea.TopDockWidgetArea,
+            "Right": Qt.DockWidgetArea.RightDockWidgetArea,
+            "Left": Qt.DockWidgetArea.LeftDockWidgetArea,
+            "Bottom": Qt.DockWidgetArea.BottomDockWidgetArea,
+        }
+
         self.setCorner(Qt.Corner.TopRightCorner, Qt.DockWidgetArea.RightDockWidgetArea)
         self.setCorner(
             Qt.Corner.BottomRightCorner, Qt.DockWidgetArea.RightDockWidgetArea
@@ -219,6 +223,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.mscp = SCP(fsutils.APP_DATA_PATH)
         self.next_field = self.other_2
         self.dupe_indicator.hide()
+
         self.cw_speed.valueChanged.connect(self.cwspeed_spinbox_changed)
 
         self.cw_entry.textChanged.connect(self.handle_text_change)
@@ -516,38 +521,47 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.pref.get("contest"):
             self.load_contest()
         self.read_cw_macros()
+
+        self.log_window = LogWindow()
+        self.log_window.setObjectName("log-window")
+        self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
+        self.log_window.hide()
+
+        self.bandmap_window = BandMapWindow()
+        self.bandmap_window.setObjectName("bandmap-window")
+        self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
+        self.bandmap_window.hide()
+
+        self.check_window = CheckWindow()
+        self.check_window.setObjectName("check-window")
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
+        self.check_window.hide()
+
+        self.vfo_window = VfoWindow()
+        self.vfo_window.setObjectName("vfo-window")
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
+        self.vfo_window.hide()
+
+        self.settings = QSettings("K6GTE", "not1mm")
+        if self.settings.value("windowState") is not None:
+            self.restoreState(self.settings.value("windowState"))
+        if self.settings.value("geometry") is not None:
+            self.restoreGeometry(self.settings.value("geometry"))
+
         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.TopDockWidgetArea, 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.LeftDockWidgetArea, 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:
@@ -1424,47 +1438,37 @@ class MainWindow(QtWidgets.QMainWindow):
         """Launch the log window"""
         self.pref["logwindow"] = self.actionLog_Window.isChecked()
         self.write_preference()
-        if self.log_window:
-            self.log_window.close()
         if self.actionLog_Window.isChecked():
-            self.log_window = LogWindow()
-            self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
             self.log_window.show()
+        else:
+            self.log_window.hide()
 
     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()
         if self.actionBandmap.isChecked():
-            self.bandmap_window = BandMapWindow()
-            self.addDockWidget(
-                Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window
-            )
             self.bandmap_window.show()
+        else:
+            self.bandmap_window.hide()
 
     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()
         if self.actionCheck_Window.isChecked():
-            self.check_window = CheckWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
             self.check_window.show()
+        else:
+            self.check_window.hide()
 
     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()
         if self.actionVFO.isChecked():
-            self.vfo_window = VfoWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
             self.vfo_window.show()
+        else:
+            self.vfo_window.hide()
 
     def clear_band_indicators(self) -> None:
         """
@@ -1522,14 +1526,14 @@ class MainWindow(QtWidgets.QMainWindow):
         None
         """
 
+        self.settings.setValue("geometry", self.saveGeometry())
+        self.settings.setValue("windowState", self.saveState())
+        self.settings.sync()
+
         cmd = {}
         cmd["cmd"] = "HALT"
         cmd["station"] = platform.node()
         self.multicast_interface.send_as_json(cmd)
-        self.pref["window_width"] = self.size().width()
-        self.pref["window_height"] = self.size().height()
-        self.pref["window_x"] = self.pos().x()
-        self.pref["window_y"] = self.pos().y()
         self.write_preference()
 
     def cty_lookup(self, callsign: str) -> list:
@@ -3399,11 +3403,11 @@ app = QtWidgets.QApplication(sys.argv)
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
 window = MainWindow()
-height = window.pref.get("window_height", 300)
-width = window.pref.get("window_width", 700)
-x = window.pref.get("window_x", -1)
-y = window.pref.get("window_y", -1)
-window.setGeometry(x, y, width, height)
+# height = window.pref.get("window_height", 300)
+# width = window.pref.get("window_width", 700)
+# x = window.pref.get("window_x", -1)
+# y = window.pref.get("window_y", -1)
+# window.setGeometry(x, y, width, height)
 window.callsign.setFocus()
 window.show()
 # timer = QtCore.QTimer()

{not1mm-24.7.13 → not1mm-24.7.25}/not1mm/data/k6gte-not1mm.desktop

@@ -7,4 +7,4 @@ Exec=not1mm
 Icon=k6gte-not1mm
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=Qt;Utility;HamRadio;ContactManagement;Database;

{not1mm-24.7.13 → not1mm-24.7.25}/not1mm/data/main.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>878</width>
-    <height>465</height>
+    <width>768</width>
+    <height>265</height>
    </rect>
   </property>
   <property name="sizePolicy">

{not1mm-24.7.13 → not1mm-24.7.25}/not1mm/lib/cat_interface.py

@@ -2,6 +2,20 @@
 K6GTE, CAT interface abstraction
 Email: michael.bridak@gmail.com
 GPL V3
+
+rig.cwio_set_wpm          n:i  set cwio WPM
+rig.cwio_text             i:s  send text via cwio interface
+rig.cwio_send             n:i  cwio transmit 1/0 (on/off)
+command lines to test the CW API via XMLRPC
+
+Setting WPM
+curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_set_wpm</methodName><params><param><value><i4>28</i4></value></param></params></methodCall>" http://localhost:12345 
+
+Setting the text to send
+curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_text</methodName><params><param><value><string>test test test</string></value></param></params></methodCall>" http://localhost:12345
+
+Enable send
+curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_send</methodName><params><param><value><i4>1</i4></value></param></params></methodCall>" http://localhost:12345
 """
 
 import logging
@@ -94,7 +108,7 @@ class CAT:
         """..."""
         logger.debug(f"{texttosend=} {self.interface=}")
         if self.interface == "flrig":
-            ...
+            self.sendcwxmlrpc(texttosend)
             return
         if self.interface == "rigctld":
             self.sendcwrigctl(texttosend)
@@ -117,6 +131,23 @@ class CAT:
 
     def sendcwxmlrpc(self, texttosend):
         """..."""
+        print(f"{texttosend=}")
+        try:
+            self.online = True
+            self.server.rig.cwio_send(1)
+            self.server.rig.cwio_text(texttosend)
+            return
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
+        ) as exception:
+            self.online = False
+            print("sendcwxmlrpc: %s", f"{exception}")
+            # logger.debug("sendcwxmlrpc: %s", f"{exception}")
+        return False
 
     def get_vfo(self) -> str:
         """Poll the radio for current vfo using the interface"""
@@ -328,10 +359,13 @@ class CAT:
 
     def set_vfo(self, freq: str) -> bool:
         """Sets the radios vfo"""
-        if self.interface == "flrig":
-            return self.__setvfo_flrig(freq)
-        if self.interface == "rigctld":
-            return self.__setvfo_rigctld(freq)
+        try:
+            if self.interface == "flrig":
+                return self.__setvfo_flrig(freq)
+            if self.interface == "rigctld":
+                return self.__setvfo_rigctld(freq)
+        except ValueError:
+            ...
         return False
 
     def __setvfo_flrig(self, freq: str) -> bool:

{not1mm-24.7.13 → not1mm-24.7.25}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.7.13"
+__version__ = "24.7.25"

{not1mm-24.7.13 → not1mm-24.7.25}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.13
+Version: 24.7.25
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -223,6 +223,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [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.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.7.13 → not1mm-24.7.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.7.13"
+version = "24.7.25"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"