not1mm 24.10.8__tar.gz → 24.10.11__tar.gz

{not1mm-24.10.8 → not1mm-24.10.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.8
+Version: 24.10.11
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -118,6 +118,16 @@ Requires-Dist: Levenshtein
   - [Cabrillo](#cabrillo)
   - [ADIF](#adif)
   - [Recalulate Mults](#recalulate-mults)
+  - [Testing Out ESM Currently only in CQ WW](#testing-out-esm-currently-only-in-cq-ww)
+    - [Run States](#run-states)
+      - [CQ](#cq)
+      - [Call Entered send His Call and the Exchange](#call-entered-send-his-call-and-the-exchange)
+      - [Empty exchange field send AGN till you get it](#empty-exchange-field-send-agn-till-you-get-it)
+      - [Exchange field filled, send TU QRZ and logs it](#exchange-field-filled-send-tu-qrz-and-logs-it)
+    - [S\&P States](#sp-states)
+      - [With his call entered, Send your call](#with-his-call-entered-send-your-call)
+      - [If no exchange entered send AGN](#if-no-exchange-entered-send-agn)
+      - [With exchange entered, send your exchange and log it](#with-exchange-entered-send-your-exchange-and-log-it)
   - [Contest specific notes](#contest-specific-notes)
     - [ARRL Sweekstakes](#arrl-sweekstakes)
       - [The exchange parser](#the-exchange-parser)
@@ -219,6 +229,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-11] added ESM to CQWW SSB and RTTY.
+- [24-10-10] Add ESM to CQ WW CW to test it out.
 - [24-10-8] Fix crash on Tune to spot. Change placeholder text for the CW port for those unable to read documentation.
 - [24-10-6] Removed 60, 30, 17 and 12M from the default list of bands.
 - [24-10-5-1] Store the bandmap spots age timer in the preferences.
@@ -828,6 +840,53 @@ After editing a contact and before generating a Cabrillo file. There is a Misc
 menu option that will recalculate the multipliers incase an edit had caused a
 change.
 
+## Testing Out ESM Currently only in CQ WW
+
+I caved and started working on ESM or Enter Sends Message. Currently it is only
+working in the CQ WW. To test it out you can go to `FILE -> Configuration Settings`
+
+![Config Screen](https://github.com/mbridak/not1mm/raw/master/pic/esm_config.png)
+
+Check the mark to Enable ESM and tell it which function keys do what. The keys will need
+to have the same function in both Run and S&P modes. The function keys will highlight
+green depending on the state of the input fields. The green keys will be sent if you
+press the Enter key. You should use the Space bar to move to another field.
+
+The contact will be automatically logged once all the needed info is collected and the
+QRZ (for Run) or Exchange (for S&P) is sent.
+
+### Run States
+
+#### CQ
+
+![CQ](https://github.com/mbridak/not1mm/raw/master/pic/esm_cq.png)
+
+#### Call Entered send His Call and the Exchange
+
+![Call Entered send His Call and the Exchange.](https://github.com/mbridak/not1mm/raw/master/pic/esm_withcall.png)
+
+#### Empty exchange field send AGN till you get it
+
+![Empty exchange field send AGN till you get it](https://github.com/mbridak/not1mm/raw/master/pic/esm_empty_exchange.png)
+
+#### Exchange field filled, send TU QRZ and logs it
+
+![Exchange field filled, send TU QRZ and logs it](https://github.com/mbridak/not1mm/raw/master/pic/esm_qrz.png)
+
+### S&P States
+
+#### With his call entered, Send your call
+
+![With his call entered, Send your call](https://github.com/mbridak/not1mm/raw/master/pic/esm_sp_call.png)
+
+#### If no exchange entered send AGN
+
+![If no exchange entered send AGN](https://github.com/mbridak/not1mm/raw/master/pic/esm_sp_agn.png)
+
+#### With exchange entered, send your exchange and log it
+
+![With exchange entered, send your exchange and log it](https://github.com/mbridak/not1mm/raw/master/pic/esm_sp_logit.png)
+
 ## Contest specific notes
 
 I found it might be beneficial to have a section devoted to wierd quirky things
@@ -869,4 +928,4 @@ The best thing you can do is play around with it to see how it behaves.
 In the `Sent Exchange` field of the New Contest dialog put in the Precidence,
 Call, Check and Section. Example: `A K6GTE 17 ORG`.
 
-For the Run Exchange macro I'd put `{HISCALL} # A K6GTE 17 ORG`.
+For the Run Exchange macro I'd put `{HISCALL} {SENTNR} {EXCH}`.

{not1mm-24.10.8 → not1mm-24.10.11}/README.md

@@ -87,6 +87,16 @@
   - [Cabrillo](#cabrillo)
   - [ADIF](#adif)
   - [Recalulate Mults](#recalulate-mults)
+  - [Testing Out ESM Currently only in CQ WW](#testing-out-esm-currently-only-in-cq-ww)
+    - [Run States](#run-states)
+      - [CQ](#cq)
+      - [Call Entered send His Call and the Exchange](#call-entered-send-his-call-and-the-exchange)
+      - [Empty exchange field send AGN till you get it](#empty-exchange-field-send-agn-till-you-get-it)
+      - [Exchange field filled, send TU QRZ and logs it](#exchange-field-filled-send-tu-qrz-and-logs-it)
+    - [S\&P States](#sp-states)
+      - [With his call entered, Send your call](#with-his-call-entered-send-your-call)
+      - [If no exchange entered send AGN](#if-no-exchange-entered-send-agn)
+      - [With exchange entered, send your exchange and log it](#with-exchange-entered-send-your-exchange-and-log-it)
   - [Contest specific notes](#contest-specific-notes)
     - [ARRL Sweekstakes](#arrl-sweekstakes)
       - [The exchange parser](#the-exchange-parser)
@@ -188,6 +198,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-11] added ESM to CQWW SSB and RTTY.
+- [24-10-10] Add ESM to CQ WW CW to test it out.
 - [24-10-8] Fix crash on Tune to spot. Change placeholder text for the CW port for those unable to read documentation.
 - [24-10-6] Removed 60, 30, 17 and 12M from the default list of bands.
 - [24-10-5-1] Store the bandmap spots age timer in the preferences.
@@ -797,6 +809,53 @@ After editing a contact and before generating a Cabrillo file. There is a Misc
 menu option that will recalculate the multipliers incase an edit had caused a
 change.
 
+## Testing Out ESM Currently only in CQ WW
+
+I caved and started working on ESM or Enter Sends Message. Currently it is only
+working in the CQ WW. To test it out you can go to `FILE -> Configuration Settings`
+
+![Config Screen](https://github.com/mbridak/not1mm/raw/master/pic/esm_config.png)
+
+Check the mark to Enable ESM and tell it which function keys do what. The keys will need
+to have the same function in both Run and S&P modes. The function keys will highlight
+green depending on the state of the input fields. The green keys will be sent if you
+press the Enter key. You should use the Space bar to move to another field.
+
+The contact will be automatically logged once all the needed info is collected and the
+QRZ (for Run) or Exchange (for S&P) is sent.
+
+### Run States
+
+#### CQ
+
+![CQ](https://github.com/mbridak/not1mm/raw/master/pic/esm_cq.png)
+
+#### Call Entered send His Call and the Exchange
+
+![Call Entered send His Call and the Exchange.](https://github.com/mbridak/not1mm/raw/master/pic/esm_withcall.png)
+
+#### Empty exchange field send AGN till you get it
+
+![Empty exchange field send AGN till you get it](https://github.com/mbridak/not1mm/raw/master/pic/esm_empty_exchange.png)
+
+#### Exchange field filled, send TU QRZ and logs it
+
+![Exchange field filled, send TU QRZ and logs it](https://github.com/mbridak/not1mm/raw/master/pic/esm_qrz.png)
+
+### S&P States
+
+#### With his call entered, Send your call
+
+![With his call entered, Send your call](https://github.com/mbridak/not1mm/raw/master/pic/esm_sp_call.png)
+
+#### If no exchange entered send AGN
+
+![If no exchange entered send AGN](https://github.com/mbridak/not1mm/raw/master/pic/esm_sp_agn.png)
+
+#### With exchange entered, send your exchange and log it
+
+![With exchange entered, send your exchange and log it](https://github.com/mbridak/not1mm/raw/master/pic/esm_sp_logit.png)
+
 ## Contest specific notes
 
 I found it might be beneficial to have a section devoted to wierd quirky things
@@ -838,4 +897,4 @@ The best thing you can do is play around with it to see how it behaves.
 In the `Sent Exchange` field of the New Contest dialog put in the Precidence,
 Call, Check and Section. Example: `A K6GTE 17 ORG`.
 
-For the Run Exchange macro I'd put `{HISCALL} # A K6GTE 17 ORG`.
+For the Run Exchange macro I'd put `{HISCALL} {SENTNR} {EXCH}`.

{not1mm-24.10.8 → not1mm-24.10.11}/not1mm/__main__.py

@@ -37,7 +37,7 @@ except OSError as exception:
 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
+from PyQt6.QtWidgets import QFileDialog, QSplashScreen, QApplication
 
 from not1mm.lib.about import About
 from not1mm.lib.cwinterface import CW
@@ -162,6 +162,8 @@ class MainWindow(QtWidgets.QMainWindow):
     oldtext = ""
     text_color = QColorConstants.Black
     current_palette = None
+    use_esm = False
+    esm_dict = {}
 
     radio_thread = QThread()
     voice_thread = QThread()
@@ -176,6 +178,8 @@ class MainWindow(QtWidgets.QMainWindow):
     lookup_service = None
     fldigi_util = None
 
+    current_widget = None
+
     def __init__(self, splash):
         super().__init__()
         logger.info("MainWindow: __init__")
@@ -194,6 +198,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.setCorner(Qt.Corner.TopLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         self.setCorner(Qt.Corner.BottomLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         uic.loadUi(fsutils.APP_DATA_PATH / "main.ui", self)
+        QApplication.instance().focusObjectChanged.connect(self.on_focus_changed)
         self.cw_entry.hide()
         self.leftdot.hide()
         self.rightdot.hide()
@@ -246,13 +251,18 @@ class MainWindow(QtWidgets.QMainWindow):
         self.radioButton_sp.clicked.connect(self.run_sp_buttons_clicked)
         self.score.setText("0")
         self.callsign.textEdited.connect(self.callsign_changed)
-        self.callsign.returnPressed.connect(self.save_contact)
-        self.sent.returnPressed.connect(self.save_contact)
-        self.receive.returnPressed.connect(self.save_contact)
-        self.other_1.returnPressed.connect(self.save_contact)
+        self.callsign.returnPressed.connect(self.check_esm_with_enter)
+        self.callsign.cursorPositionChanged.connect(self.check_esm)
+        self.sent.returnPressed.connect(self.check_esm_with_enter)
+        self.sent.cursorPositionChanged.connect(self.check_esm)
+        self.receive.returnPressed.connect(self.check_esm_with_enter)
+        self.receive.cursorPositionChanged.connect(self.check_esm)
+        self.other_1.returnPressed.connect(self.check_esm_with_enter)
         self.other_1.textEdited.connect(self.other_1_changed)
-        self.other_2.returnPressed.connect(self.save_contact)
+        self.other_1.cursorPositionChanged.connect(self.check_esm)
+        self.other_2.returnPressed.connect(self.check_esm_with_enter)
         self.other_2.textEdited.connect(self.other_2_changed)
+        self.other_2.cursorPositionChanged.connect(self.check_esm)
 
         self.sent.setText("59")
         self.receive.setText("59")
@@ -651,6 +661,47 @@ class MainWindow(QtWidgets.QMainWindow):
                     "You can udate to the current version by using:\npip install -U not1mm"
                 )
 
+    def on_focus_changed(self, new):
+        """"""
+        if self.use_esm:
+            if hasattr(self.contest, "process_esm"):
+                self.contest.process_esm(self, new_focused_widget=new)
+
+    def make_button_green(self, the_button: QtWidgets.QPushButton) -> None:
+        """Turn the_button green."""
+        if the_button is not None:
+            pal = QPalette()
+            pal.isCopyOf(self.current_palette)
+            greenColor = QColor(0, 128, 0)
+            pal.setBrush(QPalette.ColorRole.Button, greenColor)
+            the_button.setPalette(pal)
+
+    def restore_button_color(self, the_button: QtWidgets.QPushButton) -> None:
+        """Restores the color of the button"""
+        the_button.setPalette(self.current_palette)
+
+    def check_esm_with_enter(self):
+        """Check for ESM, otherwise save contact."""
+        if self.use_esm:
+            if hasattr(self.contest, "process_esm"):
+                self.contest.process_esm(self, with_enter=True)
+            else:
+                self.save_contact()
+        else:
+            self.save_contact()
+
+    def check_esm(self):
+        """Check for ESM, otherwise save contact."""
+        if self.use_esm:
+            if hasattr(self.contest, "process_esm"):
+                self.contest.process_esm(self)
+            else:
+                ...
+                # self.save_contact()
+        else:
+            ...
+            # self.save_contact()
+
     def show_splash_msg(self, msg: str) -> None:
         """Show text message in the splash window."""
         self.splash.showMessage(
@@ -1719,7 +1770,6 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
-
         modifier = event.modifiers()
         if event.key() == Qt.Key.Key_K:
             self.toggle_cw_entry()
@@ -2027,7 +2077,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         logger.debug("saving contact")
         if self.contest is None:
-            self.show_message_box("You have no contest defined.")
+            self.show_message_box("You have no contest defined...")
             return
         if len(self.callsign.text()) < 3:
             return
@@ -2057,6 +2107,10 @@ class MainWindow(QtWidgets.QMainWindow):
                 float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
             )
             self.contact["Mode"] = self.radio_state.get("mode", "")
+        self.contact["Freq"] = round(float(self.radio_state.get("vfoa", 0.0)) / 1000, 2)
+        self.contact["QSXFreq"] = round(
+            float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
+        )
         self.contact["ContestName"] = self.contest.cabrillo_name
         self.contact["ContestNR"] = self.pref.get("contest", "0")
         self.contact["StationPrefix"] = self.station.get("Call", "")
@@ -2415,7 +2469,7 @@ class MainWindow(QtWidgets.QMainWindow):
             app.processEvents()
             self.rig_control.ptt_off()
 
-    def process_function_key(self, function_key) -> None:
+    def process_function_key(self, function_key, rttysendrx=True) -> None:
         """
         Called when a function key is clicked.
 
@@ -2445,7 +2499,10 @@ class MainWindow(QtWidgets.QMainWindow):
             "DIGI-U",
             "DIGI-L",
         ]:
-            self.fldigi_util.send_string(self.process_macro(function_key.toolTip()))
+            self.fldigi_util.send_string(
+                self.process_macro(function_key.toolTip()), rxafter=rttysendrx
+            )
+            return
         if self.cw:
             if self.pref.get("cwtype") == 3 and self.rig_control is not None:
                 self.rig_control.sendcw(self.process_macro(function_key.toolTip()))
@@ -2666,7 +2723,33 @@ class MainWindow(QtWidgets.QMainWindow):
             for band_to_show in self.pref.get("bands", []):
                 if band_to_show in _indicator:
                     _indicator[band_to_show].show()
-        # self.show_band_mode()
+
+        fkey_dict = {
+            "F1": self.F1,
+            "F2": self.F2,
+            "F3": self.F3,
+            "F4": self.F4,
+            "F5": self.F5,
+            "F6": self.F6,
+            "F7": self.F7,
+            "F8": self.F8,
+            "F9": self.F9,
+            "F10": self.F10,
+            "F11": self.F11,
+            "F12": self.F12,
+            "DISABLED": None,
+        }
+
+        self.use_esm = self.pref.get("use_esm", False)
+        self.esm_dict["CQ"] = fkey_dict.get(self.pref.get("esm_cq", "DISABLED"))
+        self.esm_dict["EXCH"] = fkey_dict.get(self.pref.get("esm_exch", "DISABLED"))
+        self.esm_dict["QRZ"] = fkey_dict.get(self.pref.get("esm_qrz", "DISABLED"))
+        self.esm_dict["AGN"] = fkey_dict.get(self.pref.get("esm_agn", "DISABLED"))
+        self.esm_dict["HISCALL"] = fkey_dict.get(
+            self.pref.get("esm_hiscall", "DISABLED")
+        )
+        self.esm_dict["MYCALL"] = fkey_dict.get(self.pref.get("esm_mycall", "DISABLED"))
+        self.esm_dict["QSOB4"] = fkey_dict.get(self.pref.get("esm_qsob4", "DISABLED"))
 
     def watch_udp(self) -> None:
         """