not1mm 23.3.24.1__tar.gz → 23.3.27__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.3.24.1
+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,8 @@ 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.
 - [23-3-22] Add prefill of serial nr. set OP call on startup. Set IsMultiplier1 new unique wpx. Add OP and contest name to window title. and stuff.
@@ -192,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.24.1 → 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,8 @@ 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.
 - [23-3-22] Add prefill of serial nr. set OP call on startup. Set IsMultiplier1 new unique wpx. Add OP and contest name to window title. and stuff.
@@ -173,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.24.1 → not1mm-23.3.27}/not1mm/__main__.py

@@ -206,6 +206,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionPreferences.triggered.connect(self.preference_selected)
         self.actionQRZ_Settings.triggered.connect(self.qrz_preference_selected)
         self.actionGenerate_Cabrillo.triggered.connect(self.generate_cabrillo)
+        self.actionGenerate_ADIF.triggered.connect(self.generate_adif)
         self.actionLog_Window.triggered.connect(self.launch_log_window)
         self.radioButton_run.clicked.connect(self.run_sp_buttons_clicked)
         self.radioButton_sp.clicked.connect(self.run_sp_buttons_clicked)
@@ -511,7 +512,7 @@ class MainWindow(QtWidgets.QMainWindow):
     def save_contact(self):
         """Save to db"""
         logger.debug("saving")
-        if len(self.callsign.text()) < 4:
+        if len(self.callsign.text()) < 3:
             return
         if not any(char.isdigit() for char in self.callsign.text()):
             return
@@ -662,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)
 
@@ -983,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"
@@ -1112,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)
@@ -1232,135 +1244,16 @@ class MainWindow(QtWidgets.QMainWindow):
             self.F12.setText(f"F12: {self.fkeys['F12'][0]}")
             self.F12.setToolTip(self.fkeys["F12"][1])
 
+    def generate_adif(self):
+        """Generate ADIF"""
+        logger.debug("******ADIF*****")
+        self.contest.adif(self)
+
     def generate_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()}_{self.contest.cabrillo_name}.log"
-        )
-        logger.debug("%s", filename)
-        # self.infobox.setTextColor(QtGui.QColor(211, 215, 207))
-        # self.infobox.insertPlainText(f"Saving cabrillo to: {filename}")
-        # app.processEvents()
-        # bonuses = 0
-        log = self.database.fetch_all_contacts_asc()
-        # catpower = ""
-        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,
-                # )
-                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: {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:
-                    # hiscall = contact.get("Call", "")
-                    # hisclass = contact.get("class")
-                    # hissection = contact.get("section")
-                    the_date_and_time = contact.get("TS", "")
-                    # band = contact.get("Band", "")
-                    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
-            )
-            # self.infobox.insertPlainText(" Failed\n\n")
-            # app.processEvents()
-            return
-        # self.infobox.insertPlainText(" Done\n\n")
+        self.contest.cabrillo(self)
 
 
 def load_fonts_from_dir(directory: str) -> set:

{not1mm-23.3.24.1 → not1mm-23.3.27}/not1mm/data/main.ui

@@ -789,6 +789,7 @@
     <addaction name="actionQRZ_Settings"/>
     <addaction name="actionConnection_Settings"/>
     <addaction name="actionGenerate_Cabrillo"/>
+    <addaction name="actionGenerate_ADIF"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -930,6 +931,11 @@
     <string>Log Window</string>
    </property>
   </action>
+  <action name="actionGenerate_ADIF">
+   <property name="text">
+    <string>Generate ADIF</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

{not1mm-23.3.24.1 → 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"