not1mm 24.11.24__py3-none-any.whl → 24.12.3.1__py3-none-any.whl

not1mm/__main__.py

@@ -1731,7 +1731,6 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         self.show_message_box(
-            "[Esc]\tClears the input fields of any text.\n"
             "[CTRL-Esc]\tStops cwdaemon from sending Morse.\n"
             "[PgUp]\tIncreases the cw sending speed.\n"
             "[PgDown]\tDecreases the cw sending speed.\n"
@@ -1751,6 +1750,7 @@ class MainWindow(QtWidgets.QMainWindow):
             "[CTRL-S]\tSpot Callsign to the cluster.\n"
             "[CTRL-SHIFT-K] Open CW text input field.\n"
             "[CTRL-=]\tLog the contact without sending the ESM macros.\n"
+            "[CTRL-W]\tClears the input fields of any text.\n"
         )
 
     def filepicker(self, action: str) -> str:
@@ -2087,14 +2087,14 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.bandmap_window.msg_from_main(cmd)
             return
         if (
-            event.key() == Qt.Key.Key_Escape
-            and modifier != Qt.KeyboardModifier.ControlModifier
+            event.key() == Qt.Key.Key_W
+            and modifier == Qt.KeyboardModifier.ControlModifier
         ):  # pylint: disable=no-member
             self.clearinputs()
             return
         if (
             event.key() == Qt.Key.Key_Escape
-            and modifier == Qt.KeyboardModifier.ControlModifier
+            and modifier != Qt.KeyboardModifier.ControlModifier
         ):
             if self.cw is not None:
                 if self.cw.servertype == 1:
@@ -2920,6 +2920,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 12345)),
             )
+            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
             self.rig_control.moveToThread(self.radio_thread)
             self.radio_thread.started.connect(self.rig_control.run)
             self.radio_thread.finished.connect(self.rig_control.deleteLater)
@@ -2936,6 +2937,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 4532)),
             )
+            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
             self.rig_control.moveToThread(self.radio_thread)
             self.radio_thread.started.connect(self.rig_control.run)
             self.radio_thread.finished.connect(self.rig_control.deleteLater)
@@ -2947,6 +2949,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 0000)),
             )
+            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
             self.rig_control.moveToThread(self.radio_thread)
             self.radio_thread.started.connect(self.rig_control.run)
             self.radio_thread.finished.connect(self.rig_control.deleteLater)
@@ -3543,6 +3546,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.opon_dialog.close()
         logger.debug("New Op: %s", self.current_op)
         self.make_op_dir()
+        self.set_window_title()
 
     def make_op_dir(self) -> None:
         """

not1mm/bandmap.py

@@ -311,6 +311,10 @@ class Database:
             (f"-{minutes} minutes",),
         )
 
+    def delete_marks(self) -> None:
+        """Delete marked spots."""
+        self.cursor.execute("delete from spots where ts > datetime('now');")
+
 
 class BandMapWindow(QDockWidget):
     """The BandMapWindow class."""
@@ -345,6 +349,7 @@ class BandMapWindow(QDockWidget):
         self.agetime = self.clear_spot_olderSpinBox.value()
         self.clear_spot_olderSpinBox.valueChanged.connect(self.spot_aging_changed)
         self.clearButton.clicked.connect(self.clear_spots)
+        self.clearmarkedButton.clicked.connect(self.clear_marked)
         self.zoominButton.clicked.connect(self.dec_zoom)
         self.zoomoutButton.clicked.connect(self.inc_zoom)
         self.connectButton.clicked.connect(self.connect)
@@ -873,6 +878,10 @@ class BandMapWindow(QDockWidget):
         """Delete all spots from the database."""
         self.spots.delete_spots(0)
 
+    def clear_marked(self) -> None:
+        """Delete all marked spots."""
+        self.spots.delete_marks()
+
     def spot_aging_changed(self) -> None:
         """Called when spot aging spinbox is changed."""
         self.agetime = self.clear_spot_olderSpinBox.value()

not1mm/data/bandmap.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>383</width>
+    <width>342</width>
     <height>700</height>
    </rect>
   </property>
@@ -97,7 +97,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>359</width>
+         <width>326</width>
          <height>512</height>
         </rect>
        </property>
@@ -148,18 +148,49 @@
          <enum>Qt::NoFocus</enum>
         </property>
         <property name="accessibleName">
-         <string>clear all</string>
+         <string>clear spots</string>
         </property>
         <property name="accessibleDescription">
          <string>clear spots</string>
         </property>
+        <property name="maximumSize">
+         <size>
+         <width>1110</width>
+          <height>27</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>🗑 Spots</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="clearmarkedButton">
+        <property name="minimumSize">
+         <size>
+          <width>110</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+         <width>1110</width>
+          <height>27</height>
+         </size>
+        </property>
         <property name="text">
-         <string>Clear All</string>
+         <string>🗑 Marked</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="zoominButton">
+        <property name="maximumSize">
+         <size>
+          <width>27</width>
+          <height>27</height>
+         </size>
+        </property>
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
@@ -170,12 +201,18 @@
          <string>zoom in</string>
         </property>
         <property name="text">
-         <string>Zoom In</string>
+         <string>➕</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="zoomoutButton">
+        <property name="maximumSize">
+         <size>
+          <width>27</width>
+          <height>27</height>
+         </size>
+        </property>
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
@@ -186,7 +223,7 @@
          <string>zoom out</string>
         </property>
         <property name="text">
-         <string>Zoom Out</string>
+         <string>➖</string>
         </property>
        </widget>
       </item>
@@ -205,12 +242,6 @@
       </property>
       <item>
        <widget class="QLabel" name="clear_spot_olderLabel">
-        <property name="font">
-         <font>
-          <family>JetBrains Mono ExtraLight</family>
-          <pointsize>11</pointsize>
-         </font>
-        </property>
         <property name="text">
          <string>Clear older than </string>
         </property>

not1mm/data/configuration.ui

@@ -377,6 +377,43 @@
        <string>CAT</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
+       <item row="1" column="3">
+        <widget class="QLineEdit" name="rigcontrolport_field">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <bold>false</bold>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="accessibleName">
+          <string>port number</string>
+         </property>
+         <property name="accessibleDescription">
+          <string>port number of rig control d or f l rig.</string>
+         </property>
+         <property name="inputMethodHints">
+          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         </property>
+         <property name="text">
+          <string>4532</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="4">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="1" column="1">
         <widget class="QLineEdit" name="rigcontrolip_field">
          <property name="font">
@@ -398,7 +435,38 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0" colspan="4">
+       <item row="3" column="1" colspan="3">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <bold>false</bold>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="text">
+          <string>Rig Control IP:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="4">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <property name="sizeConstraint">
           <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
@@ -513,50 +581,6 @@
          </item>
         </layout>
        </item>
-       <item row="2" column="1" colspan="3">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="font">
-          <font>
-           <family>JetBrains Mono ExtraLight</family>
-           <pointsize>12</pointsize>
-           <bold>false</bold>
-           <strikeout>false</strikeout>
-          </font>
-         </property>
-         <property name="text">
-          <string>Rig Control IP:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="1" column="2">
         <widget class="QLabel" name="label_7">
          <property name="font">
@@ -575,8 +599,8 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="4">
-        <spacer name="verticalSpacer_3">
+       <item row="0" column="2">
+        <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -588,30 +612,16 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="3">
-        <widget class="QLineEdit" name="rigcontrolport_field">
-         <property name="font">
-          <font>
-           <family>JetBrains Mono ExtraLight</family>
-           <pointsize>12</pointsize>
-           <bold>false</bold>
-           <strikeout>false</strikeout>
-          </font>
-         </property>
-         <property name="accessibleName">
-          <string>port number</string>
-         </property>
-         <property name="accessibleDescription">
-          <string>port number of rig control d or f l rig.</string>
-         </property>
-         <property name="inputMethodHints">
-          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
-         </property>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_27">
          <property name="text">
-          <string>4532</string>
+          <string>CAT Poll Interval (ms):</string>
          </property>
         </widget>
        </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="catpoll_field"/>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="cw_tab">

not1mm/data/new_contest.ui

@@ -217,6 +217,11 @@
        <string>ARRL 10M</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>ARRL 160M</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>ARRL DX CW</string>

not1mm/lib/cat_interface.py

@@ -284,8 +284,11 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"f\n")
-                return self.__get_serial_string().strip()
+                self.rigctrlsocket.send(b"|f\n")
+                report = self.__get_serial_string().strip()
+                if "get_freq:|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return seg_rpt[1].split(" ")[1]
             except socket.error as exception:
                 self.online = False
                 logger.debug(f"{exception=}")
@@ -334,11 +337,12 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"m\n")
-                mode = self.__get_serial_string()
-                mode = mode.strip().split()[0]
-                # logger.debug("%s", mode)
-                return mode
+                self.rigctrlsocket.send(b"|m\n")
+                # get_mode:|Mode: CW|Passband: 500|RPRT 0
+                report = self.__get_serial_string().strip()
+                if "getmode:|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return seg_rpt[1].split(" ")[1]
             except IndexError as exception:
                 logger.debug("%s", f"{exception}")
             except socket.error as exception:
@@ -382,11 +386,13 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"m\n")
-                mode = self.__get_serial_string()
-                mode = mode.strip().split()[1]
-                # logger.debug("%s", mode)
-                return mode
+                self.rigctrlsocket.send(b"|m\n")
+                # get_mode:|Mode: CW|Passband: 500|RPRT 0
+                report = self.__get_serial_string().strip()
+                if "getmode:|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return seg_rpt[2].split(" ")[1]
+
             except IndexError as exception:
                 logger.debug("%s", f"{exception}")
             except socket.error as exception:
@@ -425,8 +431,12 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"l RFPOWER\n")
-                return int(float(self.__get_serial_string().strip()) * 100)
+                self.rigctrlsocket.send(b"|l RFPOWER\n")
+                # get_level: RFPOWER|0.000000|RPRT 0
+                report = self.__get_serial_string().strip()
+                if "get_level: RFPOWER|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return int(float(seg_rpt[1]) * 100)
             except socket.error as exception:
                 self.online = False
                 logger.debug("getpower_rigctld: %s", f"{exception}")

not1mm/lib/database.py

@@ -695,6 +695,23 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
+    def fetch_exchange1_unique_count(self) -> dict:
+        """
+        Fetch count of unique countries
+        {exch1_count: count}
+        """
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select count(DISTINCT(Exchange1)) as exch1_count from dxlog where Exchange1 != '' and ContestNR = {self.current_contest};"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
     def fetch_arrldx_country_band_count(self) -> dict:
         """
         returns dict with count of unique NR.

not1mm/lib/settings.py

@@ -99,6 +99,7 @@ class Settings(QtWidgets.QDialog):
         )
         self.rigcontrolip_field.setText(str(self.preference.get("CAT_ip", "")))
         self.rigcontrolport_field.setText(str(self.preference.get("CAT_port", "")))
+        self.catpoll_field.setText(str(self.preference.get("CAT_polldelta", 500)))
         self.userigctld_radioButton.setChecked(bool(self.preference.get("userigctld")))
         self.useflrig_radioButton.setChecked(bool(self.preference.get("useflrig")))
 
@@ -215,6 +216,10 @@ class Settings(QtWidgets.QDialog):
             self.preference["CAT_port"] = int(self.rigcontrolport_field.text())
         except ValueError:
             ...
+        try:
+            self.preference["CAT_polldelta"] = int(self.catpoll_field.text())
+        except ValueError:
+            ...
         self.preference["userigctld"] = self.userigctld_radioButton.isChecked()
         self.preference["useflrig"] = self.useflrig_radioButton.isChecked()
         self.preference["cwip"] = self.cwip_field.text()

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.11.24"
+__version__ = "24.12.3.1"

not1mm/plugins/10_10_fall_cw.py

@@ -359,3 +359,94 @@ def cabrillo(self, file_encoding):
 
 def recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
+
+
+def process_esm(self, new_focused_widget=None, with_enter=False):
+    """ESM State Machine"""
+
+    # self.pref["run_state"]
+
+    # -----===== Assigned F-Keys =====-----
+    # self.esm_dict["CQ"]
+    # self.esm_dict["EXCH"]
+    # self.esm_dict["QRZ"]
+    # self.esm_dict["AGN"]
+    # self.esm_dict["HISCALL"]
+    # self.esm_dict["MYCALL"]
+    # self.esm_dict["QSOB4"]
+
+    # ----==== text fields ====----
+    # self.callsign
+    # self.sent
+    # self.receive
+    # self.other_1
+    # self.other_2
+
+    if new_focused_widget is not None:
+        self.current_widget = self.inputs_dict.get(new_focused_widget)
+
+    # print(f"checking esm {self.current_widget=} {with_enter=} {self.pref.get("run_state")=}")
+
+    for a_button in [
+        self.esm_dict["CQ"],
+        self.esm_dict["EXCH"],
+        self.esm_dict["QRZ"],
+        self.esm_dict["AGN"],
+        self.esm_dict["HISCALL"],
+        self.esm_dict["MYCALL"],
+        self.esm_dict["QSOB4"],
+    ]:
+        if a_button is not None:
+            self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["HISCALL"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+
+        elif self.current_widget in ["other_2"]:
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            else:
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)
+    else:
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget in ["other_2"]:
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            else:
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)