From 2711a159adad7a2d0787910b9d9d4b4fe58e8784 Mon Sep 17 00:00:00 2001
From: Alex Spataru <alex_spataru@outlook.com>
Date: Fri, 1 Oct 2021 11:52:46 -0500
Subject: [PATCH] Only generate data group box for dataset widgets

---
 src/UI/Dashboard.cpp       | 9 ++++++---
 src/UI/Dashboard.h         | 1 +
 src/Widgets/Compass.cpp    | 2 +-
 src/Widgets/WidgetLoader.h | 3 ---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/UI/Dashboard.cpp b/src/UI/Dashboard.cpp
index a63c723d..8fd329d2 100644
--- a/src/UI/Dashboard.cpp
+++ b/src/UI/Dashboard.cpp
@@ -79,8 +79,8 @@ QFont Dashboard::monoFont() const
 // clang-format off
 JSON::Group *Dashboard::getMap(const int index)           { return getGroupWidget(m_mapWidgets, index);           }
 JSON::Dataset *Dashboard::getBar(const int index)         { return getDatasetWidget(m_barWidgets, index);         }
-JSON::Group *Dashboard::getGroups(const int index)        { return getGroupWidget(m_latestFrame.groups(), index); }
 JSON::Dataset *Dashboard::getPlot(const int index)        { return getDatasetWidget(m_plotWidgets, index);        }
+JSON::Group *Dashboard::getGroups(const int index)        { return getGroupWidget(m_groupWidgets, index);       }
 JSON::Dataset *Dashboard::getGauge(const int index)       { return getDatasetWidget(m_gaugeWidgets, index);       }
 JSON::Group *Dashboard::getGyroscope(const int index)     { return getGroupWidget(m_gyroscopeWidgets, index);     }
 JSON::Dataset *Dashboard::getCompass(const int index)     { return getDatasetWidget(m_compassWidgets, index);     }
@@ -155,7 +155,7 @@ int Dashboard::mapCount() const           { return m_mapWidgets.count();
 int Dashboard::barCount() const           { return m_barWidgets.count();           }
 int Dashboard::plotCount() const          { return m_plotWidgets.count();          }
 int Dashboard::gaugeCount() const         { return m_gaugeWidgets.count();         }
-int Dashboard::groupCount() const         { return m_latestFrame.groupCount();     }
+int Dashboard::groupCount() const         { return m_groupWidgets.count();       }
 int Dashboard::compassCount() const       { return m_compassWidgets.count();       }
 int Dashboard::gyroscopeCount() const     { return m_gyroscopeWidgets.count();     }
 int Dashboard::multiPlotCount() const     { return m_multiPlotWidgets.count();     }
@@ -508,7 +508,7 @@ bool Dashboard::accelerometerVisible(const int index) const { return getVisibili
 QStringList Dashboard::barTitles() const           { return datasetTitles(m_barWidgets);         }
 QStringList Dashboard::mapTitles() const           { return groupTitles(m_mapWidgets);           }
 QStringList Dashboard::plotTitles() const          { return datasetTitles(m_plotWidgets);        }
-QStringList Dashboard::groupTitles() const         { return groupTitles(m_latestFrame.groups()); }
+QStringList Dashboard::groupTitles() const         { return groupTitles(m_groupWidgets);       }
 QStringList Dashboard::gaugeTitles() const         { return datasetTitles(m_gaugeWidgets);       }
 QStringList Dashboard::compassTitles() const       { return datasetTitles(m_compassWidgets);     }
 QStringList Dashboard::gyroscopeTitles() const     { return groupTitles(m_gyroscopeWidgets);     }
@@ -553,6 +553,7 @@ void Dashboard::resetData()
     m_mapWidgets.clear();
     m_plotWidgets.clear();
     m_gaugeWidgets.clear();
+    m_groupWidgets.clear();
     m_compassWidgets.clear();
     m_gyroscopeWidgets.clear();
     m_multiPlotWidgets.clear();
@@ -604,6 +605,7 @@ void Dashboard::updateData()
     m_mapWidgets.clear();
     m_plotWidgets.clear();
     m_gaugeWidgets.clear();
+    m_groupWidgets.clear();
     m_compassWidgets.clear();
     m_gyroscopeWidgets.clear();
     m_multiPlotWidgets.clear();
@@ -616,6 +618,7 @@ void Dashboard::updateData()
 
     // Update widget vectors
     m_plotWidgets = getPlotWidgets();
+    m_groupWidgets = getWidgetGroups("");
     m_mapWidgets = getWidgetGroups("map");
     m_barWidgets = getWidgetDatasets("bar");
     m_gaugeWidgets = getWidgetDatasets("gauge");
diff --git a/src/UI/Dashboard.h b/src/UI/Dashboard.h
index 07a2c144..b3895b93 100644
--- a/src/UI/Dashboard.h
+++ b/src/UI/Dashboard.h
@@ -240,6 +240,7 @@ private:
     QVector<JSON::Dataset *> m_thermometerWidgets;
 
     QVector<JSON::Group *> m_mapWidgets;
+    QVector<JSON::Group *> m_groupWidgets;
     QVector<JSON::Group *> m_multiPlotWidgets;
     QVector<JSON::Group *> m_gyroscopeWidgets;
     QVector<JSON::Group *> m_accelerometerWidgets;
diff --git a/src/Widgets/Compass.cpp b/src/Widgets/Compass.cpp
index 24380525..8bcdcc8d 100644
--- a/src/Widgets/Compass.cpp
+++ b/src/Widgets/Compass.cpp
@@ -89,7 +89,7 @@ void Compass::update()
     auto dataset = UI::Dashboard::getInstance()->getCompass(m_index);
     if (dataset)
     {
-        auto value = dataset->value().toDouble() * 12;
+        auto value = dataset->value().toDouble();
         auto text = QString("%1°").arg(QString::number(value, 'f', 0));
         m_compass.setValue(value);
 
diff --git a/src/Widgets/WidgetLoader.h b/src/Widgets/WidgetLoader.h
index 8fc02c61..a17ab328 100644
--- a/src/Widgets/WidgetLoader.h
+++ b/src/Widgets/WidgetLoader.h
@@ -50,9 +50,6 @@ class WidgetLoader : public QQuickPaintedItem
     Q_PROPERTY(QString widgetTitle
                READ widgetTitle
                NOTIFY widgetIndexChanged)
-    Q_PROPERTY(bool widgetVisible
-               READ widgetVisible
-               NOTIFY widgetVisibleChanged)
     Q_PROPERTY(bool isExternalWindow
                READ isExternalWindow
                WRITE setIsExternalWindow