jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 15:04:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Selectable marker data format, preparation for showing marker data on graphs

Browse source
This commit is contained in:
Jan Käberich 2021-05-14 15:05:22 +02:00
parent 2d13fdfe5e
commit 036837a6ae
16 changed files with 437 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Software/PC_Application/Traces/trace.cpp
View file

@ -5,6 +5,7 @@
#include <QScrollBar>
#include <QSettings>
#include <functional>
#include "unit.h"
using namespace std;
@ -867,7 +868,7 @@ std::vector<double> Trace::findPeakFrequencies(unsigned int maxPeaks, double min
double max_dbm = -200.0;
double min_dbm = 200.0;
for(auto d : lastMath->rData()) {
double dbm = 20*log10(abs(d.y));
double dbm = Unit::dB(d.y);
if((dbm >= max_dbm) && (min_dbm <= dbm - minValley)) {
// potential peak frequency
frequency = d.x;
@ -941,7 +942,7 @@ double Trace::getNoise(double frequency)
return std::numeric_limits<double>::quiet_NaN();
}
// convert to dbm
auto dbm = 20*log10(abs(lastMath->getInterpolatedSample(frequency).y));
auto dbm = Unit::dB(lastMath->getInterpolatedSample(frequency).y);
// convert to 1Hz bandwidth
dbm -= 10*log10(settings.SA.RBW);
return dbm;