From 798c558c093b003d0eeebfa5ec0b2c844333f1c0 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 28 Oct 2015 22:07:06 -0400 Subject: [PATCH] Fix bad frequency jumps at zoomed freq <= 1/2 samplerate --- src/visual/WaterfallCanvas.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp index ea5e229..971552e 100644 --- a/src/visual/WaterfallCanvas.cpp +++ b/src/visual/WaterfallCanvas.cpp @@ -146,6 +146,11 @@ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { if (freqMove != 0.0) { long long newFreq = getCenterFrequency() + (long long)((long double)getBandwidth()*freqMove) * 0.01; + long long minFreq = bandwidth/2; + if (newFreq < minFreq) { + newFreq = minFreq; + } + updateCenterFrequency(newFreq); if (!freqMoving) { @@ -434,7 +439,7 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) { return; } - long long minFreq = wxGetApp().getSampleRate()/2; + long long minFreq = bandwidth/2; if (freq < minFreq) { freq = minFreq; }