Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

187 add support for jarl major contests #192

Merged
merged 5 commits into from
Mar 1, 2023
Merged

187 add support for jarl major contests #192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9df4db
Initial implementation of JARL contests
jr8ppg Feb 25, 2023
e2a58fe
Fixed memory leak in LoadCallHistory() and Change extension of CallHi…
jr8ppg Feb 27, 2023
d640c2d
Fixed some issues in review #192 #187
jr8ppg Feb 28, 2023
567eacb
Fixed charset #192 #187
jr8ppg Feb 28, 2023
55dbcfa
Updated some comments #192 #187
jr8ppg Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions ACAG.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,32 @@ function TACAG.LoadCallHistory(const AUserCallsign : string) : boolean;
tl:= TStringList.Create;
tl.Delimiter := DelimitChar;
tl.StrictDelimiter := True;
rec := nil;

try
CallList.Clear;

slst.LoadFromFile(ParamStr(1) + 'DIC_ACAG.DAT');
slst.LoadFromFile(ParamStr(1) + 'DIC_ACAG.TXT');

for i:= 0 to slst.Count-1 do begin
if (slst.Strings[i].StartsWith('!!Order!!')) then continue;
if (slst.Strings[i].StartsWith('#')) then continue;

tl.DelimitedText := slst.Strings[i];

if (tl.Count > 1) then begin
if (tl.Strings[0] = '!!Order!!') then continue;

if rec = nil then begin
rec := TAcagCallRec.Create;
rec.Call := UpperCase(tl.Strings[0]);
rec.Number := UpperCase(tl.Strings[1]);
if (tl.Count >= 3) then rec.UserText := tl.Strings[2];
if rec.Call = '' then continue;
if rec.Number = '' then continue;
end;

rec.Call := UpperCase(tl.Strings[0]);
rec.Number := UpperCase(tl.Strings[1]);
if (tl.Count >= 3) then rec.UserText := tl.Strings[2];
if rec.Call = '' then continue;
if rec.Number = '' then continue;

CallList.Add(rec);
CallList.Add(rec);
rec := nil;
w7sst marked this conversation as resolved.
Show resolved Hide resolved
end;
end;

Expand Down
24 changes: 15 additions & 9 deletions ALLJA.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,32 @@ function TALLJA.LoadCallHistory(const AUserCallsign : string) : boolean;
tl:= TStringList.Create;
tl.Delimiter := DelimitChar;
tl.StrictDelimiter := True;
rec := nil;

try
CallList.Clear;

slst.LoadFromFile(ParamStr(1) + 'DIC_ALLJA.DAT');
slst.LoadFromFile(ParamStr(1) + 'DIC_ALLJA.TXT');

for i:= 0 to slst.Count-1 do begin
if (slst.Strings[i].StartsWith('!!Order!!')) then continue;
if (slst.Strings[i].StartsWith('#')) then continue;

tl.DelimitedText := slst.Strings[i];

if (tl.Count > 1) then begin
if (tl.Strings[0] = '!!Order!!') then continue;

if rec = nil then begin
rec := TAllJaCallRec.Create;
rec.Call := UpperCase(tl.Strings[0]);
rec.Number := UpperCase(tl.Strings[1]);
if (tl.Count >= 3) then rec.UserText := tl.Strings[2];
if rec.Call = '' then continue;
if rec.Number = '' then continue;
end;

rec.Call := UpperCase(tl.Strings[0]);
rec.Number := UpperCase(tl.Strings[1]);
if (tl.Count >= 3) then rec.UserText := tl.Strings[2];
if rec.Call = '' then continue;
if rec.Number = '' then continue;

CallList.Add(rec);
CallList.Add(rec);
rec := nil;
w7sst marked this conversation as resolved.
Show resolved Hide resolved
end;
end;

Expand Down
4 changes: 4 additions & 0 deletions DIC_ACAG.DAT → DIC_ACAG.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
!!Order!!, Call, Exch1, UserText,
w7sst marked this conversation as resolved.
Show resolved Hide resolved
# JARL contest support
# All Cities All Guns contest
# Last Edit,2023-02-27
7J3AOZ 2715H
7K1BIB 100115M
7K1CPT 100120M
Expand Down
4 changes: 4 additions & 0 deletions DIC_ALLJA.DAT → DIC_ALLJA.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
!!Order!!, Call, Exch1, UserText,
# JARL contest support
# ALL JA contest
# Last Edit,2023-02-27
7J3AOZ 27H
7K1BIB 10M
7K1DPE 13M
Expand Down
2 changes: 2 additions & 0 deletions Log.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ procedure Clear;
ScoreTableSetTitle('UTC', 'Call', 'Recv', 'Sent', 'Pref', 'Chk', 'Wpm');
scArrlDx:
ScoreTableSetTitle('UTC', 'Call', 'Recv', 'Sent', 'Pref', 'Chk', 'Wpm');
scAcag:
ScoreTableSetTitle('UTC', 'Call', 'Recv', 'Sent', 'City', 'Chk', 'Wpm');
else
ScoreTableSetTitle('UTC', 'Call', 'Recv', 'Sent', 'Pref', 'Chk', 'Wpm');
end;
Expand Down