diff --git a/plugins/channelrx/chanalyzerng/chanalyzerng.h b/plugins/channelrx/chanalyzerng/chanalyzerng.h index 255597f68..c58b74105 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzerng.h +++ b/plugins/channelrx/chanalyzerng/chanalyzerng.h @@ -43,7 +43,7 @@ public: int getInputSampleRate() const { return m_running.m_inputSampleRate; } int getChannelSampleRate() const { return m_running.m_channelSampleRate; } - Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; } + double getMagSq() const { return m_magsq; } virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); virtual void start(); @@ -120,7 +120,7 @@ private: int m_undersampleCount; fftfilt::cmplx m_sum; bool m_usb; - Real m_magsq; + double m_magsq; bool m_useInterpolator; NCOF m_nco; diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp index d210c67a1..5b479708e 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp @@ -169,7 +169,7 @@ void ChannelAnalyzerNGGUI::viewChanged() void ChannelAnalyzerNGGUI::tick() { - Real powDb = CalcDb::dbPower(m_channelAnalyzer->getMagSq()); + double powDb = CalcDb::dbPower(m_channelAnalyzer->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); // ui->channelPower->setText(QString::number(powDb, 'f', 1)); diff --git a/plugins/channelrx/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h index 193975ecb..18d4b5824 100644 --- a/plugins/channelrx/demodam/amdemod.h +++ b/plugins/channelrx/demodam/amdemod.h @@ -41,10 +41,10 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_magsq; } + double getMagSq() const { return m_magsq; } bool getSquelchOpen() const { return m_squelchOpen; } - void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) + void getMagSqLevels(double& avg, double& peak, int& nbSamples) { avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; peak = m_magsqPeak == 0.0 ? 1e-10 : m_magsqPeak; @@ -131,9 +131,9 @@ private: Real m_squelchLevel; int m_squelchCount; bool m_squelchOpen; - Real m_magsq; - Real m_magsqSum; - Real m_magsqPeak; + double m_magsq; + double m_magsqSum; + double m_magsqPeak; int m_magsqCount; MovingAverage m_movingAverage; diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 6960dd733..069f6d59f 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -315,11 +315,11 @@ void AMDemodGUI::enterEvent(QEvent*) void AMDemodGUI::tick() { - Real magsqAvg, magsqPeak; + double magsqAvg, magsqPeak; int nbMagsqSamples; m_amDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - Real powDbAvg = CalcDb::dbPower(magsqAvg); - Real powDbPeak = CalcDb::dbPower(magsqPeak); + double powDbAvg = CalcDb::dbPower(magsqAvg); + double powDbPeak = CalcDb::dbPower(magsqPeak); ui->channelPowerMeter->levelChanged( (100.0f + powDbAvg) / 100.0f, diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index c242c3b60..4b7d3a30a 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -108,7 +108,8 @@ void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto Complex ci, cs, cr; fftfilt::cmplx *rf; int rf_out; - Real msq, demod; + double msq; + Real demod; m_sampleBuffer.clear(); diff --git a/plugins/channelrx/demodbfm/bfmdemod.h b/plugins/channelrx/demodbfm/bfmdemod.h index e625949a5..f830fdf27 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.h +++ b/plugins/channelrx/demodbfm/bfmdemod.h @@ -58,7 +58,7 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_magsq; } + double getMagSq() const { return m_magsq; } bool getPilotLock() const { return m_pilotPLL.locked(); } Real getPilotLevel() const { return m_pilotPLL.get_pilot_level(); } @@ -69,7 +69,7 @@ public: Real getDemodQua() const { return m_rdsDemod.m_report.qua; } Real getDemodFclk() const { return m_rdsDemod.m_report.fclk; } - void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) + void getMagSqLevels(double& avg, double& peak, int& nbSamples) { avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; m_magsq = avg; @@ -207,11 +207,10 @@ private: Real m_m1Arg; //!> x^-1 real sample -// MovingAverage m_movingAverage; - Real m_magsq; - Real m_magsqSum; - Real m_magsqPeak; - int m_magsqCount; + double m_magsq; + double m_magsqSum; + double m_magsqPeak; + int m_magsqCount; AudioVector m_audioBuffer; uint m_audioBufferFill; diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index 1ddda2ceb..bddcc1072 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -476,7 +476,7 @@ void BFMDemodGUI::enterEvent(QEvent*) void BFMDemodGUI::tick() { - Real magsqAvg, magsqPeak; + double magsqAvg, magsqPeak; int nbMagsqSamples; m_bfmDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); Real powDbAvg = CalcDb::dbPower(magsqAvg); diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h index d15b105d6..011d4f797 100644 --- a/plugins/channelrx/demoddsd/dsddemod.h +++ b/plugins/channelrx/demoddsd/dsddemod.h @@ -73,7 +73,7 @@ public: const DSDDecoder& getDecoder() const { return m_dsdDecoder; } - void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) + void getMagSqLevels(double& avg, double& peak, int& nbSamples) { avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; m_magsq = avg; @@ -273,9 +273,9 @@ private: Real m_lastArgument; MovingAverage m_movingAverage; - Real m_magsq; - Real m_magsqSum; - Real m_magsqPeak; + double m_magsq; + double m_magsqSum; + double m_magsqPeak; int m_magsqCount; Real m_fmExcursion; diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 6da8cca6f..c803389e4 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -601,11 +601,11 @@ void DSDDemodGUI::formatStatusText() void DSDDemodGUI::tick() { - Real magsqAvg, magsqPeak; + double magsqAvg, magsqPeak; int nbMagsqSamples; m_dsdDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - Real powDbAvg = CalcDb::dbPower(magsqAvg); - Real powDbPeak = CalcDb::dbPower(magsqPeak); + double powDbAvg = CalcDb::dbPower(magsqAvg); + double powDbPeak = CalcDb::dbPower(magsqPeak); ui->channelPowerMeter->levelChanged( (100.0f + powDbAvg) / 100.0f, diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h index 577b7668f..0f3726369 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.h +++ b/plugins/channelrx/demodnfm/nfmdemod.h @@ -72,7 +72,7 @@ public: Real getMag() { return m_magsq; } bool getSquelchOpen() const { return m_squelchOpen; } - void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) + void getMagSqLevels(double& avg, double& peak, int& nbSamples) { avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; m_magsq = avg; @@ -216,9 +216,9 @@ private: Real m_squelchLevel; bool m_squelchOpen; bool m_afSquelchOpen; - Real m_magsq; //!< displayed averaged value - Real m_magsqSum; - Real m_magsqPeak; + double m_magsq; //!< displayed averaged value + double m_magsqSum; + double m_magsqPeak; int m_magsqCount; Real m_lastArgument; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 2b838f52b..08bceda41 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -419,11 +419,11 @@ void NFMDemodGUI::blockApplySettings(bool block) void NFMDemodGUI::tick() { - Real magsqAvg, magsqPeak; + double magsqAvg, magsqPeak; int nbMagsqSamples; m_nfmDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - Real powDbAvg = CalcDb::dbPower(magsqAvg); - Real powDbPeak = CalcDb::dbPower(magsqPeak); + double powDbAvg = CalcDb::dbPower(magsqAvg); + double powDbPeak = CalcDb::dbPower(magsqPeak); ui->channelPowerMeter->levelChanged( (100.0f + powDbAvg) / 100.0f, diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index 4bfd65dda..9b8c402d2 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -49,9 +49,9 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_magsq; } + double getMagSq() const { return m_magsq; } - void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) + void getMagSqLevels(double& avg, double& peak, int& nbSamples) { avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; m_magsq = avg; @@ -138,9 +138,9 @@ private: bool m_usb; bool m_dsb; bool m_audioMute; - Real m_magsq; - Real m_magsqSum; - Real m_magsqPeak; + double m_magsq; + double m_magsqSum; + double m_magsqPeak; int m_magsqCount; NCOF m_nco; diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index ea7ba2a07..ba83eeeac 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -500,11 +500,11 @@ void SSBDemodGUI::enterEvent(QEvent*) void SSBDemodGUI::tick() { - Real magsqAvg, magsqPeak; + double magsqAvg, magsqPeak; int nbMagsqSamples; m_ssbDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - Real powDbAvg = CalcDb::dbPower(magsqAvg); - Real powDbPeak = CalcDb::dbPower(magsqPeak); + double powDbAvg = CalcDb::dbPower(magsqAvg); + double powDbPeak = CalcDb::dbPower(magsqPeak); ui->channelPowerMeter->levelChanged( (100.0f + powDbAvg) / 100.0f, diff --git a/plugins/channelrx/demodwfm/wfmdemod.h b/plugins/channelrx/demodwfm/wfmdemod.h index 07ddf02f5..964052bf9 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.h +++ b/plugins/channelrx/demodwfm/wfmdemod.h @@ -50,10 +50,10 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_movingAverage.average(); } + double getMagSq() const { return m_movingAverage.average(); } bool getSquelchOpen() const { return m_squelchOpen; } - void getMagSqLevels(Real& avg, Real& peak, int& nbSamples) + void getMagSqLevels(double& avg, double& peak, int& nbSamples) { avg = m_magsqCount == 0 ? 1e-10 : m_magsqSum / m_magsqCount; m_magsq = avg; @@ -142,9 +142,9 @@ private: Real m_squelchLevel; int m_squelchState; bool m_squelchOpen; - Real m_magsq; //!< displayed averaged value - Real m_magsqSum; - Real m_magsqPeak; + double m_magsq; //!< displayed averaged value + double m_magsqSum; + double m_magsqPeak; int m_magsqCount; Real m_lastArgument; diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 2ad34264c..420bf4feb 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -319,11 +319,11 @@ void WFMDemodGUI::tick() // m_channelPowerDbAvg.feed(powDb); // ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); - Real magsqAvg, magsqPeak; + double magsqAvg, magsqPeak; int nbMagsqSamples; m_wfmDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - Real powDbAvg = CalcDb::dbPower(magsqAvg); - Real powDbPeak = CalcDb::dbPower(magsqPeak); + double powDbAvg = CalcDb::dbPower(magsqAvg); + double powDbPeak = CalcDb::dbPower(magsqPeak); ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); ui->channelPowerMeter->levelChanged( diff --git a/plugins/channelrx/tcpsrc/tcpsrc.h b/plugins/channelrx/tcpsrc/tcpsrc.h index c4b48e6db..d93060484 100644 --- a/plugins/channelrx/tcpsrc/tcpsrc.h +++ b/plugins/channelrx/tcpsrc/tcpsrc.h @@ -31,7 +31,7 @@ public: void configure(MessageQueue* messageQueue, SampleFormat sampleFormat, Real outputSampleRate, Real rfBandwidth, int tcpPort, int boost); void setSpectrum(MessageQueue* messageQueue, bool enabled); - Real getMagSq() const { return m_magsq; } + double getMagSq() const { return m_magsq; } virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); virtual void start(); @@ -148,7 +148,7 @@ protected: Real m_rfBandwidth; int m_tcpPort; int m_boost; - Real m_magsq; + double m_magsq; Real m_scale; Complex m_last, m_this; diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp index 103066e6c..f88f989bf 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp @@ -178,7 +178,7 @@ void TCPSrcGUI::channelMarkerChanged() void TCPSrcGUI::tick() { - Real powDb = CalcDb::dbPower(m_tcpSrc->getMagSq()); + double powDb = CalcDb::dbPower(m_tcpSrc->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); } diff --git a/plugins/channelrx/udpsrc/udpsrc.h b/plugins/channelrx/udpsrc/udpsrc.h index 8facbf799..369db610d 100644 --- a/plugins/channelrx/udpsrc/udpsrc.h +++ b/plugins/channelrx/udpsrc/udpsrc.h @@ -73,7 +73,7 @@ public: int boost, int volume); void setSpectrum(MessageQueue* messageQueue, bool enabled); - Real getMagSq() const { return m_magsq; } + double getMagSq() const { return m_magsq; } virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); virtual void start(); @@ -221,7 +221,7 @@ protected: bool m_audioStereo; int m_volume; int m_fmDeviation; - Real m_magsq; + double m_magsq; Real m_scale; Complex m_last, m_this; diff --git a/plugins/channelrx/udpsrc/udpsrcgui.cpp b/plugins/channelrx/udpsrc/udpsrcgui.cpp index b3678cc6f..ed85416f2 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.cpp +++ b/plugins/channelrx/udpsrc/udpsrcgui.cpp @@ -215,7 +215,7 @@ void UDPSrcGUI::channelMarkerChanged() void UDPSrcGUI::tick() { - Real powDb = CalcDb::dbPower(m_udpSrc->getMagSq()); + double powDb = CalcDb::dbPower(m_udpSrc->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); } diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h index 9c0831598..1081a64ad 100644 --- a/plugins/channeltx/modam/ammod.h +++ b/plugins/channeltx/modam/ammod.h @@ -190,7 +190,7 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_magsq == 0.0 ? 1e-10 : m_magsq; } + double getMagSq() const { return m_magsq; } CWKeyer *getCWKeyer() { return &m_cwKeyer; } @@ -291,7 +291,7 @@ private: Real m_interpolatorDistanceRemain; bool m_interpolatorConsumed; - Real m_magsq; + double m_magsq; MovingAverage m_movingAverage; SimpleAGC m_volumeAGC; diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index 83d6309f3..574de2a65 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -444,7 +444,7 @@ void AMModGUI::enterEvent(QEvent*) void AMModGUI::tick() { - Real powDb = CalcDb::dbPower(m_amMod->getMagSq()); + double powDb = CalcDb::dbPower(m_amMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index aa7c3cd3c..e014669ce 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -403,7 +403,7 @@ public: virtual bool handleMessage(const Message& cmd); int getEffectiveSampleRate() const { return m_tvSampleRate; }; - Real getMagSq() const { return m_movingAverage.average(); } + double getMagSq() const { return m_movingAverage.average(); } void getCameraNumbers(std::vector& numbers); static void getBaseValues(int outputSampleRate, int linesPerSecond, int& sampleRateUnits, uint32_t& nbPointsPerRateUnit); diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index 4d2fb8c0a..237cf162f 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -741,7 +741,7 @@ void ATVModGUI::enterEvent(QEvent*) void ATVModGUI::tick() { - Real powDb = CalcDb::dbPower(m_atvMod->getMagSq()); + double powDb = CalcDb::dbPower(m_atvMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h index abed3294d..595466b79 100644 --- a/plugins/channeltx/modnfm/nfmmod.h +++ b/plugins/channeltx/modnfm/nfmmod.h @@ -195,7 +195,7 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; } + double getMagSq() const { return m_magsq; } CWKeyer *getCWKeyer() { return &m_cwKeyer; } @@ -339,7 +339,7 @@ private: Lowpass m_lowpass; Bandpass m_bandpass; - Real m_magsq; + double m_magsq; MovingAverage m_movingAverage; SimpleAGC m_volumeAGC; diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp index 28d7e65b0..967702890 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.cpp +++ b/plugins/channeltx/modnfm/nfmmodgui.cpp @@ -500,7 +500,7 @@ void NFMModGUI::enterEvent(QEvent*) void NFMModGUI::tick() { - Real powDb = CalcDb::dbPower(m_nfmMod->getMagSq()); + double powDb = CalcDb::dbPower(m_nfmMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index d0c409185..5c8bd9cc4 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -195,7 +195,7 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; } + double getMagSq() const { return m_magsq; } CWKeyer *getCWKeyer() { return &m_cwKeyer; } @@ -363,7 +363,7 @@ private: int m_undersampleCount; int m_sumCount; - Real m_magsq; + double m_magsq; MovingAverage m_movingAverage; SimpleAGC m_volumeAGC; diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp index 5c5ffc13d..9172d5174 100644 --- a/plugins/channeltx/modssb/ssbmodgui.cpp +++ b/plugins/channeltx/modssb/ssbmodgui.cpp @@ -638,7 +638,7 @@ void SSBModGUI::enterEvent(QEvent*) void SSBModGUI::tick() { - Real powDb = CalcDb::dbPower(m_ssbMod->getMagSq()); + double powDb = CalcDb::dbPower(m_ssbMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h index eb16ea5fe..8a1e91b50 100644 --- a/plugins/channeltx/modwfm/wfmmod.h +++ b/plugins/channeltx/modwfm/wfmmod.h @@ -192,7 +192,7 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - Real getMagSq() const { return m_magsq == 0 ? 1e-10 : m_magsq; } + double getMagSq() const { return m_magsq; } CWKeyer *getCWKeyer() { return &m_cwKeyer; } @@ -323,7 +323,7 @@ private: fftfilt::cmplx *m_rfFilterBuffer; int m_rfFilterBufferIndex; - Real m_magsq; + double m_magsq; MovingAverage m_movingAverage; SimpleAGC m_volumeAGC; diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index 81077fda1..a50042bb6 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -463,7 +463,7 @@ void WFMModGUI::enterEvent(QEvent*) void WFMModGUI::tick() { - Real powDb = CalcDb::dbPower(m_wfmMod->getMagSq()); + double powDb = CalcDb::dbPower(m_wfmMod->getMagSq()); m_channelPowerDbAvg.feed(powDb); ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1)); diff --git a/sdrbase/util/db.cpp b/sdrbase/util/db.cpp index 8dadedd1d..3ccccd913 100644 --- a/sdrbase/util/db.cpp +++ b/sdrbase/util/db.cpp @@ -17,7 +17,7 @@ #include "util/db.h" #include -Real CalcDb::dbPower(Real magsq, Real floordB) +double CalcDb::dbPower(double magsq, double floordB) { if (magsq > 0) { diff --git a/sdrbase/util/db.h b/sdrbase/util/db.h index f5c746a24..68ec40ed2 100644 --- a/sdrbase/util/db.h +++ b/sdrbase/util/db.h @@ -22,7 +22,7 @@ class CalcDb { public: - static Real dbPower(Real magsq, Real floordB = -100.0f); + static double dbPower(double magsq, double floordB = -100.0); }; #endif /* INCLUDE_UTIL_DB_H_ */