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

Remove Qt Charts & optimize Dashboard code

Browse Source
This commit is contained in:
Alex Spataru 2021-09-25 18:47:58 -05:00
parent 6fd4d7ca18
commit f487651323
10 changed files with 101 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Serial-Studio.pro
View File

@ -29,8 +29,6 @@ MOC_DIR = moc
RCC_DIR = qrc
OBJECTS_DIR = obj
CONFIG += c++11
isEmpty(PREFIX) {
PREFIX = /usr
}
@ -51,7 +49,6 @@ QT += sql
QT += svg
QT += core
QT += quick
QT += charts
QT += widgets
QT += serialport
QT += printsupport
@ -71,6 +68,20 @@ QT += quickcontrols2
QMAKE_CXXFLAGS_RELEASE *= /O2
}
CONFIG += c++11
CONFIG += silent
CONFIG += strict_c++
CONFIG -= depend_includepath
sanitize {
CONFIG += sanitizer
CONFIG += sanitize_address
CONFIG *= sanitize_undefined
}
QMAKE_CXXFLAGS *= -fno-math-errno
QMAKE_CXXFLAGS *= -funsafe-math-optimizations
#-----------------------------------------------------------------------------------------
# Libraries
#-----------------------------------------------------------------------------------------

1
assets/qml/Windows/WidgetGrid.qml
View File

@ -63,6 +63,7 @@ Widgets.Window {
contentWidth: -1
Layout.fillWidth: true
Layout.fillHeight: true
ScrollBar.vertical: ScrollBar {}
// Calculate cell size so that cells fill the grid space and heigth < width
cellHeight: cellWidth * (2/3)

16
libs/qwt/qwt.pri
View File

@ -1,23 +1,7 @@
CONFIG += silent
CONFIG -= depend_includepath
QWT_CONFIG += QwtPlot
QWT_CONFIG += QwtPolar
QWT_CONFIG += QwtWidgets
c++11 {
CONFIG += strict_c++
}
sanitize {
CONFIG += sanitizer
CONFIG += sanitize_address
CONFIG *= sanitize_undefined
}
QMAKE_CXXFLAGS *= -fno-math-errno
QMAKE_CXXFLAGS *= -funsafe-math-optimizations
DEFINES += QWT_MOC_INCLUDE=1
include($$PWD/src/src.pri)

4
src/JSON/Frame.cpp
View File

@ -67,13 +67,13 @@ QString Frame::title() const
*/
int Frame::groupCount() const
{
return groups().count();
return m_groups.count();
}
/**
* Returns a vector of pointers to the @c Group objects associated to this frame.
*/
QVector<Group *> Frame::groups() const
QVector<Group *> &Frame::groups()
{
return m_groups;
}

2
src/JSON/Frame.h
View File

@ -42,7 +42,7 @@ public:
void clear();
QString title() const;
int groupCount() const;
QVector<Group *> groups() const;
QVector<Group *> &groups();
bool read(const QJsonObject &object);
Q_INVOKABLE Group *getGroup(const int index);

4
src/JSON/Group.cpp
View File

@ -64,13 +64,13 @@ QString Group::widget() const
*/
int Group::datasetCount() const
{
return datasets().count();
return m_datasets.count();
}
/**
* @return A list with all the dataset objects contained in this group
*/
QVector<Dataset *> Group::datasets() const
QVector<Dataset *> &Group::datasets()
{
return m_datasets;
}

2
src/JSON/Group.h
View File

@ -58,7 +58,7 @@ public:
QString title() const;
QString widget() const;
int datasetCount() const;
QVector<Dataset *> datasets() const;
QVector<Dataset *> &datasets();
bool read(const QJsonObject &object);
Q_INVOKABLE Dataset *getDataset(const int index);

204
src/UI/Dashboard.cpp
View File

@ -363,74 +363,47 @@ Dashboard::WidgetType Dashboard::widgetType(const int globalIndex)
bool Dashboard::barVisible(const int index)
{
if (index < m_barVisibility.count())
return m_barVisibility.at(index);
return false;
return getVisibility(m_barVisibility, index);
}
bool Dashboard::mapVisible(const int index)
{
if (index < m_mapVisibility.count())
return m_mapVisibility.at(index);
return false;
return getVisibility(m_mapVisibility, index);
}
bool Dashboard::plotVisible(const int index)
{
if (index < m_plotVisibility.count())
return m_plotVisibility.at(index);
return false;
return getVisibility(m_plotVisibility, index);
}
bool Dashboard::groupVisible(const int index)
{
if (index < m_groupVisibility.count())
return m_groupVisibility.at(index);
return false;
return getVisibility(m_groupVisibility, index);
}
bool Dashboard::gaugeVisible(const int index)
{
if (index < m_gaugeVisibility.count())
return m_gaugeVisibility.at(index);
return false;
return getVisibility(m_gaugeVisibility, index);
}
bool Dashboard::compassVisible(const int index)
{
if (index < m_compassVisibility.count())
return m_compassVisibility.at(index);
return false;
return getVisibility(m_compassVisibility, index);
}
bool Dashboard::gyroscopeVisible(const int index)
{
if (index < m_gyroscopeVisibility.count())
return m_gyroscopeVisibility.at(index);
return false;
return getVisibility(m_gyroscopeVisibility, index);
}
bool Dashboard::thermometerVisible(const int index)
{
if (index < m_thermometerVisibility.count())
return m_thermometerVisibility.at(index);
return false;
return getVisibility(m_thermometerVisibility, index);
}
bool Dashboard::accelerometerVisible(const int index)
{
if (index < m_accelerometerVisibility.count())
return m_accelerometerVisibility.at(index);
return false;
return getVisibility(m_accelerometerVisibility, index);
}
//--------------------------------------------------------------------------------------------------
@ -439,83 +412,47 @@ bool Dashboard::accelerometerVisible(const int index)
QStringList Dashboard::barTitles()
{
QStringList list;
foreach (auto set, m_barWidgets)
list.append(set->title());
return list;
return getDatasetTitles(m_barWidgets);
}
QStringList Dashboard::mapTitles()
{
QStringList list;
foreach (auto group, m_mapWidgets)
list.append(group->title());
return list;
return getGroupTitles(m_mapWidgets);
}
QStringList Dashboard::plotTitles()
{
QStringList list;
foreach (auto set, m_plotWidgets)
list.append(set->title());
return list;
return getDatasetTitles(m_plotWidgets);
}
QStringList Dashboard::groupTitles()
{
QStringList list;
foreach (auto group, m_latestFrame.groups())
list.append(group->title());
return list;
return getGroupTitles(m_latestFrame.groups());
}
QStringList Dashboard::gaugeTitles()
{
QStringList list;
foreach (auto set, m_gaugeWidgets)
list.append(set->title());
return list;
return getDatasetTitles(m_gaugeWidgets);
}
QStringList Dashboard::compassTitles()
{
QStringList list;
foreach (auto set, m_compassWidgets)
list.append(set->title());
return list;
return getDatasetTitles(m_compassWidgets);
}
QStringList Dashboard::gyroscopeTitles()
{
QStringList list;
foreach (auto group, m_gyroscopeWidgets)
list.append(group->title());
return list;
return getGroupTitles(m_gyroscopeWidgets);
}
QStringList Dashboard::thermometerTitles()
{
QStringList list;
foreach (auto set, m_thermometerWidgets)
list.append(set->title());
return list;
return getDatasetTitles(m_thermometerWidgets);
}
QStringList Dashboard::accelerometerTitles()
{
QStringList list;
foreach (auto group, m_accelerometerWidgets)
list.append(group->title());
return list;
return getGroupTitles(m_accelerometerWidgets);
}
//--------------------------------------------------------------------------------------------------
@ -524,83 +461,47 @@ QStringList Dashboard::accelerometerTitles()
void Dashboard::setBarVisible(const int index, const bool visible)
{
if (index < m_barVisibility.count())
{
m_barVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_barVisibility, index, visible);
}
void Dashboard::setMapVisible(const int index, const bool visible)
{
if (index < m_mapVisibility.count())
{
m_mapVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_mapVisibility, index, visible);
}
void Dashboard::setPlotVisible(const int index, const bool visible)
{
if (index < m_plotVisibility.count())
{
m_plotVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_plotVisibility, index, visible);
}
void Dashboard::setGroupVisible(const int index, const bool visible)
{
if (index < m_groupVisibility.count())
{
m_groupVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_groupVisibility, index, visible);
}
void Dashboard::setGaugeVisible(const int index, const bool visible)
{
if (index < m_gaugeVisibility.count())
{
m_gaugeVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_gaugeVisibility, index, visible);
}
void Dashboard::setCompassVisible(const int index, const bool visible)
{
if (index < m_compassVisibility.count())
{
m_compassVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_compassVisibility, index, visible);
}
void Dashboard::setGyroscopeVisible(const int index, const bool visible)
{
if (index < m_gyroscopeVisibility.count())
{
m_gyroscopeVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_gyroscopeVisibility, index, visible);
}
void Dashboard::setThermometerVisible(const int index, const bool visible)
{
if (index < m_thermometerVisibility.count())
{
m_thermometerVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_thermometerVisibility, index, visible);
}
void Dashboard::setAccelerometerVisible(const int index, const bool visible)
{
if (index < m_accelerometerVisibility.count())
{
m_accelerometerVisibility.replace(index, visible);
emit widgetVisibilityChanged();
}
setVisibility(m_accelerometerVisibility, index, visible);
}
//--------------------------------------------------------------------------------------------------
@ -721,21 +622,21 @@ void Dashboard::updateData()
int i;
for (i = 0; i < barCount(); ++i)
m_barVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < mapCount(); ++i)
m_mapVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < plotCount(); ++i)
m_plotVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < gaugeCount(); ++i)
m_gaugeVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < groupCount(); ++i)
m_groupVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < compassCount(); ++i)
m_compassVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < gyroscopeCount(); ++i)
m_gyroscopeVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < thermometerCount(); ++i)
m_thermometerVisibility.append(true);
for (i = 0; i < barCount(); ++i)
for (i = 0; i < accelerometerCount(); ++i)
m_accelerometerVisibility.append(true);
emit widgetCountChanged();
@ -804,3 +705,38 @@ QVector<JSON::Dataset *> Dashboard::getWidgetDatasets(const QString &handle)
return widgets;
}
QStringList Dashboard::getDatasetTitles(QVector<JSON::Dataset *> &vector)
{
QStringList list;
foreach (auto set, vector)
list.append(set->title());
return list;
}
QStringList Dashboard::getGroupTitles(QVector<JSON::Group *> &vector)
{
QStringList list;
foreach (auto group, vector)
list.append(group->title());
return list;
}
bool Dashboard::getVisibility(QVector<bool> &vector, const int index)
{
if (index < vector.count())
return vector.at(index);
return false;
}
void Dashboard::setVisibility(QVector<bool> &vector, const int index, const bool visible)
{
if (index < vector.count())
{
vector.replace(index, visible);
emit widgetVisibilityChanged();
}
}

7
src/UI/Dashboard.h
View File

@ -157,10 +157,17 @@ private slots:
private:
Dashboard();
QVector<JSON::Dataset *> getPlotWidgets();
QVector<JSON::Group *> getWidgetGroups(const QString &handle);
QVector<JSON::Dataset *> getWidgetDatasets(const QString &handle);
QStringList getGroupTitles(QVector<JSON::Group *> &vector);
QStringList getDatasetTitles(QVector<JSON::Dataset *> &vector);
bool getVisibility(QVector<bool> &vector, const int index);
void setVisibility(QVector<bool> &vector, const int index, const bool visible);
private:
QVector<bool> m_barVisibility;
QVector<bool> m_mapVisibility;

7
src/Widgets/WidgetLoader.cpp
View File

@ -35,12 +35,12 @@ WidgetLoader::WidgetLoader(QQuickItem *parent)
: QQuickPaintedItem(parent)
, m_index(-1)
, m_widget(nullptr)
, m_widgetVisible(true)
, m_widgetVisible(false)
{
// Set item flags
setFlag(ItemHasContents, true);
setFlag(ItemAcceptsInputMethod, true);
setFlag(ItemIsFocusScope, true);
setFlag(ItemAcceptsInputMethod, true);
setAcceptedMouseButtons(Qt::AllButtons);
// Resize widget to fit QML item size
@ -270,8 +270,7 @@ void WidgetLoader::updateWidgetVisible()
if (widgetVisible() != visible)
{
m_widgetVisible = UI::Dashboard::getInstance()->widgetVisible(widgetIndex());
;
m_widgetVisible = visible;
emit widgetVisibleChanged();
}
}