not1mm 25.5.25__py3-none-any.whl → 25.5.26.1__py3-none-any.whl

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/version.py

@@ -1,4 +1,3 @@
 """It's the version"""
 
-__version__ = "25.5.25"
-
+__version__ = "25.5.26.1"

not1mm/logwindow.py

@@ -900,12 +900,13 @@ class LogWindow(QDockWidget):
                 self.get_column("UUID"),
                 QtWidgets.QTableWidgetItem(str(log_item.get("ID", ""))),
             )
-        self.generalLog.blockSignals(False)
-        self.focusedLog.blockSignals(False)
+
         self.generalLog.resizeColumnsToContents()
         self.generalLog.resizeRowsToContents()
         self.focusedLog.resizeColumnsToContents()
         self.focusedLog.resizeRowsToContents()
+        self.generalLog.blockSignals(False)
+        self.focusedLog.blockSignals(False)
 
     def show_like_calls(self, call: str) -> None:
         """

not1mm/plugins/ari_dx.py

@@ -0,0 +1,689 @@
+"""ARI International DX Contest"""
+
+# pylint: disable=invalid-name, c-extension-no-member, unused-import, line-too-long
+# pyright: ignore[reportUndefinedVariable]
+# pylance: disable=reportUndefinedVariable
+# ruff: noqa: F821
+# ruff: noqa: F401
+
+# Status:	            Active
+# Geographic Focus:     Worldwide
+# Participation:        Worldwide
+# Awards:	            Worldwide
+# Mode:	                Phone, CW, RTTY
+# Bands:	            80, 40, 20, 15, 10m
+# Classes:	            Single Op (CW/SSB/RTTY/Mixed)(Low/High)
+#                       Single Op Overlays (Italian only): (Rookie/Youth)
+#                       Multi-Single
+#                       Multi-Multi
+#                       SWL
+# Max power:            HP: >100 watts
+#                       LP: 100 watts
+# Exchange:             I: RS(T) + 2-letter province
+#                       non-I: RS(T) + Serial No.
+# Work stations:        Once per mode per band
+# QSO Points:           0 points per QSO with same country
+#                       1 point per QSO with different country same continent
+#                       3 points per QSO with different continent
+#                       10 points per QSO with I/IS0/IT9 stations
+# Multipliers:          Each Italian province once per band
+#                       Each DXCC country once per band
+# Score Calculation:    Total score = total QSO points x total mults
+# E-mail logs to:       (none)
+# Upload log at:        https://www.ari.it/contest-hf/ari-international/log-upload.html
+# Mail logs to:         (none)
+# Find rules at:        https://www.ari.it/
+# Cabrillo name:	    ARI-DX
+
+
+import datetime
+import logging
+import platform
+
+from pathlib import Path
+
+from PyQt6 import QtWidgets
+
+from not1mm.lib.ham_utility import get_logged_band
+from not1mm.lib.plugin_common import gen_adif
+from not1mm.lib.version import __version__
+
+logger = logging.getLogger(__name__)
+
+EXCHANGE_HINT = "Prov or '#'"
+
+name = "ARI International DX"
+cabrillo_name = "ARI-DX"
+mode = "BOTH"  # CW SSB BOTH RTTY
+
+columns = [
+    "YYYY-MM-DD HH:MM:SS",
+    "Call",
+    "Freq",
+    "Mode",
+    "Snt",
+    "Rcv",
+    "SentNr",
+    "RcvNr",
+    "PTS",
+]
+
+advance_on_space = [True, True, True, True, True]
+
+# 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
+dupe_type = 3
+
+
+def init_contest(self):
+    """setup plugin"""
+    set_tab_next(self)
+    set_tab_prev(self)
+    interface(self)
+    self.next_field = self.other_2
+
+
+def interface(self):
+    """Setup user interface"""
+    self.field1.show()
+    self.field2.show()
+    self.field3.show()
+    self.field4.show()
+    self.snt_label.setText("SNT")
+    self.field1.setAccessibleName("RST Sent")
+    self.exch_label.setText("Prov or SN")
+    self.field4.setAccessibleName("Province or Serial Number")
+
+
+def reset_label(self):  # pylint: disable=unused-argument
+    """reset label after field cleared"""
+
+
+def set_tab_next(self):
+    """Set TAB Advances"""
+    self.tab_next = {
+        self.callsign: self.sent,
+        self.sent: self.receive,
+        self.receive: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
+    }
+
+
+def set_tab_prev(self):
+    """Set TAB Advances"""
+    self.tab_prev = {
+        self.callsign: self.other_2,
+        self.sent: self.callsign,
+        self.receive: self.sent,
+        self.other_1: self.receive,
+        self.other_2: self.other_1,
+    }
+
+
+def set_contact_vars(self):
+    """Contest Specific"""
+    self.contact["SNT"] = self.sent.text()
+    self.contact["RCV"] = self.receive.text()
+    self.contact["NR"] = self.other_2.text().upper()
+    self.contact["SentNr"] = self.other_1.text()
+
+
+def predupe(self):  # pylint: disable=unused-argument
+    """called after callsign entered"""
+
+
+def prefill(self):
+    """Fill sentnr"""
+    result = self.database.get_serial()
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
+    if serial_nr == "None":
+        serial_nr = "001"
+
+    exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
+    if len(self.other_1.text()) == 0:
+        self.other_1.setText(exchange)
+
+
+def points(self) -> int:
+    """Calc point"""
+
+    # QSO Points:           0 points per QSO with same country
+    #                       1 point per QSO with different country same continent
+    #                       3 points per QSO with different continent
+    #                       10 points per QSO with I/IS0/IT9 stations
+
+    if self.contact_is_dupe > 0:
+        return 0
+
+    result = self.cty_lookup(self.station.get("Call", ""))
+    if result:
+        for item in result.items():
+            mycountry = item[1].get("primary_pfx", "")
+            # myentity = item[1].get("entity", "")
+            mycontinent = item[1].get("continent", "")
+
+    result = self.cty_lookup(self.contact.get("Call", ""))
+
+    if result:
+        for item in result.items():
+            hiscountry = item[1].get("primary_pfx", "")
+            # hisentity = item[1].get("entity", "")
+            hiscontinent = item[1].get("continent", "")
+
+    _points = 0
+
+    if mycountry == hiscountry:
+        _points = 0
+    if mycountry != hiscountry and mycontinent == hiscontinent:
+        _points = 1
+    if mycontinent != hiscontinent:
+        _points = 3
+    if hiscountry in ("I", "IS0", "IT9"):
+        _points = 10
+
+    return _points
+
+
+def show_mults(self):
+    """Return display string for mults"""
+
+    # Multipliers:          Each Italian province once per band
+    #                       Each DXCC country once per band
+
+    _country = 0
+    _province = 0
+
+    sql = (
+        "select count(DISTINCT(NR || ':' || Band)) as mult_count from dxlog "
+        f"where ContestNR = {self.database.current_contest} and typeof(NR) = 'text';"
+    )
+    result = self.database.exec_sql(sql)
+    if result:
+        _province = result.get("mult_count", 0)
+
+    sql = (
+        "select count(DISTINCT(CountryPrefix || ':' || Band)) as cb_count from dxlog "
+        f"where ContestNR = {self.database.current_contest} and CountryPrefix NOT in ('I', 'IS');"
+    )
+    result2 = self.database.exec_sql(sql)
+    if result2:
+        _country = int(result2.get("cb_count", 0))
+
+    return _country + _province
+
+
+def show_qso(self):
+    """Return qso count"""
+    result = self.database.fetch_qso_count()
+    if result:
+        return int(result.get("qsos", 0))
+    return 0
+
+
+def calc_score(self):
+    """Return calculated score"""
+    result = self.database.fetch_points()
+    if result is not None:
+        score = result.get("Points", "0")
+        if score is None:
+            score = "0"
+        contest_points = int(score)
+        mults = int(show_mults(self))
+        return contest_points * mults
+    return 0
+
+
+def adif(self):
+    """Call the generate ADIF function"""
+    gen_adif(self, cabrillo_name, cabrillo_name)
+
+
+def output_cabrillo_line(line_to_output, ending, file_descriptor, file_encoding):
+    """"""
+    print(
+        line_to_output.encode(file_encoding, errors="ignore").decode(),
+        end=ending,
+        file=file_descriptor,
+    )
+
+
+def cabrillo(self, file_encoding):
+    """Generates Cabrillo file. Maybe."""
+    # https://www.cw160.com/cabrillo.htm
+    logger.debug("******Cabrillo*****")
+    logger.debug("Station: %s", f"{self.station}")
+    logger.debug("Contest: %s", f"{self.contest_settings}")
+    now = datetime.datetime.now()
+    date_time = now.strftime("%Y-%m-%d_%H-%M-%S")
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.station.get('Call', '').upper()}_{cabrillo_name}_{date_time}.log"
+    )
+    logger.debug("%s", filename)
+    log = self.database.fetch_all_contacts_asc()
+    try:
+        with open(filename, "w", encoding=file_encoding, newline="") as file_descriptor:
+            output_cabrillo_line(
+                "START-OF-LOG: 3.0",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CREATED-BY: Not1MM v{__version__}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CONTEST: {cabrillo_name}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            if self.station.get("Club", ""):
+                output_cabrillo_line(
+                    f"CLUB: {self.station.get('Club', '').upper()}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line(
+                f"CALLSIGN: {self.station.get('Call','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"LOCATION: {self.station.get('ARRLSection', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-OPERATOR: {self.contest_settings.get('OperatorCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-ASSISTED: {self.contest_settings.get('AssistedCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-BAND: {self.contest_settings.get('BandCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
+            output_cabrillo_line(
+                f"CATEGORY-MODE: {mode}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-TRANSMITTER: {self.contest_settings.get('TransmitterCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            if self.contest_settings.get("OverlayCategory", "") != "N/A":
+                output_cabrillo_line(
+                    f"CATEGORY-OVERLAY: {self.contest_settings.get('OverlayCategory','')}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line(
+                f"GRID-LOCATOR: {self.station.get('GridSquare','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-POWER: {self.contest_settings.get('PowerCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+
+            output_cabrillo_line(
+                f"CLAIMED-SCORE: {calc_score(self)}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            ops = f"@{self.station.get('Call','')}"
+            list_of_ops = self.database.get_ops()
+            for op in list_of_ops:
+                ops += f", {op.get('Operator', '')}"
+            output_cabrillo_line(
+                f"OPERATORS: {ops}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"NAME: {self.station.get('Name', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS: {self.station.get('Street1', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-CITY: {self.station.get('City', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-STATE-PROVINCE: {self.station.get('State', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-POSTALCODE: {self.station.get('Zip', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-COUNTRY: {self.station.get('Country', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"EMAIL: {self.station.get('Email', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            for contact in log:
+                the_date_and_time = contact.get("TS", "")
+                themode = contact.get("Mode", "")
+                if themode == "LSB" or themode == "USB":
+                    themode = "PH"
+                if themode == "RTTY":
+                    themode = "RY"
+                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
+
+                loggeddate = the_date_and_time[:10]
+                loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
+                output_cabrillo_line(
+                    f"QSO: {frequency} {themode} {loggeddate} {loggedtime} "
+                    f"{contact.get('StationPrefix', '').ljust(13)} "
+                    f"{str(contact.get('SNT', '')).ljust(3)} "
+                    f"{str(contact.get('SentNr', '')).upper().ljust(6)} "
+                    f"{contact.get('Call', '').ljust(13)} "
+                    f"{str(contact.get('RCV', '')).ljust(3)} "
+                    f"{str(contact.get('NR', '')).upper().ljust(6)}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line("END-OF-LOG:", "\r\n", file_descriptor, file_encoding)
+        self.show_message_box(f"Cabrillo saved to: {filename}")
+    except IOError as exception:
+        logger.critical("cabrillo: IO error: %s, writing to %s", exception, filename)
+        self.show_message_box(f"Error saving Cabrillo: {exception} {filename}")
+        return
+
+
+def trigger_update(self):
+    """Triggers the log window to update."""
+    cmd = {}
+    cmd["cmd"] = "UPDATELOG"
+    if self.log_window:
+        self.log_window.msg_from_main(cmd)
+
+
+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)
+
+
+def populate_history_info_line(self):
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('Call', '')}, {result.get('Sect', '')}")
+    else:
+        self.history_info.setText("")
+
+
+def check_call_history(self):
+    """"""
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('UserText','')}")
+        if self.other_2.text() == "":
+            self.other_2.setText(f"{result.get('Sect', '')}")
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    print(f"{the_packet=}")
+    """Process FT8 QSO packets
+    FT8
+    {
+        'CALL': 'KE0OG',
+        'GRIDSQUARE': 'DM10AT',
+        'MODE': 'FT8',
+        'RST_SENT': '',
+        'RST_RCVD': '',
+        'QSO_DATE': '20210329',
+        'TIME_ON': '183213',
+        'QSO_DATE_OFF': '20210329',
+        'TIME_OFF': '183213',
+        'BAND': '20M',
+        'FREQ': '14.074754',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'CONTEST_ID': 'ARRL-FIELD-DAY',
+        'SRX_STRING': '1D UT',
+        'CLASS': '1D',
+        'ARRL_SECT': 'UT'
+    }
+    FlDigi
+    {
+        'CALL': 'K5TUS', 
+        'MODE': 'RTTY', 
+        'FREQ': '14.068415', 
+        'BAND': '20M', 
+        'QSO_DATE': '20250103', 
+        'TIME_ON': '2359', 
+        'QSO_DATE_OFF': '20250103', 
+        'TIME_OFF': '2359', 
+        'NAME': '', 
+        'QTH': '', 
+        'STATE': 'ORG', 
+        'VE_PROV': '', 
+        'COUNTRY': 'USA', 
+        'RST_SENT': '599', 
+        'RST_RCVD': '599', 
+        'TX_PWR': '0', 
+        'CNTY': '', 
+        'DXCC': '', 
+        'CQZ': '5', 
+        'IOTA': '', 
+        'CONT': '', 
+        'ITUZ': '', 
+        'GRIDSQUARE': '', 
+        'QSLRDATE': '', 
+        'QSLSDATE': '', 
+        'EQSLRDATE': '', 
+        'EQSLSDATE': '', 
+        'LOTWRDATE': '', 
+        'LOTWSDATE': '', 
+        'QSL_VIA': '', 
+        'NOTES': '', 
+        'SRX': '', 
+        'STX': '000', 
+        'SRX_STRING': '', 
+        'STX_STRING': 'CA', 
+
+
+        'SRX': '666', 
+        'STX': '000', 
+        'SRX_STRING': '', 
+        'STX_STRING': 'CA',
+
+        'SRX': '004', 'STX': '000', 'SRX_STRING': '', 'STX_STRING': '#',
+
+        'CLASS': '', 
+        'ARRL_SECT': '', 
+        'OPERATOR': 'K6GTE', 
+        'STATION_CALLSIGN': 'K6GTE', 
+        'MY_GRIDSQUARE': 'DM13AT', 
+        'MY_CITY': 'ANAHEIM, CA', 
+        'CHECK': '', 
+        'AGE': '', 
+        'TEN_TEN': '', 
+        'CWSS_PREC': '', 
+        'CWSS_SECTION': '', 
+        'CWSS_SERNO': '', 
+        'CWSS_CHK': ''
+    }
+
+    """
+    logger.debug(f"{the_packet=}")
+    if ALTEREGO is not None:  # type: ignore
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))  # type: ignore
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")  # type: ignore
+        ALTEREGO.contact["SNT"] = the_packet.get("RST_SENT", "599")  # type: ignore
+        ALTEREGO.contact["RCV"] = the_packet.get("RST_RCVD", "599")  # type: ignore
+
+        sent_string = the_packet.get("STX_STRING", "")
+        if sent_string != "":
+            ALTEREGO.contact["SentNr"] = sent_string  # type: ignore
+            ALTEREGO.other_1.setText(str(sent_string))  # type: ignore
+        else:
+            ALTEREGO.contact["SentNr"] = the_packet.get("STX", "000")  # type: ignore
+            ALTEREGO.other_1.setText(str(the_packet.get("STX", "000")))  # type: ignore
+
+        rx_string = the_packet.get("STATE", "")
+        if rx_string != "":
+            ALTEREGO.contact["NR"] = rx_string  # type: ignore
+            ALTEREGO.other_2.setText(str(rx_string))  # type: ignore
+        else:
+            ALTEREGO.contact["NR"] = the_packet.get("SRX", "000")  # type: ignore
+            ALTEREGO.other_2.setText(str(the_packet.get("SRX", "000")))  # type: ignore
+
+        ALTEREGO.contact["Mode"] = the_packet.get("MODE", "ERR")  # type: ignore
+        ALTEREGO.contact["Freq"] = round(float(the_packet.get("FREQ", "0.0")) * 1000, 2)  # type: ignore
+        ALTEREGO.contact["QSXFreq"] = round(  # type: ignore
+            float(the_packet.get("FREQ", "0.0")) * 1000, 2
+        )
+        ALTEREGO.contact["Band"] = get_logged_band(  # type: ignore
+            str(int(float(the_packet.get("FREQ", "0.0")) * 1000000))
+        )
+        logger.debug(f"{ALTEREGO.contact=}")  # type: ignore
+
+        ALTEREGO.save_contact()  # type: ignore

not1mm/plugins/canada_day.py

@@ -174,7 +174,7 @@ def show_mults(self):
 
     sql = (
         "select count(DISTINCT(NR || ':' || Band || ':' || Mode)) as mult_count from dxlog "
-        "where ContestNR = {self.database.current_contest} and typeof(NR) = 'text';"
+        f"where ContestNR = {self.database.current_contest} and typeof(NR) = 'text';"
     )
     result = self.database.exec_sql(sql)
     if result:

{not1mm-25.5.25.dist-info → not1mm-25.5.26.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.5.25
+Version: 25.5.26.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -219,6 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - 10 10 Spring CW
 - 10 10 Summer Phone
 - 10 10 Winter Phone
+- ARI 40 80
+- ARI DX
 - ARRL 10M
 - ARRL 160M
 - ARRL DX CW, SSB
@@ -259,6 +261,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-5-26] Add ARI DX contest, Fix Canada Day mults.
 - [25-5-25] Added {PREVNR} macro to resend last logged serial number.
   - Add Bandmap mode indicators for CW, FT*, SSB, Beacons.
   - Made tuning with the VFO knob smoother.
@@ -898,8 +901,26 @@ blue rectangle shows the receivers bandwidth if one is reported.
 
 ![Bandmap Window](https://github.com/mbridak/not1mm/raw/master/pic/VFO_and_bandwidth_markers.png)
 
-Clicked on spots now tune the radio and set the callsign field. Previously
-worked calls are displayed in red.
+Clicking on a spots tunes the radio to the spot frequency and sets the callsign field.
+
+Previously worked calls are displayed in Red.
+
+Callsigns that were marked with CTRL-M to work later are displayed in a Yellow-ish color.
+
+In between the spots call and time is now a little icon to visually tell you what kind of spot it is.
+
+![Bandmap Icons](https://github.com/mbridak/not1mm/raw/master/pic/bandmap_icons.png)
+
+- ○ CW
+- ⦿ FT*
+- ⌾ RTTY
+- 🗼 Beacons
+- @ Everything else
+
+Secondary Icons:
+
+- [P] POTA
+- [S] SOTA
 
 ### The Check Partial Window
 
@@ -927,7 +948,9 @@ This window contains QSO rates and counts.
 
 You can control the VFO on a remote rig by following the directions listed in
 the link below. It's a small hardware project with a BOM of under $20, and
-consisting of two parts.
+consisting of two parts. The VFO knob is now detectable on MacOS. I've made the
+operation of the knob smoother by having the knob ignore frequency updates from
+the radio while it's in rotation.
 
 1. Making the [VFO](https://github.com/mbridak/not1mm/blob/master/usb_vfo_knob/vfo.md)...
 2. Then... `Window`>`VFO`

{not1mm-25.5.25.dist-info → not1mm-25.5.26.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ not1mm/__main__.py,sha256=FZZGObcnSJEzEFj7a2K_-DPJUivmDS2tV5boPVudSJs,169592
 not1mm/bandmap.py,sha256=0JmZ32UvkaPjXs2xTgowX1GLvZo5zHU_Zo9y_GL-On4,31139
 not1mm/checkwindow.py,sha256=zEHlw40j6Wr3rvKbCQf2lcezCoiZqaBqEvBjQU5aKW0,7630
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
-not1mm/logwindow.py,sha256=zpCCcyRLK40D2rcxnIJBSVVqPEmTHKCrkAcfEj5sZ54,42624
+not1mm/logwindow.py,sha256=hYzpCQKkwgILFUtP5uxQXy6uU9zCB0R-aBDAUsSOPFI,42625
 not1mm/lookupservice.py,sha256=GkY_qHZfrW6XHf8upIoaG4hCFqm0fg6Ganu9ConGrIc,2628
 not1mm/radio.py,sha256=4Lysf9BY3vdtYCHwKfzO5WN7IGyh4_lKSVuQ6F4Z08g,5536
 not1mm/ratewindow.py,sha256=iBjqdOetIEX0wSwdGM89Ibt4gVlFdE-K8HQPnkVPVOg,6965
@@ -36,7 +36,7 @@ not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N
 not1mm/data/logwindow.ui,sha256=vfkNdzJgFs3tTOBKLDavF2zVMvNHWOZ82fAErRi6pQY,1436
 not1mm/data/logwindowx.ui,sha256=9FzDJtLRpagvAWcDjFdB9NnvNZ4bVxdTNHy1Jit2ido,1610
 not1mm/data/main.ui,sha256=gEWmfXmqLM-DiujjnPdU-4buYJF9TQxS9gE0JlVv_4Y,65142
-not1mm/data/new_contest.ui,sha256=WKg2jy8jxHg2d3pZsBTcdSNObKcd0eVbO-OoW0u0uxA,25309
+not1mm/data/new_contest.ui,sha256=uYEn8RU8kkGI2jUC7_gsH5HpVvJdG79cl_10OpvFCXw,25412
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=mC4OhoVIfR1H9IqHAKXliPMm8VOVmxSEadpsFQ7XnS4,2247
 not1mm/data/pickcontest.ui,sha256=Pbb_YEOzQfacyhIRkx-M3ZGugIIPL1KPztdwVv5c_q0,1696
@@ -120,7 +120,7 @@ not1mm/lib/plugin_common.py,sha256=D1OBjyLmX7zuSPqgTCmHwXzAKA12J_zTQItvyIem-4Y,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=5xnsagH48qGeCDhfxPWW9yaXtv8wT13yoIVvYt8h_Qs,16023
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=gcUyTawJD4PIn_mBa947znnmgM9-mvfHXIEnCSo7gnM,49
+not1mm/lib/version.py,sha256=yA7CdtW3TS2_La829zvpEQPRX8CKY-9FzSRHeqAinb8,50
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=oJh3JKqjOpnWElSlZpiQ631UnaOd8qra5s9bl_QoInk,14783
 not1mm/plugins/10_10_spring_cw.py,sha256=p7dSDtbFK0e6Xouw2V6swYn3VFVgHKyx4IfRWyBjMZY,14786
@@ -128,6 +128,7 @@ not1mm/plugins/10_10_summer_phone.py,sha256=NWWT5YTZN6CkPl5Jy4lCuTqHd1R_JodhsOLq
 not1mm/plugins/10_10_winter_phone.py,sha256=4xoWLbnE2di5XnUUlhsvTR__E0Z4kbhu-rcUitPMR0U,14795
 not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/plugins/ari_40_80.py,sha256=_CaUWEo0zJONXvxPqJKyqmStJezqxEsNxOnEdSLmxzY,15333
+not1mm/plugins/ari_dx.py,sha256=GXAq9H-JrE_QZ5E4Dhkyo6v18Z4-xomAtgZOg_aTzRI,22380
 not1mm/plugins/arrl_10m.py,sha256=9p7EX2vAXVilF8y6AYHG4fXczU6g9QuMA2Pvj64pSXE,18389
 not1mm/plugins/arrl_160m.py,sha256=rdWDhmPN0h9ADTlYaRLk-5j8KVye0rUEs1tyD-kfHV0,20300
 not1mm/plugins/arrl_dx_cw.py,sha256=Bx6_PBmTHKf4l52XwLFVeR2y6F134kXbGTfEXC_1agk,18890
@@ -139,7 +140,7 @@ not1mm/plugins/arrl_ss_phone.py,sha256=PzybC--tSB7_oNLbbN9xYkMnftH-z6qgcGZUp3-JG
 not1mm/plugins/arrl_vhf_jan.py,sha256=paYrF_o1EotBRmXn_x9_hEM16SWx7sLDzoSoXcYXcCY,20201
 not1mm/plugins/arrl_vhf_jun.py,sha256=WwQ-UGFekIZj26bIbq3sLacTYMmUzBYySHhPz2APm2M,19293
 not1mm/plugins/arrl_vhf_sep.py,sha256=kq5Rncru74G9B76VwfXMeTaF9AL8hq-1vw9ZMYmJmvM,19326
-not1mm/plugins/canada_day.py,sha256=89aGXm4S9PjKL9FYm3z7BMFRz--MugQQilwQnzLJvv0,15770
+not1mm/plugins/canada_day.py,sha256=L8pBKcfZGUycBfRS3g9PfeavNIL8CTRAUYk-fVMXDoU,15771
 not1mm/plugins/cq_160_cw.py,sha256=bmHtxVcIWsqmgqpMCMso7DCBERtAr9fIKIjgymSKtms,18711
 not1mm/plugins/cq_160_ssb.py,sha256=9KKDmmapETEebm1azfEzUWk1NyW3TBnYtBlFIPZYHBs,18754
 not1mm/plugins/cq_wpx_cw.py,sha256=F5lLuXumrviNHnNEk377OKeEJCnv_j9vnjHEcV70gFc,18249
@@ -182,9 +183,9 @@ not1mm/plugins/ukeidx.py,sha256=0ABGW7_9Ui0Rgr8mkPBxOJokAIerM1a4-HWnl6VsnV8,1910
 not1mm/plugins/vhf_sprint.py,sha256=a9QFTpv8XUbZ_GLjdVCh7svykFa-gXOWwKFZ6MD3uQM,19289
 not1mm/plugins/weekly_rtty.py,sha256=C8Xs3Q5UgSYx-mFFar8BVARWtmqlyrbeC98Ubzb4UN8,20128
 not1mm/plugins/winter_field_day.py,sha256=hmAMgkdqIXtnCNyUp8J9Bb8liN8wj10wps6ROuG-Bok,15284
-not1mm-25.5.25.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.5.25.dist-info/METADATA,sha256=LMao9elh21fHypET3g4kblWcGFyjDg5z0A1LSOMY2J0,41254
-not1mm-25.5.25.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-not1mm-25.5.25.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.5.25.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.5.25.dist-info/RECORD,,
+not1mm-25.5.26.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.5.26.1.dist-info/METADATA,sha256=OCl5-STfmrP_sLIxfT1KFyEysSZ7-hu_nx8VN8aSYTY,41911
+not1mm-25.5.26.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+not1mm-25.5.26.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.5.26.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.5.26.1.dist-info/RECORD,,