not1mm 25.5.22__py3-none-any.whl → 25.5.26__py3-none-any.whl

not1mm/data/configuration.ui

@@ -1091,7 +1091,7 @@
      </widget>
      <widget class="QWidget" name="group_tab">
       <property name="enabled">
-       <bool>false</bool>
+       <bool>true</bool>
       </property>
       <property name="font">
        <font>
@@ -1106,6 +1106,9 @@
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="0" column="0" colspan="2" alignment="Qt::AlignHCenter">
         <widget class="QCheckBox" name="connect_to_server">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1231,8 +1234,8 @@
        <string>N1MM</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_8">
-       <item row="1" column="5">
-        <widget class="QLabel" name="label_14">
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_18">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1241,12 +1244,15 @@
           </font>
          </property>
          <property name="text">
-          <string>Operator Name:</string>
+          <string>Lookup:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="1" column="6">
-        <widget class="QLineEdit" name="n1mm_operator">
+       <item row="1" column="1" colspan="3">
+        <widget class="QLineEdit" name="n1mm_station_name">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1255,41 +1261,43 @@
           </font>
          </property>
          <property name="accessibleName">
-          <string>operator name</string>
+          <string>station name</string>
          </property>
          <property name="accessibleDescription">
-          <string>n 1 m m operator name</string>
+          <string>n 1 m m station name</string>
          </property>
          <property name="placeholderText">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="7" alignment="Qt::AlignHCenter">
-        <widget class="QCheckBox" name="send_n1mm_packets">
-         <property name="font">
-          <font>
-           <family>JetBrains Mono</family>
-           <pointsize>12</pointsize>
-           <strikeout>false</strikeout>
-          </font>
+       <item row="7" column="1">
+        <widget class="QCheckBox" name="send_n1mm_score">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>23</width>
+           <height>16777215</height>
+          </size>
          </property>
          <property name="accessibleName">
-          <string>send n 1 m m packets.</string>
+          <string>send score packets</string>
          </property>
          <property name="accessibleDescription">
-          <string>send n 1 m m packets</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true"/>
+          <string>send n 1 m m score packets.</string>
          </property>
          <property name="text">
-          <string>Send N1MM packets</string>
+          <string/>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_13">
+       <item row="1" column="4">
+        <widget class="QLabel" name="label_14">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1298,12 +1306,12 @@
           </font>
          </property>
          <property name="text">
-          <string>Station Name:</string>
+          <string>Operator Name:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="4">
-        <widget class="QLineEdit" name="n1mm_station_name">
+       <item row="0" column="0" colspan="6" alignment="Qt::AlignHCenter">
+        <widget class="QCheckBox" name="send_n1mm_packets">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1312,18 +1320,21 @@
           </font>
          </property>
          <property name="accessibleName">
-          <string>station name</string>
+          <string>send n 1 m m packets.</string>
          </property>
          <property name="accessibleDescription">
-          <string>n 1 m m station name</string>
+          <string>send n 1 m m packets</string>
          </property>
-         <property name="placeholderText">
-          <string/>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="text">
+          <string>Send N1MM packets</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_16">
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_19">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1332,15 +1343,15 @@
           </font>
          </property>
          <property name="text">
-          <string>Radio:</string>
+          <string>Score:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_17">
+       <item row="7" column="2" colspan="4">
+        <widget class="QLineEdit" name="n1mm_scoreport">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1348,16 +1359,25 @@
            <strikeout>false</strikeout>
           </font>
          </property>
+         <property name="accessibleName">
+          <string>score packet address and port</string>
+         </property>
+         <property name="accessibleDescription">
+          <string>score packet address and port</string>
+         </property>
+         <property name="inputMethodHints">
+          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         </property>
          <property name="text">
-          <string>Contact:</string>
+          <string/>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <property name="placeholderText">
+          <string/>
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="label_18">
+       <item row="6" column="2" colspan="4">
+        <widget class="QLineEdit" name="n1mm_lookupport">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1365,16 +1385,25 @@
            <strikeout>false</strikeout>
           </font>
          </property>
+         <property name="accessibleName">
+          <string>lookup packet address and port</string>
+         </property>
+         <property name="accessibleDescription">
+          <string>lookup packet address and port</string>
+         </property>
+         <property name="inputMethodHints">
+          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         </property>
          <property name="text">
-          <string>Lookup:</string>
+          <string/>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <property name="placeholderText">
+          <string/>
          </property>
         </widget>
        </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="label_19">
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_16">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1383,47 +1412,29 @@
           </font>
          </property>
          <property name="text">
-          <string>Score:</string>
+          <string>Radio:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QCheckBox" name="send_n1mm_radio">
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="accessibleName">
-          <string>send radio packets</string>
-         </property>
-         <property name="accessibleDescription">
-          <string>send n 1 m m radio packets.</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QCheckBox" name="send_n1mm_contact">
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>16777215</height>
-          </size>
+       <item row="1" column="5">
+        <widget class="QLineEdit" name="n1mm_operator">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <strikeout>false</strikeout>
+          </font>
          </property>
          <property name="accessibleName">
-          <string>send contact packets</string>
+          <string>operator name</string>
          </property>
          <property name="accessibleDescription">
-          <string>send n 1 m m contact packets.</string>
+          <string>n 1 m m operator name</string>
          </property>
-         <property name="text">
+         <property name="placeholderText">
           <string/>
          </property>
         </widget>
@@ -1447,33 +1458,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
-        <widget class="QCheckBox" name="send_n1mm_score">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>23</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="accessibleName">
-          <string>send score packets</string>
-         </property>
-         <property name="accessibleDescription">
-          <string>send n 1 m m score packets.</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2" colspan="5">
-        <widget class="QLineEdit" name="n1mm_radioport">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_13">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1481,20 +1467,8 @@
            <strikeout>false</strikeout>
           </font>
          </property>
-         <property name="accessibleName">
-          <string>radio packet address and port</string>
-         </property>
-         <property name="accessibleDescription">
-          <string>radio packet address and port</string>
-         </property>
-         <property name="inputMethodHints">
-          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
-         </property>
          <property name="text">
-          <string/>
-         </property>
-         <property name="placeholderText">
-          <string/>
+          <string>Station Name:</string>
          </property>
         </widget>
        </item>
@@ -1508,24 +1482,18 @@
           </font>
          </property>
          <property name="accessibleName">
-          <string>contact packet address and port</string>
+          <string>send radio packets</string>
          </property>
          <property name="accessibleDescription">
-          <string>contact packet address and port</string>
-         </property>
-         <property name="inputMethodHints">
-          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+          <string>send n 1 m m radio packets.</string>
          </property>
          <property name="text">
           <string/>
          </property>
-         <property name="placeholderText">
-          <string/>
-         </property>
         </widget>
        </item>
-       <item row="6" column="2" colspan="5">
-        <widget class="QLineEdit" name="n1mm_lookupport">
+       <item row="2" column="2" colspan="4">
+        <widget class="QLineEdit" name="n1mm_radioport">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1534,10 +1502,10 @@
           </font>
          </property>
          <property name="accessibleName">
-          <string>lookup packet address and port</string>
+          <string>radio packet address and port</string>
          </property>
          <property name="accessibleDescription">
-          <string>lookup packet address and port</string>
+          <string>radio packet address and port</string>
          </property>
          <property name="inputMethodHints">
           <set>Qt::InputMethodHint::ImhDigitsOnly</set>
@@ -1550,8 +1518,8 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="2" colspan="5">
-        <widget class="QLineEdit" name="n1mm_scoreport">
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_17">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1559,19 +1527,24 @@
            <strikeout>false</strikeout>
           </font>
          </property>
-         <property name="accessibleName">
-          <string>score packet address and port</string>
-         </property>
-         <property name="accessibleDescription">
-          <string>score packet address and port</string>
+         <property name="text">
+          <string>Contact:</string>
          </property>
-         <property name="inputMethodHints">
-          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="send_n1mm_radio">
          <property name="text">
           <string/>
          </property>
-         <property name="placeholderText">
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QCheckBox" name="send_n1mm_contact">
+         <property name="text">
           <string/>
          </property>
         </widget>
@@ -2475,10 +2448,8 @@
   <tabstop>multicast_port</tabstop>
   <tabstop>interface_ip</tabstop>
   <tabstop>n1mm_station_name</tabstop>
-  <tabstop>n1mm_operator</tabstop>
   <tabstop>send_n1mm_packets</tabstop>
   <tabstop>n1mm_radioport</tabstop>
-  <tabstop>n1mm_contactport</tabstop>
   <tabstop>n1mm_lookupport</tabstop>
   <tabstop>n1mm_scoreport</tabstop>
  </tabstops>

not1mm/data/main.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>855</width>
-    <height>641</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -1055,6 +1055,19 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QLabel" name="server_icon">
+              <property name="font">
+               <font>
+                <family>JetBrains Mono ExtraLight</family>
+                <pointsize>11</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
             <item>
              <widget class="QLabel" name="dupe_indicator">
               <property name="enabled">
@@ -1493,7 +1506,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>855</width>
+     <width>800</width>
      <height>25</height>
     </rect>
    </property>

not1mm/data/new_contest.ui

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

not1mm/lib/cat_interface.py

@@ -208,7 +208,7 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(bytes(f"\\stop_morse", "utf-8"))
+                self.rigctrlsocket.send(bytes("\\stop_morse", "utf-8"))
                 _ = self.__get_serial_string()
                 return True
             except socket.error as exception:
@@ -332,7 +332,7 @@ class CAT:
                 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:
+            except (socket.error, IndexError) as exception:
                 self.online = False
                 logger.debug(f"{exception=}")
                 self.rigctrlsocket = None

not1mm/lib/database.py

@@ -484,7 +484,7 @@ class DataBase:
                 return cursor.fetchall()
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
-            return ()
+            return []
 
     def log_contact(self, contact: dict) -> None:
         """
@@ -543,6 +543,18 @@ class DataBase:
             except sqlite3.Error as exception:
                 logger.info("DataBase delete_contact: %s", exception)
 
+    def clear_dirty_flag(self, unique_id) -> None:
+        """Clears the dirty flag."""
+        if unique_id:
+            try:
+                with sqlite3.connect(self.database) as conn:
+                    sql = f"update dxlog set dirty=0 where ID='{unique_id}';"
+                    cursor = conn.cursor()
+                    cursor.execute(sql)
+                    conn.commit()
+            except sqlite3.Error as exception:
+                logger.critical("%s", exception)
+
     def delete_callhistory(self) -> None:
         """Deletes all info from callhistory table."""
         try:
@@ -580,6 +592,20 @@ class DataBase:
             logger.debug("%s", exception)
             return ()
 
+    def fetch_all_dirty_contacts(self) -> list:
+        """returns a list of dicts of contacts with dirty flag set in the database."""
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select * from dxlog where ContestNR = {self.current_contest} and dirty = 1;"
+                )
+                return cursor.fetchall()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return ()
+
     def fetch_all_contacts_desc(self) -> list:
         """returns a list of dicts with contacts in the database."""
         try:
@@ -592,6 +618,7 @@ class DataBase:
                 return cursor.fetchall()
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
+            return []
 
     def fetch_last_contact(self) -> dict:
         """returns a list of dicts with last contact in the database."""
@@ -1088,6 +1115,20 @@ class DataBase:
             logger.debug("%s", exception)
             return {}
 
+    def get_last_serial(self) -> dict:
+        """Return next serial number"""
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select max(SentNR) as serial_nr from DXLOG where ContestNR = {self.current_contest};"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
     def get_empty(self) -> dict:
         """Return a dictionary object with keys and no values."""
         return self.empty_contact
@@ -1216,7 +1257,7 @@ class DataBase:
                 return cursor.fetchall()
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
-            return ()
+            return []
 
     def check_dupe_on_period_1_mode(
         self, call, band, mode, contest_start_time, contest_time_period_1

not1mm/lib/settings.py

@@ -5,7 +5,7 @@ from PyQt6 import QtWidgets, uic
 
 try:
     import sounddevice as sd
-except OSError as exception:
+except OSError:
     sd = None
 
 
@@ -17,7 +17,7 @@ class Settings(QtWidgets.QDialog):
         super().__init__(parent)
         self.logger = logging.getLogger("settings")
         uic.loadUi(app_data_path / "configuration.ui", self)
-        self.tabWidget.setTabVisible(5, False)
+        # self.tabWidget.setTabVisible(5, False)
         # self.group_tab.hide()
         self.buttonBox.accepted.connect(self.save_changes)
         self.usecwdaemon_radioButton.clicked.connect(self.set_cwdaemon_port_hint)
@@ -54,6 +54,8 @@ class Settings(QtWidgets.QDialog):
 
         self.auto_cq_delay.setText(str(self.preference.get("auto_cq_interval", "15")))
 
+        self.connect_to_server.setChecked(bool(self.preference.get("useserver", False)))
+
         self.use_call_history.setChecked(
             bool(self.preference.get("use_call_history", False))
         )
@@ -143,7 +145,7 @@ class Settings(QtWidgets.QDialog):
             str(self.preference.get("cwpaddinglength", "3"))
         )
 
-        self.connect_to_server.setChecked(bool(self.preference.get("useserver")))
+        self.connect_to_server.setChecked(bool(self.preference.get("useserver", False)))
         self.multicast_group.setText(str(self.preference.get("multicast_group", "")))
         self.multicast_port.setText(str(self.preference.get("multicast_port", "")))
         self.interface_ip.setText(str(self.preference.get("interface_ip", "")))
@@ -218,6 +220,7 @@ class Settings(QtWidgets.QDialog):
         """
         Write preferences to json file.
         """
+        self.preference["useserver"] = self.connect_to_server.isChecked()
         self.preference["send_rtc_scores"] = self.send_rtc_scores.isChecked()
         self.preference["rtc_url"] = self.rtc_url.currentText()
         self.preference["rtc_user"] = self.rtc_user.text()

not1mm/lib/version.py

@@ -1,3 +1,4 @@
 """It's the version"""
 
-__version__ = "25.5.22"
+__version__ = "25.5.26"
+