not1mm 23.3.25__tar.gz → 23.3.27__tar.gz

{not1mm-23.3.25 → not1mm-23.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.3.25
+Version: 23.3.27
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -40,6 +40,7 @@ License-File: LICENSE
   - [Log Display](#log-display)
   - [Editing a contact](#editing-a-contact)
   - [Cabrillo](#cabrillo)
+  - [ADIF](#adif)
   - [Dupe checking](#dupe-checking)
   - [CAT](#cat)
 
@@ -70,6 +71,7 @@ Feature complete.
 
 ## Changes of note
 
+- [23-3-27] Fix cursor behaviour when editing text in callsign field.
 - [23-3-25] Fix minimum call length. Fix cabrillo tag. Add adif output.
 - [23-3-24] Added dupe checking. Added CAT check for flrig or rigctld. Added online flag for flrig.
 - [23-3-23] Added most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
@@ -193,6 +195,14 @@ So for me it would be:
 
 K6GTE_CQ-WPX-SSB.log
 
+## ADIF
+
+`File` > `Generate ADIF`
+
+Boom... ADIF
+
+`StationCall`_`ContestName`.adi
+
 ## Dupe checking
 
 Added dupe checking. Big Red 'Dupe' will appear if it's a dupe...

{not1mm-23.3.25 → not1mm-23.3.27}/README.md

@@ -21,6 +21,7 @@
   - [Log Display](#log-display)
   - [Editing a contact](#editing-a-contact)
   - [Cabrillo](#cabrillo)
+  - [ADIF](#adif)
   - [Dupe checking](#dupe-checking)
   - [CAT](#cat)
 
@@ -51,6 +52,7 @@ Feature complete.
 
 ## Changes of note
 
+- [23-3-27] Fix cursor behaviour when editing text in callsign field.
 - [23-3-25] Fix minimum call length. Fix cabrillo tag. Add adif output.
 - [23-3-24] Added dupe checking. Added CAT check for flrig or rigctld. Added online flag for flrig.
 - [23-3-23] Added most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
@@ -174,6 +176,14 @@ So for me it would be:
 
 K6GTE_CQ-WPX-SSB.log
 
+## ADIF
+
+`File` > `Generate ADIF`
+
+Boom... ADIF
+
+`StationCall`_`ContestName`.adi
+
 ## Dupe checking
 
 Added dupe checking. Big Red 'Dupe' will appear if it's a dupe...

{not1mm-23.3.25 → not1mm-23.3.27}/not1mm/__main__.py

@@ -663,7 +663,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def select_contest(self):
         """Load contest"""
-        self.contest = doimp("cq_wpx_ssb")
+        self.contest = doimp("cq_wpx_cw")
         logger.debug("Loaded Contest Name = %s", self.contest.name)
         self.contest.init_contest(self)
 
@@ -984,10 +984,12 @@ class MainWindow(QtWidgets.QMainWindow):
         """Called when text in the callsign field has changed"""
         text = self.callsign.text()
         text = text.upper()
-        stripped_text = text.strip()
+        position = self.callsign.cursorPosition()
+        stripped_text = text.strip().replace(" ", "")
         self.callsign.setText(stripped_text)
+        self.callsign.setCursorPosition(position)
 
-        if text[-1:] == " ":
+        if " " in text:
             if stripped_text == "CW":
                 self.setmode("CW")
                 self.radio_state["mode"] = "CW"
@@ -1113,9 +1115,18 @@ class MainWindow(QtWidgets.QMainWindow):
         """Checks if a callsign is a dupe on current band/mode."""
         band = float(get_logged_band(str(self.radio_state.get("vfoa", 0.0))))
         mode = self.radio_state.get("mode", "")
-        debugline = f"Call: {call} Band: {band} Mode: {mode}"
+        debugline = (
+            f"Call: {call} Band: {band} Mode: {mode} Dupetype: {self.contest.dupe_type}"
+        )
         logger.debug("%s", debugline)
-        result = self.database.check_dupe_on_band_mode(call, band, mode)
+        if self.contest.dupe_type == 1:
+            result = self.database.check_dupe(call)
+        if self.contest.dupe_type == 2:
+            result = self.database.check_dupe_on_band(call, band)
+        if self.contest.dupe_type == 3:
+            result = self.database.check_dupe_on_band_mode(call, band, mode)
+        if self.contest.dupe_type == 4:
+            result = {"isdupe": False}
         debugline = f"{result}"
         logger.debug("%s", debugline)
         return result.get("isdupe", False)
@@ -1242,126 +1253,7 @@ class MainWindow(QtWidgets.QMainWindow):
         """Generates Cabrillo file. Maybe."""
         # https://www.cqwpx.com/cabrillo.htm
         logger.debug("******Cabrillo*****")
-        filename = (
-            str(Path.home())
-            + "/"
-            + f"{self.pref.get('callsign').upper()}_{self.contest.cabrillo_name}.log"
-        )
-        logger.debug("%s", filename)
-        log = self.database.fetch_all_contacts_asc()
-        try:
-            with open(filename, "w", encoding="ascii") as file_descriptor:
-                print("START-OF-LOG: 3.0", end="\r\n", file=file_descriptor)
-                print(
-                    f"CREATED-BY: Not1MM v{__version__}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"CONTEST: {self.contest.cabrillo_name}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"CALLSIGN: {self.pref.get('callsign','')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"LOCATION: {self.pref.get('section', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                # print(
-                #     f"ARRL-SECTION: {self.pref.get('section', '')}",
-                #     end="\r\n",
-                #     file=file_descriptor,
-                # )
-                # CATEGORY-OPERATOR: SINGLE-OP
-                # CATEGORY-ASSISTED: NON-ASSISTED
-                # CATEGORY-BAND: ALL
-                # CATEGORY-MODE: SSB
-                # CATEGORY-TRANSMITTER: ONE
-                # CATEGORY-OVERLAY: CLASSIC
-                # GRID-LOCATOR: DM13at
-                print(
-                    f"CATEGORY: {None}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print("CATEGORY-POWER: ", end="\r\n", file=file_descriptor)
-
-                print(
-                    f"CLAIMED-SCORE: {self.contest.calc_score(self)}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    "OPERATORS: ",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"NAME: {self.pref.get('name', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"ADDRESS: {self.pref.get('address1', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"ADDRESS-CITY: {self.pref.get('city', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"ADDRESS-STATE-PROVINCE: {self.pref.get('state', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"ADDRESS-POSTALCODE: {self.pref.get('zip', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"ADDRESS-COUNTRY: {self.pref.get('country', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                print(
-                    f"EMAIL: {self.pref.get('email', '')}",
-                    end="\r\n",
-                    file=file_descriptor,
-                )
-                for contact in log:
-                    the_date_and_time = contact.get("TS", "")
-                    mode = contact.get("Mode", "")
-                    if mode == "LSB" or mode == "USB":
-                        mode = "PH"
-                    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]
-                    print(
-                        f"QSO: {frequency} {mode} {loggeddate} {loggedtime} "
-                        f"{contact.get('StationPrefix', '').ljust(13)} "
-                        f"{str(contact.get('SNT', '')).ljust(3)} "
-                        f"{str(contact.get('SentNr', '')).ljust(6)} "
-                        f"{contact.get('Call', '').ljust(13)} "
-                        f"{str(contact.get('RCV', '')).ljust(3)} "
-                        f"{str(contact.get('NR', '')).ljust(6)}",
-                        end="\r\n",
-                        file=file_descriptor,
-                    )
-                print("END-OF-LOG:", end="\r\n", file=file_descriptor)
-        except IOError as exception:
-            logger.critical(
-                "cabrillo: IO error: %s, writing to %s", exception, filename
-            )
-            return
+        self.contest.cabrillo(self)
 
 
 def load_fonts_from_dir(directory: str) -> set:

{not1mm-23.3.25 → not1mm-23.3.27}/not1mm/lib/database.py

@@ -370,6 +370,30 @@ class DataBase:
             )
             return cursor.fetchone()
 
+    def check_dupe_on_band(self, call, band) -> dict:
+        """Checks if a call is dupe on band/mode"""
+        with sqlite3.connect(self.database) as conn:
+            conn.row_factory = self.row_factory
+            cursor = conn.cursor()
+            print(
+                f"select count(*) as isdupe from dxlog where Call = '{call}' and Band = '{band}';"
+            )
+            cursor.execute(
+                f"select count(*) as isdupe from dxlog where Call = '{call}' and Band = '{band}';"
+            )
+            return cursor.fetchone()
+
+    def check_dupe(self, call) -> dict:
+        """Checks if a call is dupe on band/mode"""
+        with sqlite3.connect(self.database) as conn:
+            conn.row_factory = self.row_factory
+            cursor = conn.cursor()
+            print(f"select count(*) as isdupe from dxlog where Call = '{call}';")
+            cursor.execute(
+                f"select count(*) as isdupe from dxlog where Call = '{call}';"
+            )
+            return cursor.fetchone()
+
     def fetch_points(self) -> dict:
         """return points"""
         with sqlite3.connect(self.database) as conn:

not1mm-23.3.27/not1mm/lib/version.py

@@ -0,0 +1,2 @@
+"""It's the version"""
+__version__ = "23.3.27"

not1mm-23.3.27/not1mm/plugins/cq_wpx_cw.py

@@ -0,0 +1,389 @@
+"""CQ WPX CW plugin"""
+
+# pylint: disable=invalid-name
+import logging
+from pathlib import Path
+
+from PyQt5 import QtWidgets
+
+from not1mm.lib.version import __version__
+
+logger = logging.getLogger("__main__")
+
+name = "CQ WPX CW"
+cabrillo_name = "CQ-WPX-CW"
+mode = "CW"  # CW SSB BOTH RTTY
+
+# 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
+dupe_type = 2
+
+
+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()
+    label = self.field3.findChild(QtWidgets.QLabel)
+    label.setText("SentNR")
+    label = self.field4.findChild(QtWidgets.QLabel)
+    label.setText("RcvNR")
+
+
+def set_tab_next(self):
+    """Set TAB Advances"""
+    self.tab_next = {
+        self.callsign: self.field1.findChild(QtWidgets.QLineEdit),
+        self.field1.findChild(QtWidgets.QLineEdit): self.field2.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field2.findChild(QtWidgets.QLineEdit): self.field3.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+    }
+
+
+def set_tab_prev(self):
+    """Set TAB Advances"""
+    self.tab_prev = {
+        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
+        self.field1.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.field2.findChild(QtWidgets.QLineEdit): self.field1.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field3.findChild(QtWidgets.QLineEdit): self.field2.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
+            QtWidgets.QLineEdit
+        ),
+    }
+
+
+def set_contact_vars(self):
+    """Contest Specific"""
+    self.contact["SNT"] = self.sent.text()
+    self.contact["RCV"] = self.receive.text()
+    self.contact["SentNr"] = self.other_1.text()
+    self.contact["NR"] = self.other_2.text()
+    if self.contact.get("WPXPrefix"):
+        result = self.database.fetch_wpx_exists(self.contact.get("WPXPrefix", ""))
+        if result.get("wpx_count"):
+            self.contact["IsMultiplier1"] = 0
+        else:
+            self.contact["IsMultiplier1"] = 1
+
+
+def prefill(self):
+    """Fill SentNR"""
+    result = self.database.get_serial()
+    serial_nr = str(result.get("serial_nr", "1"))
+    if serial_nr == "None":
+        serial_nr = "1"
+    field = self.field3.findChild(QtWidgets.QLineEdit)
+    if len(field.text()) == 0:
+        field.setText(serial_nr)
+
+
+def points(self):
+    """Calc point"""
+    result = self.cty_lookup(self.pref.get("callsign", ""))
+    if result:
+        for item in result.items():
+            mycountry = item[1].get("entity", "")
+            mycontinent = item[1].get("continent", "")
+    result = self.cty_lookup(self.contact.get("Call", ""))
+    band = int(int(float(self.contact.get("Freq"))) / 1000)
+    if result:
+        for item in result.items():
+            entity = item[1].get("entity", "")
+            continent = item[1].get("continent", "")
+            if mycountry.upper() == entity.upper():
+                return 1
+            if mycontinent and continent == "NA":
+                if band in [28, 21, 14]:
+                    return 2
+                return 4
+            if mycontinent == continent:
+                if band in [28, 21, 14]:
+                    return 1
+                return 2
+            if band in [28, 21, 14]:
+                return 3
+            return 6
+    return 0
+
+
+def show_mults(self):
+    """Return display string for mults"""
+    result = self.database.fetch_wpx_count()
+    if result:
+        return int(result.get("wpx_count", 0))
+    return 0
+
+
+def show_qso(self):
+    """Return qso count"""
+    result = self.database.fetch_qso_count()
+    if result:
+        return int(result.get("qsos", 0))
+    return 0
+
+
+def get_points(self):
+    """Return raw points before mults"""
+    result = self.database.fetch_points()
+    if result:
+        return int(result.get("Points", 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)
+        result = self.database.fetch_wpx_count()
+        mults = int(result.get("wpx_count", 0))
+        return contest_points * mults
+    return 0
+
+
+def adif(self):
+    """
+    Creates an ADIF file of the contacts made.
+    """
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.pref.get('callsign').upper()}_{cabrillo_name}.adi"
+    )
+    log = self.database.fetch_all_contacts_asc()
+    try:
+        with open(filename, "w", encoding="utf-8") as file_descriptor:
+            print("<ADIF_VER:5>2.2.0", end="\r\n", file=file_descriptor)
+            print("<EOH>", end="\r\n", file=file_descriptor)
+            for contact in log:
+
+                hiscall = contact.get("Call", "")
+                the_date_and_time = contact.get("TS")
+                # band = contact.get("Band")
+                themode = contact.get("Mode")
+                frequency = str(contact.get("Freq", 0) / 1000)
+                sentrst = contact.get("SNT", "")
+                rcvrst = contact.get("RCV", "")
+                sentnr = str(contact.get("SentNr", "59"))
+                rcvnr = str(contact.get("NR", "59"))
+                grid = contact.get("GridSquare", "")
+                comment = contact.get("ContestName", "")
+                loggeddate = the_date_and_time[:10]
+                loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
+                print(
+                    f"<QSO_DATE:{len(''.join(loggeddate.split('-')))}:d>"
+                    f"{''.join(loggeddate.split('-'))}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+                print(
+                    f"<TIME_ON:{len(loggedtime)}>{loggedtime}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+                print(
+                    f"<CALL:{len(hiscall)}>{hiscall}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+                print(
+                    f"<MODE:{len(themode)}>{themode}", end="\r\n", file=file_descriptor
+                )
+                # print(
+                #     f"<BAND:{len(band + 'M')}>{band + 'M'}",
+                #     end="\r\n",
+                #     file=file_descriptor,
+                # )
+                try:
+                    print(
+                        f"<FREQ:{len(frequency)}>{frequency}",
+                        end="\r\n",
+                        file=file_descriptor,
+                    )
+                except TypeError:
+                    pass  # This is bad form... I can't remember why this is in a try block
+
+                print(
+                    f"<RST_SENT:{len(sentrst)}>{sentrst}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+                print(
+                    f"<RST_RCVD:{len(rcvrst)}>{rcvrst}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+
+                print(
+                    f"<STX_STRING:{len(sentnr)}>{sentnr}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+                print(
+                    f"<SRX_STRING:{len(rcvnr)}>{rcvnr}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+                if len(grid) > 1:
+                    print(
+                        f"<GRIDSQUARE:{len(grid)}>{grid}",
+                        end="\r\n",
+                        file=file_descriptor,
+                    )
+
+                print(
+                    f"<COMMENT:{len(comment)}>{comment}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+                print("<EOR>", end="\r\n", file=file_descriptor)
+                print("", end="\r\n", file=file_descriptor)
+    except IOError:
+        ...
+
+
+def cabrillo(self):
+    """Generates Cabrillo file. Maybe."""
+    # https://www.cqwpx.com/cabrillo.htm
+    logger.debug("******Cabrillo*****")
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.pref.get('callsign').upper()}_{cabrillo_name}.log"
+    )
+    logger.debug("%s", filename)
+    log = self.database.fetch_all_contacts_asc()
+    try:
+        with open(filename, "w", encoding="ascii") as file_descriptor:
+            print("START-OF-LOG: 3.0", end="\r\n", file=file_descriptor)
+            print(
+                f"CREATED-BY: Not1MM v{__version__}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CONTEST: {cabrillo_name}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CALLSIGN: {self.pref.get('callsign','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"LOCATION: {self.pref.get('section', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            # print(
+            #     f"ARRL-SECTION: {self.pref.get('section', '')}",
+            #     end="\r\n",
+            #     file=file_descriptor,
+            # )
+            # CATEGORY-OPERATOR: SINGLE-OP
+            # CATEGORY-ASSISTED: NON-ASSISTED
+            # CATEGORY-BAND: ALL
+            # CATEGORY-MODE: SSB
+            # CATEGORY-TRANSMITTER: ONE
+            # CATEGORY-OVERLAY: CLASSIC
+            # GRID-LOCATOR: DM13at
+            print(
+                f"CATEGORY: {None}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print("CATEGORY-POWER: ", end="\r\n", file=file_descriptor)
+
+            print(
+                f"CLAIMED-SCORE: {calc_score(self)}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                "OPERATORS: ",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"NAME: {self.pref.get('name', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS: {self.pref.get('address1', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-CITY: {self.pref.get('city', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-STATE-PROVINCE: {self.pref.get('state', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-POSTALCODE: {self.pref.get('zip', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-COUNTRY: {self.pref.get('country', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"EMAIL: {self.pref.get('email', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            for contact in log:
+                the_date_and_time = contact.get("TS", "")
+                themode = contact.get("Mode", "")
+                if themode == "LSB" or themode == "USB":
+                    themode = "PH"
+                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]
+                print(
+                    f"QSO: {frequency} {themode} {loggeddate} {loggedtime} "
+                    f"{contact.get('StationPrefix', '').ljust(13)} "
+                    f"{str(contact.get('SNT', '')).ljust(3)} "
+                    f"{str(contact.get('SentNr', '')).ljust(6)} "
+                    f"{contact.get('Call', '').ljust(13)} "
+                    f"{str(contact.get('RCV', '')).ljust(3)} "
+                    f"{str(contact.get('NR', '')).ljust(6)}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+            print("END-OF-LOG:", end="\r\n", file=file_descriptor)
+    except IOError as exception:
+        logger.critical("cabrillo: IO error: %s, writing to %s", exception, filename)
+        return

{not1mm-23.3.25 → not1mm-23.3.27}/not1mm/plugins/cq_wpx_ssb.py

@@ -1,15 +1,21 @@
 """CQ WPX SSB plugin"""
 
 # pylint: disable=invalid-name
+import logging
+from pathlib import Path
 
 from PyQt5 import QtWidgets
 
+from not1mm.lib.version import __version__
+
+logger = logging.getLogger("__main__")
+
 name = "CQ WPX SSB"
 cabrillo_name = "CQ-WPX-SSB"
 mode = "SSB"  # CW SSB BOTH RTTY
 
 # 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
-dupe_type = 4
+dupe_type = 2
 
 
 def init_contest(self):
@@ -162,17 +168,21 @@ def adif(self):
     """
     Creates an ADIF file of the contacts made.
     """
-    logname = "cqwpxssb.adi"
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.pref.get('callsign').upper()}_{cabrillo_name}.adi"
+    )
     log = self.database.fetch_all_contacts_asc()
     try:
-        with open(logname, "w", encoding="utf-8") as file_descriptor:
+        with open(filename, "w", encoding="utf-8") as file_descriptor:
             print("<ADIF_VER:5>2.2.0", end="\r\n", file=file_descriptor)
             print("<EOH>", end="\r\n", file=file_descriptor)
             for contact in log:
 
                 hiscall = contact.get("Call", "")
                 the_date_and_time = contact.get("TS")
-                band = contact.get("Band")
+                # band = contact.get("Band")
                 themode = contact.get("Mode")
                 frequency = str(contact.get("Freq", 0) / 1000)
                 sentrst = contact.get("SNT", "")
@@ -253,3 +263,127 @@ def adif(self):
                 print("", end="\r\n", file=file_descriptor)
     except IOError:
         ...
+
+
+def cabrillo(self):
+    """Generates Cabrillo file. Maybe."""
+    # https://www.cqwpx.com/cabrillo.htm
+    logger.debug("******Cabrillo*****")
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.pref.get('callsign').upper()}_{cabrillo_name}.log"
+    )
+    logger.debug("%s", filename)
+    log = self.database.fetch_all_contacts_asc()
+    try:
+        with open(filename, "w", encoding="ascii") as file_descriptor:
+            print("START-OF-LOG: 3.0", end="\r\n", file=file_descriptor)
+            print(
+                f"CREATED-BY: Not1MM v{__version__}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CONTEST: {cabrillo_name}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CALLSIGN: {self.pref.get('callsign','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"LOCATION: {self.pref.get('section', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            # print(
+            #     f"ARRL-SECTION: {self.pref.get('section', '')}",
+            #     end="\r\n",
+            #     file=file_descriptor,
+            # )
+            # CATEGORY-OPERATOR: SINGLE-OP
+            # CATEGORY-ASSISTED: NON-ASSISTED
+            # CATEGORY-BAND: ALL
+            # CATEGORY-MODE: SSB
+            # CATEGORY-TRANSMITTER: ONE
+            # CATEGORY-OVERLAY: CLASSIC
+            # GRID-LOCATOR: DM13at
+            print(
+                f"CATEGORY: {None}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print("CATEGORY-POWER: ", end="\r\n", file=file_descriptor)
+
+            print(
+                f"CLAIMED-SCORE: {calc_score(self)}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                "OPERATORS: ",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"NAME: {self.pref.get('name', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS: {self.pref.get('address1', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-CITY: {self.pref.get('city', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-STATE-PROVINCE: {self.pref.get('state', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-POSTALCODE: {self.pref.get('zip', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-COUNTRY: {self.pref.get('country', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"EMAIL: {self.pref.get('email', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            for contact in log:
+                the_date_and_time = contact.get("TS", "")
+                themode = contact.get("Mode", "")
+                if themode == "LSB" or themode == "USB":
+                    themode = "PH"
+                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]
+                print(
+                    f"QSO: {frequency} {themode} {loggeddate} {loggedtime} "
+                    f"{contact.get('StationPrefix', '').ljust(13)} "
+                    f"{str(contact.get('SNT', '')).ljust(3)} "
+                    f"{str(contact.get('SentNr', '')).ljust(6)} "
+                    f"{contact.get('Call', '').ljust(13)} "
+                    f"{str(contact.get('RCV', '')).ljust(3)} "
+                    f"{str(contact.get('NR', '')).ljust(6)}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+            print("END-OF-LOG:", end="\r\n", file=file_descriptor)
+    except IOError as exception:
+        logger.critical("cabrillo: IO error: %s, writing to %s", exception, filename)
+        return

{not1mm-23.3.25 → not1mm-23.3.27}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.3.25
+Version: 23.3.27
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -40,6 +40,7 @@ License-File: LICENSE
   - [Log Display](#log-display)
   - [Editing a contact](#editing-a-contact)
   - [Cabrillo](#cabrillo)
+  - [ADIF](#adif)
   - [Dupe checking](#dupe-checking)
   - [CAT](#cat)
 
@@ -70,6 +71,7 @@ Feature complete.
 
 ## Changes of note
 
+- [23-3-27] Fix cursor behaviour when editing text in callsign field.
 - [23-3-25] Fix minimum call length. Fix cabrillo tag. Add adif output.
 - [23-3-24] Added dupe checking. Added CAT check for flrig or rigctld. Added online flag for flrig.
 - [23-3-23] Added most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
@@ -193,6 +195,14 @@ So for me it would be:
 
 K6GTE_CQ-WPX-SSB.log
 
+## ADIF
+
+`File` > `Generate ADIF`
+
+Boom... ADIF
+
+`StationCall`_`ContestName`.adi
+
 ## Dupe checking
 
 Added dupe checking. Big Red 'Dupe' will appear if it's a dupe...

{not1mm-23.3.25 → not1mm-23.3.27}/not1mm.egg-info/SOURCES.txt

@@ -52,6 +52,7 @@ not1mm/plugins/arrl_field_day.py
 not1mm/plugins/arrl_rtty_ru.py
 not1mm/plugins/arrl_ss_cw.py
 not1mm/plugins/arrl_ss_phone.py
+not1mm/plugins/cq_wpx_cw.py
 not1mm/plugins/cq_wpx_ssb.py
 not1mm/plugins/cqww_dx_cw.py
 not1mm/plugins/cqww_dx_ssb.py

{not1mm-23.3.25 → not1mm-23.3.27}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "23.3.25"
+version = "23.3.27"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"

not1mm-23.3.25/not1mm/lib/version.py

@@ -1,2 +0,0 @@
-"""It's the version"""
-__version__ = "23.3.25"