From 97632e1b569c8ea4f0d8ae98f09031742ff81f47 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Mon, 3 Oct 2022 16:18:38 +0100
Subject: [PATCH] Ensure bandwidth is positive. Use engineering units for
 bandwidths.

---
 sdrgui/gui/glspectrumview.cpp            | 3 ++-
 sdrgui/gui/spectrummeasurements.cpp      | 4 ++--
 sdrgui/gui/spectrummeasurementsdialog.ui | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sdrgui/gui/glspectrumview.cpp b/sdrgui/gui/glspectrumview.cpp
index 7f0b01456..a6bdf7183 100644
--- a/sdrgui/gui/glspectrumview.cpp
+++ b/sdrgui/gui/glspectrumview.cpp
@@ -2307,8 +2307,9 @@ void GLSpectrumView::measure3dBBandwidth()
     }
 
     // Calcualte bandwidth
-    float hzPerBin = m_sampleRate / (float) m_fftSize;
     int bins = rightBin - leftBin - 1;
+    bins = std::max(1, bins);
+    float hzPerBin = m_sampleRate / (float) m_fftSize;
     float bandwidth = bins * hzPerBin;
     int centerBin = leftBin + (rightBin - leftBin) / 2;
     float centerFrequency = binToFrequency(centerBin);
diff --git a/sdrgui/gui/spectrummeasurements.cpp b/sdrgui/gui/spectrummeasurements.cpp
index c217b0d8b..611416729 100644
--- a/sdrgui/gui/spectrummeasurements.cpp
+++ b/sdrgui/gui/spectrummeasurements.cpp
@@ -350,7 +350,7 @@ void SpectrumMeasurements::createAdjacentChannelPowerTable()
 void SpectrumMeasurements::createOccupiedBandwidthTable()
 {
     QStringList rows = {"Occupied B/W"};
-    QStringList units = {" Hz"};
+    QStringList units = {"Hz"};
 
     createMeasurementsTable(rows, units);
 }
@@ -358,7 +358,7 @@ void SpectrumMeasurements::createOccupiedBandwidthTable()
 void SpectrumMeasurements::create3dBBandwidthTable()
 {
     QStringList rows = {"3dB B/W"};
-    QStringList units = {" Hz"};
+    QStringList units = {"Hz"};
 
     createMeasurementsTable(rows, units);
 }
diff --git a/sdrgui/gui/spectrummeasurementsdialog.ui b/sdrgui/gui/spectrummeasurementsdialog.ui
index cd328c69d..47a1744c8 100644
--- a/sdrgui/gui/spectrummeasurementsdialog.ui
+++ b/sdrgui/gui/spectrummeasurementsdialog.ui
@@ -157,7 +157,7 @@
        </item>
        <item>
         <property name="text">
-         <string>Occupied b/w</string>
+         <string>Occupied bandwidth</string>
         </property>
        </item>
        <item>