ew8bak/ewsdr
1
0
Fork 0
mirror of https://git.vladimir.cc/vladimir/ewsdr.git synced 2026-08-25 19:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Phase 3 (batch 12): consolidate VFO B tuning into controller command

Browse Source 
The "set VFO B" engine block was duplicated inline across three tune paths
(DoSpectrumClick, DoSpectrumDrag, FreqDispBChanged), each subtly different
(drag had no band-detect/ruler; click had no drive recalc).

- TRadioController.SetVfoB(Hz): always stores FVfoB; when B is the active
  VFO, retunes the receiver (DDC=VFO B, no CTUN, shift 0), HF band-detects
  (FCurrentBand + drive recalc -> Changed(rfBand)) and pushes to the radio;
  when B is inactive (split, listening on A) it only stores the freq for TX.
  Fires Changed(rfVfoB).
- OnControllerState(rfVfoB): renders FreqDispB and, when B active, the
  spectrum/ruler (deferred via FSpectrumDirty, matching the rfVfoA path).

The three call sites collapse to a single FController.SetVfoB(...) each;
FreqDispBChanged is now a one-liner. Behavior unified: click/FreqDispB drop
from sync DrawSpectrum to deferred (consistent with VFO A click-to-tune,
imperceptible); drag gains band-detect + ruler refresh; click gains drive
recalc on band change. Net -23 lines.

Left inline (not identical): DoWidebandClick VFO B (extra XVTR clamp +
wideband-specific render) and SyncWebFreq (uses SetRunAndFreq, the web/run
network path, not UpdateState+SendFullHP). Builds clean, links.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Uladzimir Karpenka
2026-06-04 20:25:55 +03:00
co-authored by Claude Opus 4.8
parent 908c02d08a
commit eb10283c85
2 changed files with 42 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainForm.pas
+17 -64
View File
@@ -1410,6 +1410,18 @@ begin
if PbWaterfall <> nil then PbWaterfall.Invalidate;
end;
end;
rfVfoB:
begin
FreqDispB.Frequency := Round(FController.FVfoB);
if FController.FActiveVfo = 1 then
begin
FSpecView.InvalidateRulerCache;
SyncSpecViewFreq;
FSpectrumDirty := True;
PbSpectrum.Invalidate;
if PbRuler <> nil then PbRuler.Invalidate;
end;
end;
rfBand:
for i := 0 to BAND_COUNT - 1 do
StyleButton(BtnBand[i], i = FController.FCurrentBand);
@@ -4485,35 +4497,10 @@ begin
end;
procedure TMainForm.FreqDispBChanged(Sender: TObject; NewFreq: Int64);
var
BandIdx: Integer;
begin
FController.FVfoB := NewFreq;
if FController.FActiveVfo = 1 then
begin
// VFO-B активен: перестраиваем приёмник
FController.FCenterFreq := FController.FVfoB;
if FController.FWDSPReady then FController.FDSPEngine.SetShift(0.0);
if FController.FNetwork.Connected and FController.FNetwork.Running then
begin
FController.FNetwork.UpdateState(XvtrTranslate(FController.FCenterFreq), XvtrTranslate(ActiveTXFreqHz), FController.FDriveLevel, FController.FTransmitting, True, True);
FController.FNetwork.SendFullHP;
end;
// Обновляем диапазон
BandIdx := FreqToBandIdx(FController.FVfoB);
if (BandIdx >= 0) and (BandIdx <> FController.FCurrentBand) then
begin
StyleButton(BtnBand[FController.FCurrentBand], False);
FController.FCurrentBand := BandIdx;
StyleButton(BtnBand[FController.FCurrentBand], True);
FController.FDriveLevel := CalcDriveByte;
end;
FSpecView.InvalidateRulerCache;
SyncSpecViewFreq;
FSpecView.DrawSpectrum;
PbSpectrum.Invalidate;
if PbRuler <> nil then PbRuler.Invalidate;
end;
// Движок (сохранение B, перестройка при активном B, диапазон, сеть) — в
// контроллере; рендер — OnControllerState(rfVfoB).
FController.SetVfoB(NewFreq);
end;
// ---------------------------------------------------------------------------
@@ -4773,7 +4760,6 @@ procedure TMainForm.DoSpectrumClick(PixelX: Integer; PanelWidth: Integer);
var
ClickFreq: Int64;
StepHz: Int64;
BandIdx: Integer;
begin
if PanelWidth <= 0 then Exit;
if (FController.FMode = MODE_FM) and FController.FFMStepOn then
@@ -4785,29 +4771,7 @@ begin
if FController.FActiveVfo = 0 then
ApplyVfoA(ClickFreq)
else
begin
FController.FVfoB := ClickFreq;
FreqDispB.Frequency := Round(FController.FVfoB);
FController.FCenterFreq := ClickFreq;
if FController.FWDSPReady then FController.FDSPEngine.SetShift(0.0);
if FController.FNetwork.Connected and FController.FNetwork.Running then
begin
FController.FNetwork.UpdateState(XvtrTranslate(FController.FCenterFreq), XvtrTranslate(ActiveTXFreqHz), FController.FDriveLevel, FController.FTransmitting, True, True);
FController.FNetwork.SendFullHP;
end;
BandIdx := FreqToBandIdx(FController.FVfoB);
if (BandIdx >= 0) and (BandIdx <> FController.FCurrentBand) then
begin
StyleButton(BtnBand[FController.FCurrentBand], False);
FController.FCurrentBand := BandIdx;
StyleButton(BtnBand[FController.FCurrentBand], True);
end;
FSpecView.InvalidateRulerCache;
SyncSpecViewFreq;
FSpecView.DrawSpectrum;
PbSpectrum.Invalidate;
if PbRuler <> nil then PbRuler.Invalidate;
end;
FController.SetVfoB(ClickFreq); // движок + рендер через OnControllerState(rfVfoB)
end;
procedure TMainForm.DoWidebandClick(PixelX: Integer; PanelWidth: Integer);
@@ -4931,18 +4895,7 @@ begin
if FController.FActiveVfo = 0 then
ApplyVfoA(Round(FSpecDragFreq - dFreq))
else
begin
FController.FVfoB := FSpecDragFreq - dFreq;
FreqDispB.Frequency := Round(FController.FVfoB);
FController.FCenterFreq := FController.FVfoB;
if FController.FWDSPReady then FController.FDSPEngine.SetShift(0.0);
if FController.FNetwork.Connected and FController.FNetwork.Running then
begin
FController.FNetwork.UpdateState(XvtrTranslate(FController.FCenterFreq), XvtrTranslate(ActiveTXFreqHz), FController.FDriveLevel, FController.FTransmitting, True, True);
FController.FNetwork.SendFullHP;
end;
FSpectrumDirty := True;
end;
FController.SetVfoB(FSpecDragFreq - dFreq); // движок + рендер (rfVfoB)
end;
end;