From 9881eca3fd52e1fdfa25826ad2d6df225271db4f Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 8 Dec 2019 14:10:49 +0100 Subject: [PATCH] Manage both ACCESS and MULTI for spectrum --- .../gui/colorlcd/radio_spectrum_analyser.cpp | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp index 76d67a9cd..7d680c29d 100644 --- a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp @@ -45,7 +45,18 @@ class SpectrumFooterWindow : public FormWindow grid.spacer(4); grid.setLabelWidth(5); - if (1 || isModuleMultimodule(moduleIdx)) { + if (isModuleMultimodule(moduleIdx)) { + char label[10]; + + // Frequency + sprintf(label,"T:%dMHz", reusableBuffer.spectrumAnalyser.freq / 1000000); + new StaticText(this, grid.getFieldSlot(3, 0), label); + + // Span + sprintf(label,"S:%dMHz", reusableBuffer.spectrumAnalyser.span / 1000000); + new StaticText(this, grid.getFieldSlot(3, 1), label); + } + else { // Frequency auto freq = new NumberEdit(this, grid.getFieldSlot(3, 0), reusableBuffer.spectrumAnalyser.freqMin, reusableBuffer.spectrumAnalyser.freqMax, @@ -60,16 +71,16 @@ class SpectrumFooterWindow : public FormWindow SET_VALUE(reusableBuffer.spectrumAnalyser.span, newValue * 1000000)); span->setSuffix("MHz"); span->setPrefix("S: "); - - // Tracker - auto tracker = new NumberEdit(this, grid.getFieldSlot(3,2), (reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2) / 1000000, - (reusableBuffer.spectrumAnalyser.freq + reusableBuffer.spectrumAnalyser.span / 2) / 1000000, - GET_DEFAULT(reusableBuffer.spectrumAnalyser.track / 1000000), - SET_VALUE(reusableBuffer.spectrumAnalyser.track, newValue * 1000000)); - tracker->setSuffix("MHz"); - tracker->setPrefix("T: "); - tracker->setFocus(); } + + // Tracker + auto tracker = new NumberEdit(this, grid.getFieldSlot(3,2), (reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2) / 1000000, + (reusableBuffer.spectrumAnalyser.freq + reusableBuffer.spectrumAnalyser.span / 2) / 1000000, + GET_DEFAULT(reusableBuffer.spectrumAnalyser.track / 1000000), + SET_VALUE(reusableBuffer.spectrumAnalyser.track, newValue * 1000000)); + tracker->setSuffix("MHz"); + tracker->setPrefix("T: "); + tracker->setFocus(); } };