Merge branch 'master' into RotAZ

This commit is contained in:
OH1KH 2020-03-06 15:28:02 +02:00
commit 993e26322a
5 changed files with 33 additions and 2 deletions

View File

@ -290,7 +290,10 @@
If you check <b>Preferences/New QSO/Enable satellite mode</b> you get a new tab where
you can enter satellite name, rx frequency and propagation mode.
There are several propagation modes that you can select, not only "SAT" so this
is usefull also when keeping record of non satellite contacts.<br><br>
is usefull also when keeping record of non satellite contacts.<br>
You can make the DX spot function use the RX frequency of this tab if you enable
the checkbox "Use RX frequency for DX spots".<br><br>
<img src="img/h120.png" border="0"><br><br>
The tab "LO Config" gives you an option to configure frequencies of a
local oscillator. These values are added to the "Frequency" field in

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -3697,6 +3697,22 @@ object frmNewQSO: TfrmNewQSO
Caption = 'MHz'
ParentColor = False
end
object cbSpotRX: TCheckBox
AnchorSideLeft.Control = lblStatellite
AnchorSideTop.Control = cmbPropagation
Left = 8
Height = 23
Hint = 'Use RX frequency from the Satellite tab instead of Frequency for DX spots'
Top = 106
Width = 233
BorderSpacing.Top = 35
Caption = 'Use RX frequency for DX spots'
Color = clNone
OnChange = cbSpotRXChange
ParentColor = False
ParentFont = False
TabOrder = 4
end
end
object tabLOConfig: TTabSheet
Caption = 'LO Config'

View File

@ -87,6 +87,7 @@ type
btnClearSatellite : TButton;
cbTxLo: TCheckBox;
cbRxLo: TCheckBox;
cbSpotRX: TCheckBox;
chkAutoMode: TCheckBox;
cmbPropagation : TComboBox;
cmbSatellite : TComboBox;
@ -389,6 +390,7 @@ type
procedure btnClearSatelliteClick(Sender : TObject);
procedure cbRxLoChange(Sender: TObject);
procedure cbTxLoChange(Sender: TObject);
procedure cbSpotRXChange(Sender: TObject);
procedure chkAutoModeChange(Sender: TObject);
procedure cmbFreqExit(Sender: TObject);
procedure cmbIOTAEnter(Sender: TObject);
@ -1163,6 +1165,8 @@ begin
dmSatellite.GetListOfPropModes(cmbPropagation, old_prop);
edtRXFreq.Text := old_rxfreq;
cbSpotRX.Checked := cqrini.ReadBool('DXCluster', 'SpotRX', False);
cbTxLo.Checked := cqrini.ReadBool('NewQSO', 'UseTXLO', False);
edtTXLO.Text := cqrini.ReadString('NewQSO', 'TXLO', '');
cbRxLo.Checked := cqrini.ReadBool('NewQSO', 'UseRXLO', False);
@ -1311,6 +1315,7 @@ begin
cbRxLo.Checked := cqrini.ReadBool('NewQSO', 'UseRXLO', False);
edtRXLO.Text := cqrini.ReadString('NewQSO', 'RXLO', '');
cbSpotRX.Checked := cqrini.ReadBool('DXCluster', 'SpotRX', False);
if frmRotControl.Showing then
begin
@ -4335,6 +4340,11 @@ begin
cqrini.WriteBool('NewQSO', 'UseTXLO', cbTxLo.Checked);
end;
procedure TfrmNewQSO.cbSpotRXChange(Sender: TObject);
begin
cqrini.WriteBool('DXCluster', 'SpotRX', cbSpotRX.Checked);
end;
procedure TfrmNewQSO.acCWFKeyExecute(Sender: TObject);
begin
UpdateFKeyLabels;
@ -6626,6 +6636,8 @@ begin
begin
if TryStrToCurr(cmbFreq.Text,f) then
begin
if (cqrini.ReadBool('DXCluster','SpotRX',False)) then
f := StrToCurr(edtRXFreq.Text);
f := f*1000;
tmp := 'DX ' + FloatToStrF(f,ffFixed,8,1) + ' ' + edtCall.Text;
ModRst := cmbMode.Text+' '+edtHisRst.Text;