hamradio/cqrlog
1
0
Fork 0
mirror of https://github.com/ok2cqr/cqrlog.git synced 2024-09-21 18:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PH #17 Added LineFilter. IsItACall: RR73 is not call

Browse Source
This commit is contained in:
OH1KH 2019-01-29 15:12:02 +02:00
parent bbfc1edddb
commit 5f3ec70ce4
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fMonWsjtx.lfm
View File

@ -1,7 +1,7 @@
object frmMonWsjtx: TfrmMonWsjtx
Left = 16
Left = 183
Height = 362
Top = 216
Top = 70
Width = 582
AllowDropFiles = True
Caption = 'Wsjt-x CQ-monitor'
@ -14,9 +14,10 @@ object frmMonWsjtx: TfrmMonWsjtx
OnShow = FormShow
LCLVersion = '1.8.4.0'
object lblBand: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 12
Left = 10
Height = 17
Top = 12
Width = 33
@ -28,10 +29,11 @@ object frmMonWsjtx: TfrmMonWsjtx
end
object lblMode: TLabel
AnchorSideLeft.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = lblBand
AnchorSideBottom.Side = asrBottom
Left = 534
Left = 536
Height = 17
Top = 12
Width = 36
@ -377,6 +379,10 @@ object frmMonWsjtx: TfrmMonWsjtx
TabOrder = 8
end
object sgMonitor: TStringGrid
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
AnchorSideBottom.Control = pnlFollow
Left = 2
Height = 281
Top = 30

34
src/fMonWsjtx.pas
View File

@ -107,6 +107,7 @@ type
procedure setDefaultColorSgMonitorAttributes;
procedure setMonitorColumnHW;
procedure scrollSgMonitorToLastLine;
function LineFilter(L: string):string;
{ private declarations }
public
DblClickCall :string; //callsign that is called by doubleclick
@ -248,6 +249,18 @@ begin
sgMonitorAttributes[c,r].isBold:=true
end;
end;
function TfrmMonWsjtx.LineFilter(L: string):string;
Begin
if LocalDbg then Writeln('D Message is:', L);
//remove < > from Message here (wsjtx v2.0)
L := StringReplace(L,'<','',[rfReplaceAll]);
L := StringReplace(L,'>','',[rfReplaceAll]);
//cut message if there is a decode note like 'a2'
//175200 ~ OH1KH DL2BQV JO73 a2'
if pos(' ',L) > 11 then L := copy(L,1,pos(' ',L));
if LocalDbg then Writeln('D Message after filter is:', L);
LineFilter := L;
end;
procedure TfrmMonWsjtx.clearSgMonitor;
//removes all rows in stringgrid
@ -977,7 +990,8 @@ begin
//call and continents/prefixes
AddDecodedMessage('175200 @ CQ OH1LL DX', '20M', 'reply', 0, 0);
//old official cq dx
AddDecodedMessage('175200 # '+mycall+' CA1LL AA11', '20M', 'reply', 0, 0);
AddDecodedMessage('175200 ~ '+mycall+' DL2BQV JO73 a2', '20M', 'reply', 0, 0);
AddDecodedMessage('175200 ~ '+mycall+' DL2BQV RR73', '20M', 'reply', 0, 0);
AddDecodedMessage('175200 # CQ 000 PA7ZZ JO22', '20M', 'reply', 0, 0);
AddDecodedMessage('175200 # CQ ASOC PA7ZZ JO22', '20M', 'reply', 0, 0);
AddDecodedMessage('175200 ~ CQ NO EU RZ3DX', '20M', 'reply', 0, 0); // for dbg
@ -996,14 +1010,14 @@ begin
'175200 # CQ OH1LL KP11' + sLineBreak + '175200 @ CQ DX OH1DX KP11' + sLineBreak +
'175200 @ CQ NA RV3NA' + sLineBreak + '175200 @ CQ USA RV3USA' + sLineBreak +
'175200 @ CQ USA RV3USL KO30' + sLineBreak + '175200 @ CQ OH1LL DX' + sLineBreak +
'175200 # '+mycall+' CA1LL AA11' + sLineBreak +
'175200 # '+mycall+' DL2BQV JO73 a2' + sLineBreak +
'175200 # '+mycall+' DL2BQV RR73' + sLineBreak +
'175200 # CQ 000 PA7ZZ JO22' + sLineBreak +
'175200 # CQ ASOC PA7ZZ JO22' + sLineBreak +
'175200 ~ CQ NO EU RZ3DX' + sLineBreak + '201045 ~ CQ KAZAKHSTAN' + sLineBreak +
'201045 ~ CQ WHO EVER' + sLineBreak +
'175200 @ CQ EA7/DL8FCL' + sLineBreak +
'175200 @ CQ <AA2019CALL>' + sLineBreak +
'This fails (similar to locator)' + sLineBreak +
'175200 @ CQ <OH60AB> KP01'
); // for dbg
end;
@ -1065,11 +1079,7 @@ begin
isMyCall := False;
index:=0;
if LocalDbg then Writeln('O Message is:', Message);
//remove < > from Message here (wsjtx v2.0)
Message := StringReplace(Message,'<','',[rfReplaceAll]);
Message := StringReplace(Message,'>','',[rfReplaceAll]);
if LocalDbg then Writeln('O Message after filter is:', Message);
Message := LineFilter(Message);
msgList := TStringList.Create;
msgList.Delimiter := ' ';
@ -1387,7 +1397,7 @@ begin
i := 0;
HasNum := False;
HasChr := False;
NoRprt := (pos('R-',Call) + pos('R+',Call)) < 1; //R-repots are not calls
NoRprt := (pos('R-',Call) + pos('R+',Call) + pos('RR73',Call)) < 1; //R-repots and RR73 are not calls
if (Call <> '') then
begin
repeat
@ -1551,11 +1561,7 @@ begin //TfrmMonWsjtx.AddDecodedMessage
UpperCase(cqrini.ReadString('Station', 'Call', '')), '', Now(), pfx,
mycont, country, WAZ, posun, ITU, lat, long);
if LocalDbg then Writeln('D Message is:', Message);
//remove < > from Message here (wsjtx v2.0)
Message := StringReplace(Message,'<','',[rfReplaceAll]);
Message := StringReplace(Message,'>','',[rfReplaceAll]);
if LocalDbg then Writeln('D Message after filter is:', Message);
Message := LineFilter(Message);
index:=0;
msgList:=TStringList.Create;