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

not1mm/__main__.py

@@ -256,7 +256,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionNew_Database.triggered.connect(self.new_database)
         self.actionOpen_Database.triggered.connect(self.open_database)
 
-        self.actionEdit_Macros.triggered.connect(self.edit_cw_macros)
+        self.actionEdit_Macros.triggered.connect(self.edit_macros)
 
         self.actionAbout.triggered.connect(self.show_about_dialog)
         self.actionHotKeys.triggered.connect(self.show_key_help)
@@ -659,7 +659,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Loading contest.")
         self.load_contest()
         self.show_splash_msg("Reading macros.")
-        self.read_cw_macros()
+        self.read_macros()
 
         self.show_splash_msg("Starting FlDigi watcher.")
         self.fldigi_watcher = FlDigiWatcher()
@@ -1627,6 +1627,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     cmd["COLUMNS"] = self.contest.columns
                     if self.log_window:
                         self.log_window.msg_from_main(cmd)
+            self.read_macros()
 
     def check_for_new_cty(self) -> None:
         """
@@ -1730,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"
@@ -1750,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:
@@ -2086,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:
@@ -2804,7 +2805,7 @@ class MainWindow(QtWidgets.QMainWindow):
         """
         self.pref["run_state"] = self.radioButton_run.isChecked()
         self.write_preference()
-        self.read_cw_macros()
+        self.read_macros()
         self.check_esm()
 
     def write_preference(self) -> None:
@@ -2919,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)
@@ -2935,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)
@@ -2946,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)
@@ -3351,7 +3355,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
             return
         if mode in (
             "DIGI-U",
@@ -3372,7 +3376,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
             return
         if mode == "SSB":
             if intended_freq:
@@ -3393,7 +3397,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
 
     def check_callsign(self, callsign) -> None:
         """
@@ -3480,7 +3484,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.current_mode = "CW"
                 self.sent.setText("599")
                 self.receive.setText("599")
-                self.read_cw_macros()
+                self.read_macros()
                 if self.contest:
                     if self.contest.name == "ICWC Medium Speed Test":
                         self.contest.prefill(self)
@@ -3490,14 +3494,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.current_mode = "SSB"
                 self.sent.setText("59")
                 self.receive.setText("59")
-                self.read_cw_macros()
+                self.read_macros()
             return
         if mode in ("RTTY", "DIGI-U", "DIGI-L"):
             if self.current_mode != "RTTY":
                 self.current_mode = "RTTY"
                 self.sent.setText("599")
                 self.receive.setText("599")
-                self.read_cw_macros()
+                self.read_macros()
 
     def get_opon(self) -> None:
         """
@@ -3542,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:
         """
@@ -3664,18 +3669,13 @@ class MainWindow(QtWidgets.QMainWindow):
             except TypeError as err:
                 logger.debug(f"{err=} {vfo=} {the_dict=}")
 
-    def edit_cw_macros(self) -> None:
-        """
-        Calls the default text editor to edit the CW macro file.
-
-        Parameters
-        ----------
-        None
-
-        Returns
-        -------
-        None
-        """
+    def get_macro_filename(self):
+        """"""
+        # Have not1mm check in USER_DATA_PATH for the existence of a folder with the contests name.
+        # If it exists, check to see if a cw/ssb/rtty macro files exists within it and load them before
+        # falling back to the default ones.
+        # If user selects menu option to edit the current macro file, make the previous checks, if the
+        # specific one does not exist, copy the default to the contest directory and edit that copy.
         if self.radio_state.get("mode") in ("CW", "CW-L", "CW-R", "CWR"):
             macro_file = "cwmacros.txt"
         elif self.radio_state.get("mode") in (
@@ -3695,8 +3695,14 @@ class MainWindow(QtWidgets.QMainWindow):
             macro_file = "rttymacros.txt"
         else:
             macro_file = "ssbmacros.txt"
+
+        try:
+            if not (fsutils.USER_DATA_PATH / self.contest.name).exists():
+                os.mkdir(fsutils.USER_DATA_PATH / self.contest.name)
+        except AttributeError:
+            return ""
+
         if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("copying default macro file.")
             try:
                 copyfile(
                     fsutils.APP_DATA_PATH / macro_file,
@@ -3704,57 +3710,50 @@ class MainWindow(QtWidgets.QMainWindow):
                 )
             except IOError as err:
                 logger.critical(f"Error {err} copying macro file.")
+
+        if not (fsutils.USER_DATA_PATH / self.contest.name / macro_file).exists():
+            try:
+                copyfile(
+                    fsutils.APP_DATA_PATH / macro_file,
+                    fsutils.USER_DATA_PATH / self.contest.name / macro_file,
+                )
+            except IOError as err:
+                logger.critical(f"Error {err} copying macro file.")
+
+        return fsutils.USER_DATA_PATH / self.contest.name / macro_file
+
+    def edit_macros(self) -> None:
+        """
+        Calls the default text editor to edit the CW macro file.
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        None
+        """
+
+        macro_file = self.get_macro_filename()
+
         try:
-            fsutils.openFileWithOS(fsutils.USER_DATA_PATH / macro_file)
+            fsutils.openFileWithOS(macro_file)
         except FileNotFoundError | PermissionError | OSError as err:
-            logger.critical(
-                f"Could not open file {fsutils.USER_DATA_PATH / macro_file} {err}"
-            )
-        self.read_cw_macros()
+            logger.critical(f"Could not open file {macro_file} {err}")
+        self.read_macros()
 
-    def read_cw_macros(self) -> None:
+    def read_macros(self) -> None:
         """
         Reads in the CW macros, firsts it checks to see if the file exists. If it does not,
         and this has been packaged with pyinstaller it will copy the default file from the
         temp directory this is running from... In theory.
         """
 
-        if self.radio_state.get("mode") in (
-            "CW",
-            "CW-L",
-            "CW-R",
-        ):
-            macro_file = "cwmacros.txt"
-        elif self.radio_state.get("mode") in (
-            "RTTY",
-            "RTTY-R",
-            "LSB-D",
-            "USB-D",
-            "AM-D",
-            "FM-D",
-            "DIGI-U",
-            "DIGI-L",
-            "RTTYR",
-            "PKTLSB",
-            "PKTUSB",
-        ):
-            macro_file = "rttymacros.txt"
-        else:
-            macro_file = "ssbmacros.txt"
+        macro_file = self.get_macro_filename()
 
-        if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("copying default macro file.")
-            try:
-                copyfile(
-                    fsutils.APP_DATA_PATH / macro_file,
-                    fsutils.USER_DATA_PATH / macro_file,
-                )
-            except IOError as err:
-                logger.critical(f"Error {err} copying macro file.")
         try:
-            with open(
-                fsutils.USER_DATA_PATH / macro_file, "r", encoding="utf-8"
-            ) as file_descriptor:
+            with open(macro_file, "r", encoding="utf-8") as file_descriptor:
                 for line in file_descriptor:
                     mode, fkey, buttonname, cwtext = line.split("|")
                     if mode.strip().upper() == "R" and self.pref.get("run_state"):

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/donors.html

@@ -1,4 +1,8 @@
 <p>
+<h4><center>To donate visit:</center></h4>
+<center>https://paypal.me/k6gte</center>
+</p>
+<p>
 <h2>
     <center>Donors</center>
 </h2>

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>