Skip to content

Commit 2ae88e4

Browse files
mbridakmbridak
committed
@mbridak Add RTC to Winter Field Day, Stew Perry, REF, RAEM, NAQP, LZ-DX, JIDX
1 parent 6d4c66b commit 2ae88e4

15 files changed

+164
-26
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changelog
22

3+
- [24-12-9] Add RTC to Winter Field Day, Stew Perry, REF, RAEM, NAQP, LZ-DX, JIDX
34
- [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.
45
- [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.
56
- [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY.

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
208208

209209
## Recent Changes (Polishing the Turd)
210210

211+
- [24-12-9] Add RTC to Winter Field Day, Stew Perry, REF, RAEM, NAQP, LZ-DX, JIDX
211212
- [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.
212213
- [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.
213214
- [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY.

‎not1mm/lib/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""It's the version"""
22

3-
__version__ = "24.12.8.2"
3+
__version__ = "24.12.9"

‎not1mm/plugins/jidx_cw.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
from PyQt6 import QtWidgets
4040

41-
from not1mm.lib.plugin_common import gen_adif, get_points
41+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
4242
from not1mm.lib.version import __version__
4343

4444
logger = logging.getLogger(__name__)
@@ -488,3 +488,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
488488
self.save_contact()
489489
continue
490490
self.process_function_key(button)
491+
492+
493+
def get_mults(self):
494+
"""Get mults for RTC XML"""
495+
mults = {}
496+
mults["country"] = show_mults(self)
497+
return mults
498+
499+
500+
def just_points(self):
501+
"""Get points for RTC XML"""
502+
return get_points(self)

‎not1mm/plugins/jidx_ph.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from PyQt6 import QtWidgets
1111

12-
from not1mm.lib.plugin_common import gen_adif, get_points
12+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
1313
from not1mm.lib.version import __version__
1414

1515
logger = logging.getLogger(__name__)
@@ -457,3 +457,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
457457
self.save_contact()
458458
continue
459459
self.process_function_key(button)
460+
461+
462+
def get_mults(self):
463+
"""Get mults for RTC XML"""
464+
mults = {}
465+
mults["country"] = show_mults(self)
466+
return mults
467+
468+
469+
def just_points(self):
470+
"""Get points for RTC XML"""
471+
return get_points(self)

‎not1mm/plugins/lz-dx.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
from PyQt6 import QtWidgets
4242

43-
from not1mm.lib.plugin_common import gen_adif, get_points
43+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
4444

4545
from not1mm.lib.version import __version__
4646

@@ -624,3 +624,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
624624
self.save_contact()
625625
continue
626626
self.process_function_key(button)
627+
628+
629+
def get_mults(self):
630+
"""Get mults for RTC XML"""
631+
mults = {}
632+
mults["state"] = show_mults(self)
633+
return mults
634+
635+
636+
def just_points(self):
637+
"""Get points for RTC XML"""
638+
return get_points(self)

‎not1mm/plugins/naqp_cw.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
from PyQt6 import QtWidgets
4242

43-
from not1mm.lib.plugin_common import gen_adif, get_points
43+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
4444
from not1mm.lib.version import __version__
4545

4646
logger = logging.getLogger(__name__)
@@ -559,3 +559,15 @@ def check_call_history(self):
559559
self.other_1.setText(f"{result.get('Name', '')}")
560560
if self.other_2.text() == "":
561561
self.other_2.setText(f"{result.get('State', '')}")
562+
563+
564+
def get_mults(self):
565+
"""Get mults for RTC XML"""
566+
mults = {}
567+
mults["state"] = show_mults(self)
568+
return mults
569+
570+
571+
def just_points(self):
572+
"""Get points for RTC XML"""
573+
return get_points(self)

‎not1mm/plugins/naqp_rtty.py

+17-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
# Exchange: NA: Name + (state/DC/province/country)
2121
# non-NA: Name
2222
# Work stations: Once per band
23-
# QSO Points: NA station: 1 point per QSO
24-
# non-NA station: 1 point per QSO with an NA station
23+
# QSO Points: NA station: 1 point per QSO
24+
# non-NA station: 1 point per QSO with an NA station
2525
# Multipliers: Each US state and DC (including KH6/KL7) once per band
26-
# Each VE province/territory once per band
27-
# Each North American country (except W/VE) once per band
26+
# Each VE province/territory once per band
27+
# Each North American country (except W/VE) once per band
2828
# Score Calculation: Total score = total QSO points x total mults
2929
# E-mail logs to: (none)
3030
# Upload log at: http://www.ncjweb.com/naqplogsubmit/
@@ -41,7 +41,7 @@
4141
from PyQt6 import QtWidgets
4242

4343
from not1mm.lib.ham_utility import get_logged_band
44-
from not1mm.lib.plugin_common import gen_adif, get_points
44+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
4545
from not1mm.lib.version import __version__
4646

4747
logger = logging.getLogger(__name__)
@@ -666,3 +666,15 @@ def check_call_history(self):
666666
self.other_1.setText(f"{result.get('Name', '')}")
667667
if self.other_2.text() == "":
668668
self.other_2.setText(f"{result.get('State', '')}")
669+
670+
671+
def get_mults(self):
672+
"""Get mults for RTC XML"""
673+
mults = {}
674+
mults["state"] = show_mults(self)
675+
return mults
676+
677+
678+
def just_points(self):
679+
"""Get points for RTC XML"""
680+
return get_points(self)

‎not1mm/plugins/naqp_ssb.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from PyQt6 import QtWidgets
1212

13-
from not1mm.lib.plugin_common import gen_adif, get_points
13+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
1414
from not1mm.lib.version import __version__
1515

1616
logger = logging.getLogger(__name__)
@@ -529,3 +529,15 @@ def check_call_history(self):
529529
self.other_1.setText(f"{result.get('Name', '')}")
530530
if self.other_2.text() == "":
531531
self.other_2.setText(f"{result.get('State', '')}")
532+
533+
534+
def get_mults(self):
535+
"""Get mults for RTC XML"""
536+
mults = {}
537+
mults["state"] = show_mults(self)
538+
return mults
539+
540+
541+
def just_points(self):
542+
"""Get points for RTC XML"""
543+
return get_points(self)

‎not1mm/plugins/raem.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
from PyQt6 import QtWidgets
5252

53-
from not1mm.lib.plugin_common import gen_adif, get_points
53+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
5454
from not1mm.lib.version import __version__
5555

5656
logger = logging.getLogger(__name__)
@@ -603,3 +603,14 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
603603
self.save_contact()
604604
continue
605605
self.process_function_key(button)
606+
607+
608+
def get_mults(self):
609+
"""Get mults for RTC XML"""
610+
mults = {}
611+
return mults
612+
613+
614+
def just_points(self):
615+
"""Get points for RTC XML"""
616+
return get_points(self)

‎not1mm/plugins/ref_cw.py

+20-5
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
from PyQt6 import QtWidgets
4949

50-
from not1mm.lib.plugin_common import gen_adif, get_points
50+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
5151

5252
from not1mm.lib.version import __version__
5353

@@ -242,11 +242,14 @@ def points(self):
242242
return 0
243243

244244

245-
def show_mults(self):
245+
def show_mults(self, rtc=None):
246246
"""Return display string for mults"""
247-
return int(self.database.fetch_mult_count(1).get("count", 0)) + int(
248-
self.database.fetch_mult_count(2).get("count", 0)
249-
)
247+
one = int(self.database.fetch_mult_count(1).get("count", 0))
248+
two = int(self.database.fetch_mult_count(2).get("count", 0))
249+
if rtc is not None:
250+
return (two, one)
251+
252+
return one + two
250253

251254

252255
def show_qso(self):
@@ -616,3 +619,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
616619
self.save_contact()
617620
continue
618621
self.process_function_key(button)
622+
623+
624+
def get_mults(self):
625+
"""Get mults for RTC XML"""
626+
mults = {}
627+
mults["country"], mults["state"] = show_mults(self, rtc=True)
628+
return mults
629+
630+
631+
def just_points(self):
632+
"""Get points for RTC XML"""
633+
return get_points(self)

‎not1mm/plugins/ref_ssb.py

+20-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
from PyQt6 import QtWidgets
6464

65-
from not1mm.lib.plugin_common import gen_adif, get_points
65+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
6666

6767
from not1mm.lib.version import __version__
6868

@@ -257,11 +257,14 @@ def points(self):
257257
return 0
258258

259259

260-
def show_mults(self):
260+
def show_mults(self, rtc=None):
261261
"""Return display string for mults"""
262-
return int(self.database.fetch_mult_count(1).get("count", 0)) + int(
263-
self.database.fetch_mult_count(2).get("count", 0)
264-
)
262+
one = int(self.database.fetch_mult_count(1).get("count", 0))
263+
two = int(self.database.fetch_mult_count(2).get("count", 0))
264+
if rtc is not None:
265+
return (two, one)
266+
267+
return one + two
265268

266269

267270
def show_qso(self):
@@ -631,3 +634,15 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
631634
self.save_contact()
632635
continue
633636
self.process_function_key(button)
637+
638+
639+
def get_mults(self):
640+
"""Get mults for RTC XML"""
641+
mults = {}
642+
mults["country"], mults["state"] = show_mults(self, rtc=True)
643+
return mults
644+
645+
646+
def just_points(self):
647+
"""Get points for RTC XML"""
648+
return get_points(self)

‎not1mm/plugins/stew_perry_topband.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
from pathlib import Path
3535
from PyQt6 import QtWidgets
36-
from not1mm.lib.plugin_common import gen_adif, get_points
36+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
3737
from not1mm.lib.version import __version__
3838
from not1mm.lib.ham_utility import distance
3939

@@ -472,3 +472,14 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
472472
self.save_contact()
473473
continue
474474
self.process_function_key(button)
475+
476+
477+
def get_mults(self):
478+
""""""
479+
mults = {}
480+
return mults
481+
482+
483+
def just_points(self):
484+
""""""
485+
return get_points(self)

‎not1mm/plugins/winter_field_day.py

+14-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
from pathlib import Path
2323
from PyQt6 import QtWidgets
24-
from not1mm.lib.plugin_common import gen_adif, get_points
24+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
2525
from not1mm.lib.version import __version__
2626

2727
logger = logging.getLogger(__name__)
2828

2929
EXCHANGE_HINT = "1O ORG"
3030

31-
cabrillo_name = "WFD"
31+
cabrillo_name = "WFDA-CONTEST"
3232
name = "Winter Field Day"
3333
# 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
3434
mode = "BOTH" # CW SSB BOTH RTTY
@@ -467,3 +467,15 @@ def check_call_history(self):
467467
self.other_1.setText(f"{result.get('Exch1', '')}")
468468
if self.other_2.text() == "":
469469
self.other_2.setText(f"{result.get('Sect', '')}")
470+
471+
472+
def get_mults(self):
473+
""""""
474+
mults = {}
475+
mults["wpxprefix"] = show_mults(self)
476+
return mults
477+
478+
479+
def just_points(self):
480+
""""""
481+
return get_points(self)

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "not1mm"
7-
version = "24.12.8.2"
7+
version = "24.12.9"
88
description = "NOT1MM Logger"
99
readme = "README.md"
1010
requires-python = ">=3.9"

0 commit comments

Comments
 (0)