QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Only generate data group box for dataset widgets

Browse Source
This commit is contained in:
Alex Spataru 2021-10-01 11:52:46 -05:00
parent cda43278e5
commit 2711a159ad
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/UI/Dashboard.cpp
View File

@ -79,8 +79,8 @@ QFont Dashboard::monoFont() const
// clang-format off // clang-format off
JSON::Group *Dashboard::getMap(const int index) { return getGroupWidget(m_mapWidgets, index); } 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::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::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::Dataset *Dashboard::getGauge(const int index) { return getDatasetWidget(m_gaugeWidgets, index); }
JSON::Group *Dashboard::getGyroscope(const int index) { return getGroupWidget(m_gyroscopeWidgets, 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); } 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::barCount() const { return m_barWidgets.count(); }
int Dashboard::plotCount() const { return m_plotWidgets.count(); } int Dashboard::plotCount() const { return m_plotWidgets.count(); }
int Dashboard::gaugeCount() const { return m_gaugeWidgets.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::compassCount() const { return m_compassWidgets.count(); }
int Dashboard::gyroscopeCount() const { return m_gyroscopeWidgets.count(); } int Dashboard::gyroscopeCount() const { return m_gyroscopeWidgets.count(); }
int Dashboard::multiPlotCount() const { return m_multiPlotWidgets.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::barTitles() const { return datasetTitles(m_barWidgets); }
QStringList Dashboard::mapTitles() const { return groupTitles(m_mapWidgets); } QStringList Dashboard::mapTitles() const { return groupTitles(m_mapWidgets); }
QStringList Dashboard::plotTitles() const { return datasetTitles(m_plotWidgets); } 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::gaugeTitles() const { return datasetTitles(m_gaugeWidgets); }
QStringList Dashboard::compassTitles() const { return datasetTitles(m_compassWidgets); } QStringList Dashboard::compassTitles() const { return datasetTitles(m_compassWidgets); }
QStringList Dashboard::gyroscopeTitles() const { return groupTitles(m_gyroscopeWidgets); } QStringList Dashboard::gyroscopeTitles() const { return groupTitles(m_gyroscopeWidgets); }
@ -553,6 +553,7 @@ void Dashboard::resetData()
m_mapWidgets.clear(); m_mapWidgets.clear();
m_plotWidgets.clear(); m_plotWidgets.clear();
m_gaugeWidgets.clear(); m_gaugeWidgets.clear();
m_groupWidgets.clear();
m_compassWidgets.clear(); m_compassWidgets.clear();
m_gyroscopeWidgets.clear(); m_gyroscopeWidgets.clear();
m_multiPlotWidgets.clear(); m_multiPlotWidgets.clear();
@ -604,6 +605,7 @@ void Dashboard::updateData()
m_mapWidgets.clear(); m_mapWidgets.clear();
m_plotWidgets.clear(); m_plotWidgets.clear();
m_gaugeWidgets.clear(); m_gaugeWidgets.clear();
m_groupWidgets.clear();
m_compassWidgets.clear(); m_compassWidgets.clear();
m_gyroscopeWidgets.clear(); m_gyroscopeWidgets.clear();
m_multiPlotWidgets.clear(); m_multiPlotWidgets.clear();
@ -616,6 +618,7 @@ void Dashboard::updateData()
// Update widget vectors // Update widget vectors
m_plotWidgets = getPlotWidgets(); m_plotWidgets = getPlotWidgets();
m_groupWidgets = getWidgetGroups("");
m_mapWidgets = getWidgetGroups("map"); m_mapWidgets = getWidgetGroups("map");
m_barWidgets = getWidgetDatasets("bar"); m_barWidgets = getWidgetDatasets("bar");
m_gaugeWidgets = getWidgetDatasets("gauge"); m_gaugeWidgets = getWidgetDatasets("gauge");

1
src/UI/Dashboard.h
View File

@ -240,6 +240,7 @@ private:
QVector<JSON::Dataset *> m_thermometerWidgets; QVector<JSON::Dataset *> m_thermometerWidgets;
QVector<JSON::Group *> m_mapWidgets; QVector<JSON::Group *> m_mapWidgets;
QVector<JSON::Group *> m_groupWidgets;
QVector<JSON::Group *> m_multiPlotWidgets; QVector<JSON::Group *> m_multiPlotWidgets;
QVector<JSON::Group *> m_gyroscopeWidgets; QVector<JSON::Group *> m_gyroscopeWidgets;
QVector<JSON::Group *> m_accelerometerWidgets; QVector<JSON::Group *> m_accelerometerWidgets;

2
src/Widgets/Compass.cpp
View File

@ -89,7 +89,7 @@ void Compass::update()
auto dataset = UI::Dashboard::getInstance()->getCompass(m_index); auto dataset = UI::Dashboard::getInstance()->getCompass(m_index);
if (dataset) if (dataset)
{ {
auto value = dataset->value().toDouble() * 12; auto value = dataset->value().toDouble();
auto text = QString("%1°").arg(QString::number(value, 'f', 0)); auto text = QString("%1°").arg(QString::number(value, 'f', 0));
m_compass.setValue(value); m_compass.setValue(value);

3
src/Widgets/WidgetLoader.h
View File

@ -50,9 +50,6 @@ class WidgetLoader : public QQuickPaintedItem
Q_PROPERTY(QString widgetTitle Q_PROPERTY(QString widgetTitle
READ widgetTitle READ widgetTitle
NOTIFY widgetIndexChanged) NOTIFY widgetIndexChanged)
Q_PROPERTY(bool widgetVisible
READ widgetVisible
NOTIFY widgetVisibleChanged)
Q_PROPERTY(bool isExternalWindow Q_PROPERTY(bool isExternalWindow
READ isExternalWindow READ isExternalWindow
WRITE setIsExternalWindow WRITE setIsExternalWindow