not1mm 24.10.21__tar.gz → 24.10.22.1__tar.gz

{not1mm-24.10.21 → not1mm-24.10.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.21
+Version: 24.10.22.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -58,7 +58,7 @@ Requires-Dist: Levenshtein
     - [Other not so supported contests](#other-not-so-supported-contests)
   - [Our Code Contributors ✨](#our-code-contributors-)
   - [List of should be working contests, those in bold have ESM](#list-of-should-be-working-contests-those-in-bold-have-esm)
-  - [Recent Changes](#recent-changes)
+  - [Recent Changes (Polishing the Turd)](#recent-changes-polishing-the-turd)
   - [Flatpak](#flatpak)
   - [Installation](#installation)
     - [Prerequisites](#prerequisites)
@@ -224,13 +224,16 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - **K1USN Slow Speed Test**
 - **NAQP CW, RTTY, SSB**
 - Phone Weekly Test
-- RAC Canada Day
+- **RAC Canada Day**
+- **REF CW, SSB**
 - Stew Perry Topband
 - **Weekly RTTY**
 - **Winter Field Day**
 
-## Recent Changes
+## Recent Changes (Polishing the Turd)
 
+- [24-10-22-1] Fix duplicate spots in bandmap.
+- [24-10-22] Added ESM to RAC Canada Day. Added French REF.
 - [24-10-21] Scaled back the hits returned from the check window from 25 to 20. Seems less resource hungry now.
 - [24-10-20-1] ReWrote how the widgets interact. I porbably broke a thing or two. Let me know. 
 - [24-10-20] Add ESM to ARRL DX.

{not1mm-24.10.21 → not1mm-24.10.22.1}/README.md

@@ -27,7 +27,7 @@
     - [Other not so supported contests](#other-not-so-supported-contests)
   - [Our Code Contributors ✨](#our-code-contributors-)
   - [List of should be working contests, those in bold have ESM](#list-of-should-be-working-contests-those-in-bold-have-esm)
-  - [Recent Changes](#recent-changes)
+  - [Recent Changes (Polishing the Turd)](#recent-changes-polishing-the-turd)
   - [Flatpak](#flatpak)
   - [Installation](#installation)
     - [Prerequisites](#prerequisites)
@@ -193,13 +193,16 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - **K1USN Slow Speed Test**
 - **NAQP CW, RTTY, SSB**
 - Phone Weekly Test
-- RAC Canada Day
+- **RAC Canada Day**
+- **REF CW, SSB**
 - Stew Perry Topband
 - **Weekly RTTY**
 - **Winter Field Day**
 
-## Recent Changes
+## Recent Changes (Polishing the Turd)
 
+- [24-10-22-1] Fix duplicate spots in bandmap.
+- [24-10-22] Added ESM to RAC Canada Day. Added French REF.
 - [24-10-21] Scaled back the hits returned from the check window from 25 to 20. Seems less resource hungry now.
 - [24-10-20-1] ReWrote how the widgets interact. I porbably broke a thing or two. Let me know. 
 - [24-10-20] Add ESM to ARRL DX.

{not1mm-24.10.21 → not1mm-24.10.22.1}/not1mm/bandmap.py

@@ -162,7 +162,7 @@ class Database:
         try:
             if erase:
                 delete_call = (
-                    "delete from spots where callsign = ? and ts < DATETIME();"
+                    "delete from spots where callsign = ? AND comment != 'MARKED';"
                 )
                 self.cursor.execute(delete_call, (spot.get("callsign"),))
                 self.db.commit()
@@ -415,18 +415,8 @@ class BandMapWindow(QDockWidget):
         if packet.get("cmd", "") == "SPOTDX":
             dx = packet.get("dx", "")
             freq = packet.get("freq", 0.0)
-            the_UTC_time = datetime.now(timezone.utc).isoformat(" ")[:19].split()[1]
-            spot = {
-                "ts": "2099-01-01 " + the_UTC_time,
-                "callsign": dx,
-                "freq": freq / 1000,
-                "band": self.currentBand.name,
-                "mode": "DX",
-                "spotter": platform.node(),
-                "comment": "MARKED",
-            }
-            self.spots.addspot(spot, erase=False)
-            self.update_stations()
+            spotdx = f"dx {dx} {freq}"
+            self.send_command(spotdx)
             return
         if packet.get("cmd", "") == "MARKDX":
             dx = packet.get("dx", "")

{not1mm-24.10.21 → not1mm-24.10.22.1}/not1mm/data/main.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>855</width>
-    <height>465</height>
+    <width>785</width>
+    <height>268</height>
    </rect>
   </property>
   <property name="sizePolicy">

{not1mm-24.10.21 → not1mm-24.10.22.1}/not1mm/data/new_contest.ui

@@ -367,6 +367,16 @@
        <string>PHONE WEEKLY TEST</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>REF CW</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>REF SSB</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>STEW PERRY TOPBAND</string>

not1mm-24.10.22.1/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__version__ = "24.10.22.1"

{not1mm-24.10.21 → not1mm-24.10.22.1}/not1mm/plugins/canada_day.py

@@ -51,6 +51,7 @@ RAC_OFFICIAL_STATIONS = [
     "VY0RAC",
     "VY1RAC",
     "VY2RAC",
+    "VE3RHQ",
 ]
 
 PROV_SEC = [
@@ -151,9 +152,6 @@ def predupe(self):
 
 def prefill(self):
     """Fill sentnr"""
-    # if len(self.other_2.text()) == 0:
-    #     self.other_2.setText(str(self.contact.get("ZN", "")))
-
     result = self.database.get_serial()
     serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
@@ -164,8 +162,6 @@ def prefill(self):
     if len(field.text()) == 0:
         field.setText(exchange)
 
-    # self.other_1.setText(str(self.contest_settings.get("SentExchange", 0)))
-
 
 def points(self):
     """Calc point"""
@@ -177,7 +173,7 @@ def points(self):
     if result:
         for item in result.items():
             entity = item[1].get("entity", "")
-            continent = item[1].get("continent", "")
+            # continent = item[1].get("continent", "")
             if entity == "Canada":
                 return 10
 
@@ -401,3 +397,92 @@ def cabrillo(self):
 
 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)
+
+    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_1", "other_2"]:
+            if self.other_1.text() == "" or 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_1", "other_2"]:
+            if self.other_1.text() == "" or 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)

{not1mm-24.10.21 → not1mm-24.10.22.1}/not1mm/plugins/ref_cw.py

@@ -7,13 +7,13 @@ Awards:	Worldwide
 Mode:	CW
 Bands:	80, 40, 20, 15, 10m
 Classes:	Single Op All Band
-Single Op Single Band
-Multi-Single
-Club
-SWL
+            Single Op Single Band
+            Multi-Single
+            Club
+            SWL
 Max power:	HP: >100 Watts
-LP: 100 Watts
-QRP: 5 Watts
+            LP: 100 Watts
+            QRP: 5 Watts
 
 Exchange:	French: RST + Department/Prefix
             non-French: RST + Serial No.
@@ -326,7 +326,7 @@ def recalculate_mults(self):
 
 def adif(self):
     """Call the generate ADIF function"""
-    gen_adif(self, cabrillo_name, "HELVETIA")
+    gen_adif(self, cabrillo_name, "REF-CW")
 
 
 def cabrillo(self):
@@ -500,3 +500,100 @@ def cabrillo(self):
         logger.critical("cabrillo: IO error: %s, writing to %s", exception, filename)
         self.show_message_box(f"Error saving Cabrillo: {exception} {filename}")
         return
+
+
+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 == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_2.text().isnumeric():
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        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 == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_2.text().isnumeric():
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        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)