not1mm 24.12.9__py3-none-any.whl → 24.12.11.1__py3-none-any.whl

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.12.9"
+__version__ = "24.12.11.1"

not1mm/plugins/10_10_fall_cw.py

@@ -8,7 +8,7 @@ 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__)
@@ -16,7 +16,7 @@ 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)

not1mm/plugins/10_10_spring_cw.py

@@ -7,7 +7,7 @@ import logging
 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__)
@@ -15,7 +15,7 @@ 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)

not1mm/plugins/10_10_summer_phone.py

@@ -9,7 +9,7 @@ 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__)
@@ -17,7 +17,7 @@ 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)

not1mm/plugins/10_10_winter_phone.py

@@ -9,7 +9,7 @@ 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__)
@@ -17,7 +17,7 @@ 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)

not1mm/plugins/arrl_dx_cw.py

@@ -10,7 +10,7 @@ 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__)
@@ -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

not1mm/plugins/arrl_dx_ssb.py

@@ -10,7 +10,7 @@ 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__)
@@ -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

not1mm/plugins/arrl_field_day.py

@@ -9,7 +9,7 @@ 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, 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 @@ EXCHANGE_HINT = "1D ORG"
 
 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)

not1mm/plugins/arrl_rtty_ru.py

@@ -7,6 +7,7 @@ from decimal import Decimal
 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)

not1mm/plugins/arrl_ss_cw.py

@@ -9,7 +9,7 @@ from pathlib import Path
 
 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)

not1mm/plugins/arrl_ss_phone.py

@@ -9,7 +9,7 @@ from pathlib import Path
 
 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__)
@@ -522,3 +522,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)

not1mm/plugins/arrl_vhf_jan.py

@@ -44,7 +44,7 @@ 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, 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__)
@@ -633,3 +633,23 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('Loc1', '')}")
+
+
+# gridsquare
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["gridsquare"] = show_mults(self)
+    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

not1mm/plugins/arrl_vhf_jun.py

@@ -12,7 +12,7 @@ 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, 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__)
@@ -601,3 +601,23 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('Loc1', '')}")
+
+
+# gridsquare
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["gridsquare"] = show_mults(self)
+    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

not1mm/plugins/arrl_vhf_sep.py

@@ -12,7 +12,7 @@ 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, 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__)
@@ -22,7 +22,7 @@ EXCHANGE_HINT = "4-character grid square"
 
 name = "ARRL VHF SEP"
 mode = "BOTH"  # CW SSB BOTH RTTY
-cabrillo_name = "ARRL-VHF-SEP"
+cabrillo_name = "ARRL-VHF"
 
 columns = [
     "YYYY-MM-DD HH:MM:SS",
@@ -604,3 +604,21 @@ def check_call_history(self):
 
 
 # !!Order!!,Call,Name,Loc1,UserText,
+# gridsquare
+def get_mults(self):
+    """"""
+
+    mults = {}
+    mults["gridsquare"] = show_mults(self)
+    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

not1mm/plugins/canada_day.py

@@ -9,7 +9,7 @@ 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__)
@@ -17,7 +17,7 @@ logger = logging.getLogger(__name__)
 EXCHANGE_HINT = "Province/Territory"
 
 name = "CANADA DAY"
-cabrillo_name = "CANADA-DAY"
+cabrillo_name = "RAC"
 mode = "BOTH"  # CW SSB BOTH RTTY
 
 columns = [
@@ -501,3 +501,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["state"] = show_mults(self)
+    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

not1mm/plugins/cq_wpx_cw.py

@@ -46,7 +46,7 @@ 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__)
@@ -547,3 +547,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):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["wpxprefix"] = show_mults(self)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/cq_wpx_rtty.py

@@ -46,7 +46,7 @@ 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, 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__)
@@ -628,3 +628,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                         continue
                     sendstring = f"{sendstring}{self.process_macro(button.toolTip())} "
             self.fldigi_util.send_string(sendstring)
+
+
+def get_mults(self):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["wpxprefix"] = show_mults(self)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/cq_wpx_ssb.py

@@ -9,7 +9,7 @@ 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__)
@@ -508,3 +508,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):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["wpxprefix"] = show_mults(self)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/cq_ww_cw.py

@@ -177,26 +177,19 @@ def points(self):
     return 0
 
 
-def get_mults(self):
-    """"""
-    mults = {}
-    mults["zone"] = self.database.fetch_zn_band_count().get("zb_count", 0)
-    mults["country"] = self.database.fetch_country_band_count().get("cb_count", 0)
-    return mults
-
-
-def just_points(self):
-    """"""
-    return self.database.fetch_points().get("Points", "0")
-
-
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
+    _zone = 0
+    _country = 0
     result1 = self.database.fetch_zn_band_count()
     result2 = self.database.fetch_country_band_count()
-    if result1 and result2:
-        return int(result1.get("zb_count", 0)) + int(result2.get("cb_count", 0))
-    return 0
+    if result1:
+        _zone = int(result1.get("zb_count", 0))
+    if result2:
+        _country = int(result2.get("cb_count", 0))
+    if rtc is not None:
+        return (_country, _zone)
+    return _country + _zone
 
 
 def show_qso(self):
@@ -551,3 +544,15 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('CQZone', '')}")
+
+
+def get_mults(self):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["country"], mults["zone"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/cq_ww_rtty.py

@@ -46,7 +46,7 @@ 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, 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__)
@@ -169,24 +169,30 @@ def points(self):
     return 0
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
 
     # Multipliers:	    W/VE Stations: Each US state/VE area once per band
     #                   Each DXCC/WAE country once per band
     #                   Each CQ zone once per band
 
+    _zone, _country, _spc_count = 0, 0, 0
     result1 = self.database.fetch_zn_band_count()
     result2 = self.database.fetch_country_band_count()
     res3_query = f"select count(DISTINCT(Exchange1 || ':' || Band)) as spc_count from dxlog where ContestNR = {self.database.current_contest};"
     result3 = self.database.exec_sql(res3_query)
-    if result1 and result2 and result3:
-        return (
-            int(result1.get("zb_count", 0))
-            + int(result2.get("cb_count", 0))
-            + int(result3.get("spc_count", 0))
-        )
-    return 0
+
+    if result1:
+        _zone = int(result1.get("zb_count", 0))
+    if result2:
+        _country = int(result2.get("cb_count", 0))
+    if result3:
+        _spc_count = int(result3.get("spc_count", 0))
+
+    if rtc is not None:
+        return (_country + _spc_count, _zone)
+
+    return _country + _spc_count + _zone
 
 
 def show_qso(self):
@@ -647,3 +653,15 @@ def check_call_history(self):
             self.other_1.setText(f"{result.get('CQZone', '')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('State', '')}")
+
+
+def get_mults(self):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["country"], mults["zone"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/cq_ww_ssb.py

@@ -43,7 +43,7 @@ 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__)
@@ -167,13 +167,19 @@ def points(self):
     return 0
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
+    _zone = 0
+    _country = 0
     result1 = self.database.fetch_zn_band_count()
     result2 = self.database.fetch_country_band_count()
-    if result1 and result2:
-        return int(result1.get("zb_count", 0)) + int(result2.get("cb_count", 0))
-    return 0
+    if result1:
+        _zone = int(result1.get("zb_count", 0))
+    if result2:
+        _country = int(result2.get("cb_count", 0))
+    if rtc is not None:
+        return (_country, _zone)
+    return _country + _zone
 
 
 def show_qso(self):
@@ -525,3 +531,15 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('CQZone', '')}")
+
+
+def get_mults(self):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["country"], mults["zone"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/darc_xmas.py

@@ -32,7 +32,7 @@ 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__)
@@ -176,11 +176,14 @@ def points(self):
     return 1
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
-    return int(self.database.fetch_mult_count(1).get("count", 0)) + int(
-        self.database.fetch_mult_count(2).get("count", 0)
-    )
+    _wpx = int(self.database.fetch_mult_count(1).get("count", 0))
+    _dok = int(self.database.fetch_mult_count(2).get("count", 0))
+    if rtc is not None:
+        return (_dok, _wpx)
+
+    return _wpx + _dok
 
 
 def show_qso(self):
@@ -561,3 +564,15 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":
             self.other_1.setText(f"{result.get('Exch1', '')}")
+
+
+def get_mults(self):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["state"], mults["wpxprefix"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/helvetia.py

@@ -237,11 +237,14 @@ def points(self):
     return 0
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
-    return int(self.database.fetch_mult_count(1).get("count", 0)) + int(
-        self.database.fetch_mult_count(2).get("count", 0)
-    )
+    one = int(self.database.fetch_mult_count(1).get("count", 0))
+    two = int(self.database.fetch_mult_count(2).get("count", 0))
+    if rtc is not None:
+        return (two, one)
+
+    return one + two
 
 
 def show_qso(self):
@@ -625,3 +628,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):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["country"], mults["state"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/iaru_fieldday_r1_cw.py

@@ -39,7 +39,7 @@ 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__)
@@ -47,7 +47,7 @@ logger = logging.getLogger(__name__)
 EXCHANGE_HINT = "#"
 
 name = "IARU FIELDDAY R1 DARC CW"
-cabrillo_name = "IARU-FD-R1-DARC-CW"
+cabrillo_name = "FIELDDAY-REGION-1"
 mode = "CW"  # CW SSB BOTH RTTY
 # columns = [0, 1, 2, 3, 4, 5, 6, 9, 11, 15]
 columns = [
@@ -527,3 +527,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):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["country"] = show_mults(self)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/iaru_fieldday_r1_ssb.py

@@ -39,7 +39,7 @@ 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__)
@@ -47,7 +47,7 @@ logger = logging.getLogger(__name__)
 EXCHANGE_HINT = "#"
 
 name = "IARU FIELDDAY R1 DARC SSB"
-cabrillo_name = "IARU-FD-R1-DARC-SSB"
+cabrillo_name = "FIELDDAY-REGION-1"
 mode = "SSB"  # CW SSB BOTH RTTY
 # columns = [0, 1, 2, 3, 4, 5, 6, 9, 11, 15]
 columns = [
@@ -527,3 +527,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):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["country"] = show_mults(self)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/iaru_hf.py

@@ -22,7 +22,7 @@ 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__)
@@ -143,12 +143,28 @@ def points(self):
     return 5
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
+    # select count(DISTINCT(ZN || ':' || Band || ':' || Mode)) as zbm_count from dxlog where ContestNR = 14 and typeof(ZN)!="integer";
+    total_mults = 0
     result1 = self.database.fetch_zn_band_mode_count()
     if result1:
-        return int(result1.get("zbm_count", 0))
-    return 0
+        total_mults = int(result1.get("zbm_count", 0))
+
+    query = (
+        f"select count(DISTINCT(ZN || ':' || Band || ':' || Mode)) "
+        f"as zbm_count from dxlog where ContestNR = {self.pref.get('contest', '1')} "
+        f"and typeof(ZN)!='integer';"
+    )
+    result = self.database.exec_sql(query)
+    hq_count = int(result.get("zbm_count", 0))
+
+    zones = total_mults - hq_count
+
+    if rtc is not None:
+        return (hq_count, zones)
+
+    return total_mults
 
 
 def show_qso(self):
@@ -479,7 +495,7 @@ 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('Exch1', '')}, {result.get('UserText','...')}"
+            f"{result.get('Call', '')}, {result.get('Sect', '')}, {result.get('UserText','...')}"
         )
     else:
         self.history_info.setText("")
@@ -491,4 +507,17 @@ def check_call_history(self):
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
-            self.other_2.setText(f"{result.get('Exch1', '')}")
+            self.other_2.setText(f"{result.get('Sect', '')}")
+
+
+def get_mults(self):
+    """Get mults for RTC XML"""
+
+    mults = {}
+    mults["state"], mults["zone"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

{not1mm-24.12.9.dist-info → not1mm-24.12.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.12.9
+Version: 24.12.11.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -239,6 +239,8 @@ 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.
 - [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.

{not1mm-24.12.9.dist-info → not1mm-24.12.11.1.dist-info}/RECORD

@@ -115,40 +115,40 @@ not1mm/lib/plugin_common.py,sha256=-cvXtEAUgZ7GtxaNiwVdHbZ-7wEBeoMPRZXNdCxnPyA,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=j5lIMLHJ-eqIaVr_QhI82gkbOl17_C-5suRkWbHYET8,14717
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=kW55e9c7_3zPa1m5mdA-ztXMdCwYpa9CSVJDZmKiq2c,48
+not1mm/lib/version.py,sha256=EaaO76hhYOzheZe2yYhIbnhLOsBZ5g20OOXN_3kiB6A,51
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
-not1mm/plugins/10_10_fall_cw.py,sha256=YDuAd9wb0XIVl1jWn4foBRWoPc7YfaWcEnl8EYsZtdI,14578
-not1mm/plugins/10_10_spring_cw.py,sha256=Dqhd3dcSJk-H1cNayLfjJbstzWePt86iFY9BrpW6gnU,14583
-not1mm/plugins/10_10_summer_phone.py,sha256=4jgpzNB1RS0To4URWmItS8ZuIOlK7gW9O2HAojSIJGQ,14696
-not1mm/plugins/10_10_winter_phone.py,sha256=Z1Yqge84-6s1PFyL5aLXt5sa8nPZrw0jki4en-URqtw,14595
+not1mm/plugins/10_10_fall_cw.py,sha256=5QUyGMvGBC-HxcY_z9QbfuxSg3f7p6C9K4qhTxgZE7k,14719
+not1mm/plugins/10_10_spring_cw.py,sha256=XjYFM263WYyG6nVQzPObW4YC7Z9L93rixSOcVsxPvH4,14722
+not1mm/plugins/10_10_summer_phone.py,sha256=ry2HPL3W_59lXhg9eglPBucwtGVfsNIi36llGH9Ano0,14832
+not1mm/plugins/10_10_winter_phone.py,sha256=k4aTQAKqy9SNIKxyueIgRmS5kWwisi-VDg4EhS81-dU,14731
 not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/plugins/arrl_10m.py,sha256=EzVBMdyVtm4LWH-5YR_s--Z7dA8xXLOVTcnAW4ZmLFQ,18325
 not1mm/plugins/arrl_160m.py,sha256=9SHfxjTX_LECOYDsICnoX_Q133atojsJbmFapehleYE,20236
-not1mm/plugins/arrl_dx_cw.py,sha256=lTEoFMvy7C5x23DN3pPgwXR-1wkxwcRYBfZsxP_Jf5M,17509
-not1mm/plugins/arrl_dx_ssb.py,sha256=OZW12_NvgE8EBaT2q0meglOi3XkEaVd7fH41qffcM2U,17512
-not1mm/plugins/arrl_field_day.py,sha256=96gD6Xg8ncgEHXk3rouqvMd-ux-FbHKsBEGTwKoK9kE,16587
-not1mm/plugins/arrl_rtty_ru.py,sha256=npOuf7OxcF0BbvpXJuPOLwf0-wONbDlGW7_B_-BSFz0,7370
-not1mm/plugins/arrl_ss_cw.py,sha256=lLWCIVYiAYri08gwsHaFCG2OFcm6ox-o5_sN5o--EQM,17271
-not1mm/plugins/arrl_ss_phone.py,sha256=RKsfqzfghvyyBNgLR3JbII-Kjl3EYrKTuBWbf-h-MFs,16607
-not1mm/plugins/arrl_vhf_jan.py,sha256=lIeZVLPW9afO_MtG3y-nSPi1ZNamNk44zHUqtTa28c8,19890
-not1mm/plugins/arrl_vhf_jun.py,sha256=jmBKhEWL-6VK9Rcuc-jlU2-6gyXv7jiBCUkRZ3tWLik,18982
-not1mm/plugins/arrl_vhf_sep.py,sha256=SgILjeGZ4Z6_lz5Bq2uov0kntBbqf57FoIl7dyaFN9Q,19021
-not1mm/plugins/canada_day.py,sha256=C29L8PWYjXwuQmuh-bkN32eeoex6h5DsWWWpgmntQyo,15354
+not1mm/plugins/arrl_dx_cw.py,sha256=4UMN1HWPNbkz2T6K33GJ0wUkE7yq46C57C6BUwbu5cs,18014
+not1mm/plugins/arrl_dx_ssb.py,sha256=X2C0hPY45_CvA2_97O0NAw3HF4QGgs5o0WVTlwMMme8,18017
+not1mm/plugins/arrl_field_day.py,sha256=X7BLs87ikQEm1xuh2sSj-8KcFA9pqnut6uFGM2xJe7c,16743
+not1mm/plugins/arrl_rtty_ru.py,sha256=Cov4_0AQEWSmj8hjiuW_lgpqRZHuxqufbXBbKjPYLH4,7667
+not1mm/plugins/arrl_ss_cw.py,sha256=uv71xstpmBiDTyU5zF8pe6UIS-5v6hi0aMBksbPvCzc,17458
+not1mm/plugins/arrl_ss_phone.py,sha256=V3dgBXoLb3mWMbb1s-ovx-SoUBL5IxE8omkQbP7siwk,16794
+not1mm/plugins/arrl_vhf_jan.py,sha256=SDk0gGg00XPuCpl6DsyozAnEoOBgiS1wMUhDPPB5RsM,20267
+not1mm/plugins/arrl_vhf_jun.py,sha256=q-g5IK29pXrT1Pn_cY4LeCO2sd8YaaE1Cn8KBG3Vwrk,19359
+not1mm/plugins/arrl_vhf_sep.py,sha256=yj-NaUVjMEYzt-1UN8f2xDDTwJS2foBzjnDr-cvTmcs,19392
+not1mm/plugins/canada_day.py,sha256=23xicRglQbuHu4Qx9BsMpbjKzmhLpKGL-TxwDCLCwZo,15706
 not1mm/plugins/cq_160_cw.py,sha256=Ks41--f-p46rpDeOlzJmLgg7Coj0nyVLuTNWFr7eVHw,18664
 not1mm/plugins/cq_160_ssb.py,sha256=NqPO9EJzuvjLcacvUn-NJUoeWBUL9lSHYZ-N3Vyfjxk,18707
-not1mm/plugins/cq_wpx_cw.py,sha256=n3X0lNjQKm0fSyBTRS-d8s0_7ccZ3wMUBSNCWWOVMrk,17952
-not1mm/plugins/cq_wpx_rtty.py,sha256=2x5qp8ThxkLlbaT3ItYfqK2cWl0FWB27Q80U4oZRsvA,20771
-not1mm/plugins/cq_wpx_ssb.py,sha256=lZdQgCX_DWDhEpWJ643XUAkntKK6Bv67DOdNyoSNgig,16519
-not1mm/plugins/cq_ww_cw.py,sha256=-z-UNzHrjpdCbsqLmivinHQalrE3SFLGIKX4rOSijJo,18339
-not1mm/plugins/cq_ww_rtty.py,sha256=pKIvigbbDwSd9QxRsVmGcfE5Wyy1in9lXjVD-8Ikpgo,22080
-not1mm/plugins/cq_ww_ssb.py,sha256=3IFCJLc9YNRSaSHazE92V9Ds_tiE-0td1sXIWk90I8k,17600
+not1mm/plugins/cq_wpx_cw.py,sha256=7ZWO9iqNVKjCZXG_5bUEtpahTgRHLc7ebQhvsQTATh0,18185
+not1mm/plugins/cq_wpx_rtty.py,sha256=2QoZzGg01wMIPRLxVUmS-Pke0iJvakr_prBzPnekHpc,21004
+not1mm/plugins/cq_wpx_ssb.py,sha256=WeUQoXbGDxzg603Ai6vmtw-Lc9LVXwwreamqXu--unY,16752
+not1mm/plugins/cq_ww_cw.py,sha256=qWtKnzrm5Ifi7VxExFWidyX1aEGid5I1XExYXsWEGs0,18393
+not1mm/plugins/cq_ww_rtty.py,sha256=RJywVSNujM4CxxTRCGKXhjmbz6OMzGR5eHSAmQcT6Pc,22486
+not1mm/plugins/cq_ww_ssb.py,sha256=uRMXaTfkIt7QJxQBaBAvc2fmT6ak26SzBBezd5k_hMc,17991
 not1mm/plugins/cwt.py,sha256=7BoKVrIywlHpP4f4_mrUyWKVsK6vujreb8jDWyXrwUc,17530
-not1mm/plugins/darc_xmas.py,sha256=SYP35XbR-zyyLmmGb_xCqeNJRqtiuNAja7ufmipt7Ls,18567
+not1mm/plugins/darc_xmas.py,sha256=p9JbOJlEoOsB86E5ciHdrY7L-10tnNEWuTxq9EfCNBM,18907
 not1mm/plugins/general_logging.py,sha256=NV_FCgpAEEQrVRxMDD7nQ2krJgPrhtopizxrGndtUNk,6686
-not1mm/plugins/helvetia.py,sha256=819tSh-NAFDqdT6tWlWmH7qAp2OpQVbz6RSS_iPqpv0,19718
-not1mm/plugins/iaru_fieldday_r1_cw.py,sha256=0nSdjaGi3z0QbhapClkUHAQ3ahVCAovW3jkSCwRpxds,16925
-not1mm/plugins/iaru_fieldday_r1_ssb.py,sha256=cKgwNAQqaY57oIvSVOVEA7dibdEPDKQS0ZelJxCGaBI,16930
-not1mm/plugins/iaru_hf.py,sha256=wqlqKMPO0e3HNgbxbQWpckdFkaZ2e9pD3f5NDMZirCU,15824
+not1mm/plugins/helvetia.py,sha256=CnAq0mXZC2tO_pEwIoDN6MHAv95NPcLRvG1gnjfAcF8,20032
+not1mm/plugins/iaru_fieldday_r1_cw.py,sha256=lueTnK50yRSMqASlktrhuFOJkSBDsQw4OyT9eYwpugU,17155
+not1mm/plugins/iaru_fieldday_r1_ssb.py,sha256=1lYxeo4j_piiFZ_db-vHIHT5c1jSeFPBuw6yf1kur6Y,17159
+not1mm/plugins/iaru_hf.py,sha256=kbiKqg7leyGnULe4BEk0gaZ4uvqR2ya9MOe_Er4mN8U,16658
 not1mm/plugins/icwc_mst.py,sha256=XfaIRIj0BxWvpWk2nmy_dMseVuKVOh-_m3UcIGOy6wI,16475
 not1mm/plugins/jidx_cw.py,sha256=gSScw21ac2Rpdd7jspgh5gnH9JdiR8h3YOa-41B_T94,15881
 not1mm/plugins/jidx_ph.py,sha256=0E5xHs0WXh-x2Z6UC2PGqmLdIkn-jWbENOeLopr7rys,14830
@@ -164,9 +164,9 @@ not1mm/plugins/ref_ssb.py,sha256=vfS9-mcnbw2znRvU4jh20JqI9BXap8jV65OV5mbCkCk,209
 not1mm/plugins/stew_perry_topband.py,sha256=D1hekmMbx-i4BhaP2uzOK3OzaVVMMdgcN3RmfweNqHo,15341
 not1mm/plugins/weekly_rtty.py,sha256=huZszbZsIh4vF3cP80UyPzy3qxIoHdEiT1b6KuvwgYc,20083
 not1mm/plugins/winter_field_day.py,sha256=cSCFwy1LOoDDA9Zs1LHRG3r8spDMSKDisxyPxnVrLjw,15149
-not1mm-24.12.9.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.12.9.dist-info/METADATA,sha256=8dJeJDeZdvtTPTgdO2gloxsWgtgc2aTNzlvmxluaIDg,35940
-not1mm-24.12.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-not1mm-24.12.9.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.12.9.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.12.9.dist-info/RECORD,,
+not1mm-24.12.11.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.12.11.1.dist-info/METADATA,sha256=4v4v9i_hZUKUDdonATSSte33Xx03ONaCaU-WX3bJzPs,36109
+not1mm-24.12.11.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+not1mm-24.12.11.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.12.11.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.12.11.1.dist-info/RECORD,,