@mbridak Add RTC to RAC Canada Day, ARRL VHF, ARRL Field Day, ARRL SS…

…, ARRL DX, 10 10
mbridak · Dec 11, 2024 · abea88a · abea88a
1 parent 9da0ecd
commit abea88a
Show file tree

Hide file tree

Showing 18 changed files with 257 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- [24-12-11-1] Add RTC to RAC Canada Day, ARRL VHF, ARRL Field Day, ARRL SS, ARRL DX, 10 10
 - [24-12-11] Add RTC to IARU HF, IARU Field Day, DARC XMAS, CQ WW, CQ WPX
 - [24-12-9] Add RTC to Winter Field Day, Stew Perry, REF, RAEM, NAQP, LZ-DX, JIDX
 - [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.

diff --git a/README.md b/README.md
@@ -208,6 +208,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-12-11-1] Add RTC to RAC Canada Day, ARRL VHF, ARRL Field Day, ARRL SS, ARRL DX, 10 10
 - [24-12-11] Add RTC to IARU HF, IARU Field Day, DARC XMAS, CQ WW, CQ WPX
 - [24-12-9] Add RTC to Winter Field Day, Stew Perry, REF, RAEM, NAQP, LZ-DX, JIDX
 - [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.

diff --git a/not1mm/lib/version.py b/not1mm/lib/version.py
@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.12.11"
+__version__ = "24.12.11.1"
diff --git a/not1mm/plugins/10_10_fall_cw.py b/not1mm/plugins/10_10_fall_cw.py
@@ -8,15 +8,15 @@
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
 EXCHANGE_HINT = "Name + 10-10# + SPC"
 
 name = "10 10 FALL CW"
-cabrillo_name = "10-10-FALL-CW"
+cabrillo_name = "10-10"
 mode = "CW"  # CW SSB BOTH RTTY
 # columns = [0, 1, 2, 3, 4, 5, 6, 15]
 columns = [
@@ -453,3 +453,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)
diff --git a/not1mm/plugins/10_10_spring_cw.py b/not1mm/plugins/10_10_spring_cw.py
@@ -7,15 +7,15 @@
 from pathlib import Path
 
 from PyQt6 import QtWidgets
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
 EXCHANGE_HINT = "Name + 10-10# + SPC"
 
 name = "10 10 SPRING CW"
-cabrillo_name = "10-10-SPRING-CW"
+cabrillo_name = "10-10"
 mode = "CW"  # CW SSB BOTH RTTY
 # columns = [0, 1, 2, 3, 4, 5, 6, 15]
 columns = [
@@ -452,3 +452,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)
diff --git a/not1mm/plugins/10_10_summer_phone.py b/not1mm/plugins/10_10_summer_phone.py
@@ -9,15 +9,15 @@
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
 EXCHANGE_HINT = "Name + 10-10# + SPC"
 
 name = "10 10 SUMMER PHONE"
-cabrillo_name = "10-10-SUMMER-PHONE"
+cabrillo_name = "10-10"
 mode = "SSB"  # CW SSB BOTH RTTY
 # columns = [0, 1, 2, 3, 4, 5, 6, 15]
 columns = [
@@ -456,3 +456,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)
diff --git a/not1mm/plugins/10_10_winter_phone.py b/not1mm/plugins/10_10_winter_phone.py
@@ -9,15 +9,15 @@
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
 EXCHANGE_HINT = "Name + 10-10# + SPC"
 
 name = "10 10 WINTER PHONE"
-cabrillo_name = "10-10-WINTER-PHONE"
+cabrillo_name = "10-10"
 mode = "SSB"  # CW SSB BOTH RTTY
 # columns = [0, 1, 2, 3, 4, 5, 6, 15]
 columns = [
@@ -454,3 +454,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)
diff --git a/not1mm/plugins/arrl_dx_cw.py b/not1mm/plugins/arrl_dx_cw.py
@@ -10,7 +10,7 @@
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -140,21 +140,24 @@ def points(self):
     return 0
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
     location = self.cty_lookup(self.station.get("Call", ""))
+    _country, _state = 0, 0
     if location:
         for item in location.items():
             mycountry = item[1].get("primary_pfx", "")
             if mycountry in ["K", "VE"]:
                 result = self.database.fetch_arrldx_country_band_count()
                 if result:
-                    return int(result.get("cb_count", 0))
+                    _country = int(result.get("cb_count", 0))
             else:
                 result = self.database.fetch_arrldx_state_prov_count()
                 if result:
-                    return int(result.get("cb_count", 0))
-    return 0
+                    _state = int(result.get("cb_count", 0))
+    if rtc is not None:
+        return (_country, _state)
+    return _country + _state
 
 
 def show_qso(self):
@@ -511,3 +514,22 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["country"], mults["state"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """"""
+    result = self.database.fetch_points()
+    if result is not None:
+        score = result.get("Points", "0")
+        if score is None:
+            score = "0"
+        return int(score)
+    return 0
diff --git a/not1mm/plugins/arrl_dx_ssb.py b/not1mm/plugins/arrl_dx_ssb.py
@@ -10,7 +10,7 @@
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -140,21 +140,24 @@ def points(self):
     return 0
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
     location = self.cty_lookup(self.station.get("Call", ""))
+    _country, _state = 0, 0
     if location:
         for item in location.items():
             mycountry = item[1].get("primary_pfx", "")
             if mycountry in ["K", "VE"]:
                 result = self.database.fetch_arrldx_country_band_count()
                 if result:
-                    return int(result.get("cb_count", 0))
+                    _country = int(result.get("cb_count", 0))
             else:
                 result = self.database.fetch_arrldx_state_prov_count()
                 if result:
-                    return int(result.get("cb_count", 0))
-    return 0
+                    _state = int(result.get("cb_count", 0))
+    if rtc is not None:
+        return (_country, _state)
+    return _country + _state
 
 
 def show_qso(self):
@@ -510,3 +513,22 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["country"], mults["state"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """"""
+    result = self.database.fetch_points()
+    if result is not None:
+        score = result.get("Points", "0")
+        if score is None:
+            score = "0"
+        return int(score)
+    return 0
diff --git a/not1mm/plugins/arrl_field_day.py b/not1mm/plugins/arrl_field_day.py
@@ -9,7 +9,7 @@
 from PyQt6 import QtWidgets
 
 from not1mm.lib.ham_utility import get_logged_band
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -20,7 +20,7 @@
 
 name = "ARRL Field Day"
 mode = "BOTH"  # CW SSB BOTH RTTY
-cabrillo_name = "ARRL-FD"
+cabrillo_name = "ARRL-FIELD-DAY"
 
 columns = [
     "YYYY-MM-DD HH:MM:SS",
@@ -514,3 +514,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)
diff --git a/not1mm/plugins/arrl_rtty_ru.py b/not1mm/plugins/arrl_rtty_ru.py
@@ -7,6 +7,7 @@
 from pathlib import Path
 
 from PyQt6 import QtWidgets
+from not1mm.lib.plugin_common import online_score_xml
 
 EXCHANGE_HINT = ""
 
@@ -93,7 +94,7 @@ def points(self):
     """Calc point"""
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
 
 
@@ -272,3 +273,19 @@ def cabrillo(self):
 
 def recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
+
+
+# States/Prov.	DXCC	state	country
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["state"], mults["country"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)
diff --git a/not1mm/plugins/arrl_ss_cw.py b/not1mm/plugins/arrl_ss_cw.py
@@ -9,7 +9,7 @@
 
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif
+from not1mm.lib.plugin_common import gen_adif, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -541,3 +541,16 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         self.save_contact()
                         continue
                     self.process_function_key(button)
+
+
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["state"] = show_mults(self)
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)