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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Merged
This commit is contained in:
OH1KH 2017-11-21 06:51:59 +02:00
commit 4979a1dcf9
4 changed files with 69 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CHANGELOG
View File

@ -3,9 +3,8 @@ Legend:
+ new feature
- bugfix
--------------------
2.1.0 (17.11.2017)
-CQ-monitor: Calling CQ SOMETEXT without own call (!!!???!) caused porgram halt. Fixed these to NOCALL(Saku, OH1KH)
2.1.0 (12.11.2017)
-CQ-monitor: Calling CQ SOMETEXT without own call (!!!???!) caused porgram halt. Fixed these to NOCALL(Saku, OH1KH)
-"Re/Set" button in Export "Choose fields to export" position conflicts with "Most recent entries on top" checkbox. Moved.(Saku, OH1KH)
+CQ monitor: Alert checkboxes to buttons (Saku, OH1KH)
+CQ monitor: Text search can now switch to call search (only call checked, not whole line).Wildcards and multiple (,) separated search items. (Saku, OH1KH)

2
src/fGrayline.lfm
View File

@ -121,7 +121,7 @@ object frmGrayline: TfrmGrayline
OnPaint = FormPaint
OnShow = FormShow
ShowHint = True
LCLVersion = '1.4.4.0'
LCLVersion = '1.6.4.0'
object sbtnGrayLine: TSpeedButton
Left = 400
Height = 16

39
src/fGrayline.pas
View File

@ -224,6 +224,37 @@ procedure TRBNThread.AddToList(spot : String);
end;
end;
procedure ParseSpot(spot : String; var spotter, dxstn, freq, mode, stren : String);
var
i : Integer;
y : Integer;
b : Array of String[50];
p : Integer=0;
begin
SetLength(b,1);
for i:=1 to Length(spot) do
begin
if spot[i]<>' ' then
b[p] := b[p]+spot[i]
else begin
if (b[p]<>'') then
begin
inc(p);
SetLength(b,p+1)
end
end
end;
spotter := b[2];
i := pos('-', spotter);
if i > 0 then
spotter := copy(spotter, 1, i-1);
dxstn := b[4];
freq := b[3];
mode := b[5];
stren := b[6]
end;
var
spotter : String;
call : String;
@ -235,9 +266,10 @@ var
band : String;
tmp : Integer;
wCall : String;
mode : String;
latitude, longitude: Currency;
begin
call := trim(copy(spot,27,12));
ParseSpot(spot, spotter, call, freq, mode, stren);
if watchFor<>'' then
begin
@ -252,11 +284,6 @@ begin
end
end;
spotter := trim(copy(spot,7,Pos('-',spot)-7));
freq := trim(copy(spot,18,9));
stren := trim(copy(spot,Pos('dB',spot)-4,4));
if dmData.DebugLevel>=1 then
begin
Writeln('Spotter:',spotter,'*');

57
src/fRbnMonitor.pas
View File

@ -280,8 +280,40 @@ begin
end;
procedure TRBNThread.Execute;
procedure ParseSpot(spot : String; var spotter, dxstn, freq, mode, stren : String);
var
i : Integer;
y : Integer;
b : Array of String[50];
p : Integer=0;
begin
SetLength(b,1);
for i:=1 to Length(spot) do
begin
if spot[i]<>' ' then
b[p] := b[p]+spot[i]
else begin
if (b[p]<>'') then
begin
inc(p);
SetLength(b,p+1)
end
end
end;
spotter := b[2];
i := pos('-', spotter);
if i > 0 then
spotter := copy(spotter, 1, i-1);
dxstn := b[4];
freq := b[3];
mode := b[5];
stren := b[6]
end;
var
spot : String;
spot : String;
spotter : String;
freq : String;
stren : String;
@ -316,28 +348,7 @@ begin
Continue
end;
if (Pos('-',copy(spot,1,17))>0) then
spotter := trim(copy(spot,7,Pos('-',spot)-7))
else
spotter := trim(copy(spot,7,Pos(':',spot)-7));
freq := trim(copy(spot,18,9));
stren := trim(copy(spot,Pos('dB',spot)-4,4));
Writeln(spotter);
Writeln(freq);
dxstn := copy(spot,Pos('.',spot)+3,Length(spot)-Pos('.',spot)-1);
dxstn := trim(dxstn);
dxstn := trim(copy(dxstn,1,Pos(' ',dxstn)));
mode := trim(copy(spot,41,6));
Writeln(mode);
if (Pos(','+mode+',',','+C_RBN_MODES+',') = 0) then //some rbn nodes doesn't have mode value
begin
mode := frmRbnMonitor.getModeFromFreq(freq)
end;
Writeln(mode);
ParseSpot(spot, spotter, dxstn, freq, mode, stren);
if dmData.UsesLotw(dxstn) then
LoTW := 'L'