kopia lustrzana https://github.com/f4exb/sdrangel
Ensure bandwidth is positive. Use engineering units for bandwidths.
rodzic
25709aa9a8
commit
97632e1b56
|
@ -2307,8 +2307,9 @@ void GLSpectrumView::measure3dBBandwidth()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calcualte bandwidth
|
// Calcualte bandwidth
|
||||||
float hzPerBin = m_sampleRate / (float) m_fftSize;
|
|
||||||
int bins = rightBin - leftBin - 1;
|
int bins = rightBin - leftBin - 1;
|
||||||
|
bins = std::max(1, bins);
|
||||||
|
float hzPerBin = m_sampleRate / (float) m_fftSize;
|
||||||
float bandwidth = bins * hzPerBin;
|
float bandwidth = bins * hzPerBin;
|
||||||
int centerBin = leftBin + (rightBin - leftBin) / 2;
|
int centerBin = leftBin + (rightBin - leftBin) / 2;
|
||||||
float centerFrequency = binToFrequency(centerBin);
|
float centerFrequency = binToFrequency(centerBin);
|
||||||
|
|
|
@ -350,7 +350,7 @@ void SpectrumMeasurements::createAdjacentChannelPowerTable()
|
||||||
void SpectrumMeasurements::createOccupiedBandwidthTable()
|
void SpectrumMeasurements::createOccupiedBandwidthTable()
|
||||||
{
|
{
|
||||||
QStringList rows = {"Occupied B/W"};
|
QStringList rows = {"Occupied B/W"};
|
||||||
QStringList units = {" Hz"};
|
QStringList units = {"Hz"};
|
||||||
|
|
||||||
createMeasurementsTable(rows, units);
|
createMeasurementsTable(rows, units);
|
||||||
}
|
}
|
||||||
|
@ -358,7 +358,7 @@ void SpectrumMeasurements::createOccupiedBandwidthTable()
|
||||||
void SpectrumMeasurements::create3dBBandwidthTable()
|
void SpectrumMeasurements::create3dBBandwidthTable()
|
||||||
{
|
{
|
||||||
QStringList rows = {"3dB B/W"};
|
QStringList rows = {"3dB B/W"};
|
||||||
QStringList units = {" Hz"};
|
QStringList units = {"Hz"};
|
||||||
|
|
||||||
createMeasurementsTable(rows, units);
|
createMeasurementsTable(rows, units);
|
||||||
}
|
}
|
||||||
|
|
|
@ -157,7 +157,7 @@
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Occupied b/w</string>
|
<string>Occupied bandwidth</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
|
Ładowanie…
Reference in New Issue