From 77f1840af6d709eed975fba24a9648f3ed37ca58 Mon Sep 17 00:00:00 2001
From: Neil Horne <neilh713@tpg.com.au>
Date: Fri, 23 Apr 2021 15:06:27 +1000
Subject: [PATCH] Fix 8463 (#8464)

---
 companion/src/firmwares/rawsource.cpp  |  2 +-
 companion/src/firmwares/sensordata.cpp | 10 +++++-----
 companion/src/firmwares/sensordata.h   |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/companion/src/firmwares/rawsource.cpp b/companion/src/firmwares/rawsource.cpp
index 898c0ca4a..dfd8ae4d4 100644
--- a/companion/src/firmwares/rawsource.cpp
+++ b/companion/src/firmwares/rawsource.cpp
@@ -60,7 +60,7 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting
         result.min = -30000 * result.step;
         result.max = +30000 * result.step;
         result.decimals = sensor.prec;
-        result.unit = SensorData::unitToString(qr.quot);
+        result.unit = sensor.unitToString();
         break;
       }
 
diff --git a/companion/src/firmwares/sensordata.cpp b/companion/src/firmwares/sensordata.cpp
index ae602bd0d..9a26a6d82 100644
--- a/companion/src/firmwares/sensordata.cpp
+++ b/companion/src/firmwares/sensordata.cpp
@@ -75,9 +75,9 @@ QString SensorData::cellIndexToString() const
   return cellIndexToString(index);
 }
 
-QString SensorData::unitToString() const
+QString SensorData::unitToString(bool hideRaw) const
 {
-  return unitToString(unit);
+  return unitToString(unit, hideRaw);
 }
 
 QString SensorData::precToString() const
@@ -342,11 +342,11 @@ QString SensorData::sourceToString(const ModelData * model, const int index, con
 }
 
 //  static
-QString SensorData::unitToString(const int value)
+QString SensorData::unitToString(const int value, bool hideRaw)
 {
   switch (value) {
     case UNIT_RAW:
-      return tr("Raw (-)");
+      return hideRaw ? QString() : tr("Raw (-)");
     case UNIT_VOLTS:
       return tr("V");
     case UNIT_AMPS:
@@ -496,7 +496,7 @@ AbstractStaticItemModel * SensorData::unitItemModel()
   mdl->setName("sensordata.unit");
 
   for (int i = 0; i <= UNIT_MAX; i++) {
-    QString str = unitToString(i);
+    QString str = unitToString(i, false);
     if (str != CPN_STR_UNKNOWN_ITEM)
       mdl->appendToItemList(str, i);
   }
diff --git a/companion/src/firmwares/sensordata.h b/companion/src/firmwares/sensordata.h
index 8a032cec5..1581b444b 100644
--- a/companion/src/firmwares/sensordata.h
+++ b/companion/src/firmwares/sensordata.h
@@ -188,7 +188,7 @@ class SensorData {
     QString typeToString() const;
     QString formulaToString() const;
     QString cellIndexToString() const;
-    QString unitToString() const;
+    QString unitToString(bool hideRaw = true) const;
     QString precToString() const;
     int getMask() const;
     QString paramsToString(const ModelData * model) const;
@@ -203,7 +203,7 @@ class SensorData {
     static QString typeToString(const int value);
     static QString formulaToString(const int value);
     static QString cellIndexToString(const int value);
-    static QString unitToString(const int value);
+    static QString unitToString(const int value, bool hideRaw = true);
     static QString precToString(const int value);
     static bool isRssiSensorAvailable(const ModelData * model, const int value);
     static QString rssiSensorToString(const ModelData * model, const int value);