From 3c822e1bd86947426d28b8ebbbf759d98d06fc24 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Mon, 17 Aug 2015 23:31:22 -0400 Subject: [PATCH] Make decibels display toggleable --- src/visual/SpectrumCanvas.cpp | 7 +++++-- src/visual/SpectrumCanvas.h | 1 + src/visual/WaterfallCanvas.cpp | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp index bc8870e..adcc96c 100644 --- a/src/visual/SpectrumCanvas.cpp +++ b/src/visual/SpectrumCanvas.cpp @@ -126,7 +126,6 @@ void SpectrumCanvas::moveCenterFrequency(long long freqChange) { freq -= freqChange; } wxGetApp().setFrequency(freq); - setStatusText("Set center frequency: %s", freq); } } @@ -134,6 +133,10 @@ void SpectrumCanvas::setShowDb(bool showDb) { spectrumPanel.setShowDb(showDb); } +bool SpectrumCanvas::getShowDb() { + return spectrumPanel.getShowDb(); +} + void SpectrumCanvas::OnMouseMoved(wxMouseEvent& event) { InteractiveCanvas::OnMouseMoved(event); @@ -144,7 +147,7 @@ void SpectrumCanvas::OnMouseMoved(wxMouseEvent& event) { moveCenterFrequency(freqChange); } } else { - setStatusText("Click and drag to adjust center frequency."); + setStatusText("Click and drag to adjust center frequency. 'B' to toggle decibels display."); } } diff --git a/src/visual/SpectrumCanvas.h b/src/visual/SpectrumCanvas.h index 6160111..238c48f 100644 --- a/src/visual/SpectrumCanvas.h +++ b/src/visual/SpectrumCanvas.h @@ -20,6 +20,7 @@ public: void moveCenterFrequency(long long freqChange); void setShowDb(bool showDb); + bool getShowDb(); SpectrumVisualDataQueue *getVisualDataQueue(); diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp index 204473f..c2571d7 100644 --- a/src/visual/WaterfallCanvas.cpp +++ b/src/visual/WaterfallCanvas.cpp @@ -338,6 +338,11 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) { activeDemod->setStereo(true); } break; + case 'B': + if (spectrumCanvas) { + spectrumCanvas->setShowDb(!spectrumCanvas->getShowDb()); + } + break; case WXK_SPACE: wxGetApp().showFrequencyInput(); break;