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

Merge branch 'master' into squash_gr_map

Browse Source
This commit is contained in:
Petr Hlozek 2020-11-23 16:38:33 +01:00 committed by GitHub
commit 615590c0d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
help/img/h8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 95 KiB

1
src/fMain.pas
View File

@ -2337,6 +2337,7 @@ begin
ChangeVis('STX_STRING',cqrini.ReadBool('Columns', 'ContMsgSent', False)); ChangeVis('STX_STRING',cqrini.ReadBool('Columns', 'ContMsgSent', False));
ChangeVis('SRX_STRING',cqrini.ReadBool('Columns', 'ContMsgRcvd', False)); ChangeVis('SRX_STRING',cqrini.ReadBool('Columns', 'ContMsgRcvd', False));
ChangeVis('DOK',cqrini.ReadBool('Columns', 'DarcDok', False)); ChangeVis('DOK',cqrini.ReadBool('Columns', 'DarcDok', False));
ChangeVis('OPERATOR',cqrini.ReadBool('Columns', 'Operator', False));
end; end;
procedure TfrmMain.MarkQSLSend(symbol: string); procedure TfrmMain.MarkQSLSend(symbol: string);

2
src/fMonWsjtx.pas
View File

@ -366,7 +366,7 @@ begin
HexStrToStr(sgMonitor.Cells[8,sgMonitor.row])); HexStrToStr(sgMonitor.Cells[8,sgMonitor.row]));
end; end;
SendReply(HexStrToStr(sgMonitor.Cells[8,sgMonitor.row])); SendReply(HexStrToStr(sgMonitor.Cells[8,sgMonitor.row]));
frmNewQSO.GetCallInfo(DblClickCall); frmNewQSO.GetCallInfo(DblClickCall,CurMode,sgMonitor.Cells[1,sgMonitor.row]);
end; end;
procedure TfrmMonWsjtx.FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure TfrmMonWsjtx.FormClose(Sender: TObject; var CloseAction: TCloseAction);

53
src/fNewQSO.pas
View File

@ -696,7 +696,7 @@ type
procedure DisableRemoteMode; //Moved from private procedure DisableRemoteMode; //Moved from private
procedure SaveRemote; procedure SaveRemote;
procedure GetCallInfo(callTOinfo:string); procedure GetCallInfo(callTOinfo,mode,rsts:string);
procedure OnBandMapClick(Sender:TObject;Call,Mode : String;Freq:Currency); procedure OnBandMapClick(Sender:TObject;Call,Mode : String;Freq:Currency);
procedure AppIdle(Sender: TObject; var Handled: Boolean); procedure AppIdle(Sender: TObject; var Handled: Boolean);
@ -750,7 +750,7 @@ type
var var
frmNewQSO : TfrmNewQSO; frmNewQSO : TfrmNewQSO;
EscFirstTime : Boolean = True; EscFirstPressDone : Boolean = True;
multicast : boolean = false; multicast : boolean = false;
c_callsign : String; c_callsign : String;
@ -852,9 +852,10 @@ begin
end end
end; end;
procedure TfrmNewQSO.GetCallInfo(callTOinfo:string); procedure TfrmNewQSO.GetCallInfo(callTOinfo,mode,rsts:string);
Begin Begin
if edtCall.Text <> callTOinfo then //call (and web info) maybe there already ok from pevious status packet if edtCall.Text <> callTOinfo then //call (and web info) maybe there already ok from pevious status packet
Begin Begin
edtCall.Text := '';//clean grid like double ESC does edtCall.Text := '';//clean grid like double ESC does
@ -867,6 +868,23 @@ Begin
if dmData.DebugLevel>=1 then Writeln('GetCallInfo: Call was not there already'); if dmData.DebugLevel>=1 then Writeln('GetCallInfo: Call was not there already');
WaitWeb(2); // give time for web WaitWeb(2); // give time for web
end; end;
//mode and report may change if call stays same
cmbMode.Text:=mode;
edtMyRST.Text :='';
rsts:=trim(rsts);
if pos('-',rsts)>0 then
Begin
if length(rsts)<3 then rsts:= rsts[1]+'0'+rsts[2]
end
else
Begin
if length(rsts)=1 then rsts:= '+0'+rsts
else
rsts:= '+'+rsts
end;
edtHisRST.Text := rsts;
end; end;
procedure TfrmNewQSO.WaitWeb(secs:integer); procedure TfrmNewQSO.WaitWeb(secs:integer);
@ -1287,8 +1305,8 @@ begin
else begin else begin
cmbProfiles.Text := dmData.GetProfileText(old_prof) cmbProfiles.Text := dmData.GetProfileText(old_prof)
end; end;
if cmbProfiles.Text <> '' then //if cmbProfiles.Text <> '' then
cmbProfilesChange(nil); cmbProfilesChange(nil);
if sbNewQSO.Panels[0].Text = '' then if sbNewQSO.Panels[0].Text = '' then
sbNewQSO.Panels[0].Text := cMyLoc + cqrini.ReadString('Station','LOC',''); sbNewQSO.Panels[0].Text := cMyLoc + cqrini.ReadString('Station','LOC','');
@ -1744,7 +1762,7 @@ begin
old_cfreq := ''; old_cfreq := '';
Running := False; Running := False;
EscFirstTime := False; EscFirstPressDone := False;
ChangeDXCC := False; ChangeDXCC := False;
ClearAll; ClearAll;
@ -2614,8 +2632,8 @@ begin
call := trim(StrBuf(index)); //to be sure... call := trim(StrBuf(index)); //to be sure...
if dmData.DebugLevel>=1 then Writeln('Call :', call); if dmData.DebugLevel>=1 then Writeln('Call :', call);
//---------------------------------------------------- //----------------------------------------------------
ParStr := StrBuf(index); //report rstS:= StrBuf(index); //report
if dmData.DebugLevel>=1 then Writeln('Report: ',ParStr); if dmData.DebugLevel>=1 then Writeln('Report: ',rstS);
//---------------------------------------------------- //----------------------------------------------------
case cqrini.ReadInteger('wsjt','mode',1) of case cqrini.ReadInteger('wsjt','mode',1) of
0 : begin 0 : begin
@ -2668,7 +2686,7 @@ begin
if dmData.DebugLevel>=1 then Writeln('Change 2click call to:',frmMonWsjtx.DblClickCall); if dmData.DebugLevel>=1 then Writeln('Change 2click call to:',frmMonWsjtx.DblClickCall);
end; end;
GetCallInfo(call); //call web info GetCallInfo(call,WsjtxMode,rstS); //call web info
//these can be altered always //these can be altered always
if dmUtils.GetBandFromFreq(mhz) <> '' then //then add new values from status msg if dmUtils.GetBandFromFreq(mhz) <> '' then //then add new values from status msg
@ -5133,7 +5151,10 @@ procedure TfrmNewQSO.cmbProfilesChange(Sender: TObject);
var var
myloc : String; myloc : String;
begin begin
myloc := dmData.GetMyLocFromProfile(cmbProfiles.Text); if cmbProfiles.Text = '' then
myloc := cqrini.ReadString('Station','LOC','')
else
myloc := dmData.GetMyLocFromProfile(cmbProfiles.Text);
if myloc <> '' then if myloc <> '' then
sbNewQSO.Panels[0].Text := cMyLoc + myloc; sbNewQSO.Panels[0].Text := cMyLoc + myloc;
if dmData.DebugLevel >=1 then Writeln(cmbProfiles.Text) if dmData.DebugLevel >=1 then Writeln(cmbProfiles.Text)
@ -5401,7 +5422,7 @@ begin
begin begin
if not (fViewQSO or fEditQSO) then if not (fViewQSO or fEditQSO) then
begin begin
if EscFirstTime then if EscFirstPressDone then
begin begin
//SaveGrid; //SaveGrid;
if edtCall.Text = '' then if edtCall.Text = '' then
@ -5411,14 +5432,14 @@ begin
end end
else else
edtCall.Text := ''; // OnChange calls ClearAll; edtCall.Text := ''; // OnChange calls ClearAll;
EscFirstTime := False; EscFirstPressDone := False;
old_ccall := ''; old_ccall := '';
old_cfreq := ''; old_cfreq := '';
old_cmode := ''; old_cmode := '';
end end
else begin else begin
if Assigned(CWint) then CWint.StopSending; if Assigned(CWint) then CWint.StopSending;
EscFirstTime := True; EscFirstPressDone := True;
tmrESC.Enabled := True tmrESC.Enabled := True
end end
end end
@ -5451,7 +5472,7 @@ begin
end end
end end
else else
EscFirstTime := False; EscFirstPressDone := False;
if (Key >= VK_F1) and (Key <= VK_F10) and (Shift = []) then if (Key >= VK_F1) and (Key <= VK_F10) and (Shift = []) then
Begin Begin
@ -5848,7 +5869,7 @@ end;
procedure TfrmNewQSO.tmrESCTimer(Sender: TObject); procedure TfrmNewQSO.tmrESCTimer(Sender: TObject);
begin begin
EscFirstTime := False; EscFirstPressDone := False;
tmrESC.Enabled := False tmrESC.Enabled := False
end; end;
@ -6247,7 +6268,7 @@ begin
tmrStart.Enabled := False; tmrStart.Enabled := False;
Running := False; Running := False;
EscFirstTime := False; EscFirstPressDone := False;
ChangeDXCC := False; ChangeDXCC := False;
dmData.InsertProfiles(cmbProfiles,true); dmData.InsertProfiles(cmbProfiles,true);

37
src/fPreferences.lfm
View File

@ -1131,7 +1131,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 110 Top = 133
Width = 56 Width = 56
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'IOTA' Caption = 'IOTA'
@ -1143,7 +1143,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 136 Top = 159
Width = 66 Width = 66
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'Award' Caption = 'Award'
@ -1155,7 +1155,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 162 Top = 185
Width = 72 Width = 72
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'County' Caption = 'County'
@ -1167,7 +1167,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 188 Top = 211
Width = 66 Width = 66
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'Power' Caption = 'Power'
@ -1179,7 +1179,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 214 Top = 237
Width = 62 Width = 62
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'DXCC' Caption = 'DXCC'
@ -1191,7 +1191,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 240 Top = 263
Width = 139 Width = 139
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'Comment to QSO' Caption = 'Comment to QSO'
@ -1203,7 +1203,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 266 Top = 289
Width = 56 Width = 56
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'WAZ' Caption = 'WAZ'
@ -1215,7 +1215,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 292 Top = 315
Width = 48 Width = 48
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'ITU' Caption = 'ITU'
@ -1227,7 +1227,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 318 Top = 341
Width = 60 Width = 60
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'State' Caption = 'State'
@ -1418,7 +1418,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 344 Top = 367
Width = 121 Width = 121
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'Satellite name' Caption = 'Satellite name'
@ -1430,7 +1430,7 @@ object frmPreferences: TfrmPreferences
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 370 Top = 393
Width = 113 Width = 113
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'RX frequency' Caption = 'RX frequency'
@ -1498,11 +1498,11 @@ object frmPreferences: TfrmPreferences
end end
object chkDistance: TCheckBox object chkDistance: TCheckBox
AnchorSideLeft.Control = chkQSL_VIA AnchorSideLeft.Control = chkQSL_VIA
AnchorSideTop.Control = chkMyLoc AnchorSideTop.Control = chkOperator
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 163 Left = 163
Height = 23 Height = 23
Top = 84 Top = 107
Width = 133 Width = 133
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'Distance (in pnl)' Caption = 'Distance (in pnl)'
@ -1516,6 +1516,17 @@ object frmPreferences: TfrmPreferences
Caption = 'DARC DOK' Caption = 'DARC DOK'
TabOrder = 46 TabOrder = 46
end end
object chkOperator: TCheckBox
AnchorSideLeft.Control = chkQSL_VIA
AnchorSideTop.Control = chkMyLoc
AnchorSideTop.Side = asrBottom
Left = 163
Height = 23
Top = 81
Width = 83
Caption = 'Operator'
TabOrder = 47
end
end end
object tabBands: TTabSheet object tabBands: TTabSheet
Caption = 'Bands' Caption = 'Bands'

3
src/fPreferences.pas
View File

@ -122,6 +122,7 @@ type
cb30cm: TCheckBox; cb30cm: TCheckBox;
cgLimit: TCheckGroup; cgLimit: TCheckGroup;
cbNoKeyerReset: TCheckBox; cbNoKeyerReset: TCheckBox;
chkOperator: TCheckBox;
chkDarcDok: TCheckBox; chkDarcDok: TCheckBox;
chkNewDOKTables: TCheckBox; chkNewDOKTables: TCheckBox;
chkRBNMAutoConn: TCheckBox; chkRBNMAutoConn: TCheckBox;
@ -1227,6 +1228,7 @@ begin
cqrini.WriteBool('Columns', 'QSL_VIA', chkQSL_VIA.Checked); cqrini.WriteBool('Columns', 'QSL_VIA', chkQSL_VIA.Checked);
cqrini.WriteBool('Columns', 'Locator', chkLoc.Checked); cqrini.WriteBool('Columns', 'Locator', chkLoc.Checked);
cqrini.WriteBool('Columns', 'MyLoc', chkMyLoc.Checked); cqrini.WriteBool('Columns', 'MyLoc', chkMyLoc.Checked);
cqrini.WriteBool('Columns', 'Operator', chkOperator.Checked);
cqrini.WriteBool('Columns', 'Distance', chkDistance.Checked); cqrini.WriteBool('Columns', 'Distance', chkDistance.Checked);
cqrini.WriteBool('Columns', 'IOTA', chkIOTA.Checked); cqrini.WriteBool('Columns', 'IOTA', chkIOTA.Checked);
cqrini.WriteBool('Columns', 'Award', chkAward.Checked); cqrini.WriteBool('Columns', 'Award', chkAward.Checked);
@ -2721,6 +2723,7 @@ begin
chkQSL_VIA.Checked := cqrini.ReadBool('Columns', 'QSL_VIA', False); chkQSL_VIA.Checked := cqrini.ReadBool('Columns', 'QSL_VIA', False);
chkLoc.Checked := cqrini.ReadBool('Columns', 'Locator', False); chkLoc.Checked := cqrini.ReadBool('Columns', 'Locator', False);
chkMyLoc.Checked := cqrini.ReadBool('Columns', 'MyLoc', False); chkMyLoc.Checked := cqrini.ReadBool('Columns', 'MyLoc', False);
chkOperator.Checked := cqrini.ReadBool('Columns', 'Operator', False);
chkDistance.Checked := cqrini.ReadBool('Columns', 'Distance', False); chkDistance.Checked := cqrini.ReadBool('Columns', 'Distance', False);
chkIOTA.Checked := cqrini.ReadBool('Columns', 'IOTA', False); chkIOTA.Checked := cqrini.ReadBool('Columns', 'IOTA', False);
chkAward.Checked := cqrini.ReadBool('Columns', 'Award', False); chkAward.Checked := cqrini.ReadBool('Columns', 'Award', False);

2
src/fQTHProfiles.lfm
View File

@ -144,7 +144,7 @@ object frmQTHProfiles: TfrmQTHProfiles
Align = alClient Align = alClient
Color = clWindow Color = clWindow
Columns = <> Columns = <>
Options = [dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgRowSelect, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit] Options = [dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgRowSelect, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgAutoSizeColumns]
TabOrder = 1 TabOrder = 1
TitleStyle = tsNative TitleStyle = tsNative
OnCellClick = dbgrdProfilesCellClick OnCellClick = dbgrdProfilesCellClick

1
src/fQTHProfiles.pas
View File

@ -75,6 +75,7 @@ begin
dbgrdProfiles.Columns[0].Visible := False; dbgrdProfiles.Columns[0].Visible := False;
//dbgrdProfiles.Columns[6].Visible := False //dbgrdProfiles.Columns[6].Visible := False
btnEdit.Enabled:=(dmData.qProfiles.RecordCount <> 0);
end; end;
procedure TfrmQTHProfiles.LocateProfile(profile : String); procedure TfrmQTHProfiles.LocateProfile(profile : String);