diff --git a/Serial-Studio.pro b/Serial-Studio.pro index 4e709ad2..4896ea8d 100644 --- a/Serial-Studio.pro +++ b/Serial-Studio.pro @@ -55,13 +55,24 @@ QT += core5compat QT += printsupport QT += quickcontrols2 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00 + #----------------------------------------------------------------------------------------- # Compiler options #----------------------------------------------------------------------------------------- *g++*: { - QMAKE_CXXFLAGS_RELEASE -= -O + QMAKE_CXXFLAGS_RELEASE -= -O1 + QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE *= -O3 + QMAKE_CXXFLAGS_RELEASE *= -Ofast +} + +*clang*: { + QMAKE_CXXFLAGS_RELEASE -= -O1 + QMAKE_CXXFLAGS_RELEASE -= -O2 + QMAKE_CXXFLAGS_RELEASE *= -O3 + QMAKE_CXXFLAGS_RELEASE *= -Ofast } *msvc*: { @@ -69,7 +80,7 @@ QT += quickcontrols2 QMAKE_CXXFLAGS_RELEASE *= /O2 } -CONFIG += c++17 +CONFIG += c++11 CONFIG += silent #----------------------------------------------------------------------------------------- diff --git a/src/CSV/Player.h b/src/CSV/Player.h index 7cfb5235..feec099b 100644 --- a/src/CSV/Player.h +++ b/src/CSV/Player.h @@ -28,7 +28,6 @@ #include #include #include -#include #include namespace CSV @@ -104,7 +103,7 @@ private: QFile m_csvFile; QTimer m_frameTimer; QString m_timestamp; - QList m_csvData; + QVector> m_csvData; QMap> m_model; QMap> m_datasetIndexes; }; diff --git a/src/IO/Console.cpp b/src/IO/Console.cpp index d50c312f..47405ca8 100644 --- a/src/IO/Console.cpp +++ b/src/IO/Console.cpp @@ -203,9 +203,9 @@ QString Console::currentHistoryString() const * Returns a list with the available data (sending) modes. This list must be synchronized * with the order of the @c DataMode enums. */ -QStringList Console::dataModes() const +QVector Console::dataModes() const { - QStringList list; + QVector list; list.append(tr("ASCII")); list.append(tr("HEX")); return list; @@ -215,9 +215,9 @@ QStringList Console::dataModes() const * Returns a list with the available line endings options. This list must be synchronized * with the order of the @c LineEnding enums. */ -QStringList Console::lineEndings() const +QVector Console::lineEndings() const { - QStringList list; + QVector list; list.append(tr("No line ending")); list.append(tr("New line")); list.append(tr("Carriage return")); @@ -229,9 +229,9 @@ QStringList Console::lineEndings() const * Returns a list with the available console display modes. This list must be synchronized * with the order of the @c DisplayMode enums. */ -QStringList Console::displayModes() const +QVector Console::displayModes() const { - QStringList list; + QVector list; list.append(tr("Plain text")); list.append(tr("Hexadecimal")); return list; @@ -307,7 +307,7 @@ void Console::clear() } /** - * Comamnds sent by the user are stored in a @c QStringList, in which the first items + * Comamnds sent by the user are stored in a @c QVector, in which the first items * are the oldest commands. * * The user can navigate the list using the up/down keys. This function allows the user @@ -323,7 +323,7 @@ void Console::historyUp() } /** - * Comamnds sent by the user are stored in a @c QStringList, in which the first items + * Comamnds sent by the user are stored in a @c QVector, in which the first items * are the oldest commands. * * The user can navigate the list using the up/down keys. This function allows the user diff --git a/src/IO/Console.h b/src/IO/Console.h index 6a7209a1..66d5e0b1 100644 --- a/src/IO/Console.h +++ b/src/IO/Console.h @@ -24,7 +24,6 @@ #define IO_CONSOLE_H #include -#include namespace IO { @@ -122,9 +121,9 @@ public: DisplayMode displayMode() const; QString currentHistoryString() const; - Q_INVOKABLE QStringList dataModes() const; - Q_INVOKABLE QStringList lineEndings() const; - Q_INVOKABLE QStringList displayModes() const; + Q_INVOKABLE QVector dataModes() const; + Q_INVOKABLE QVector lineEndings() const; + Q_INVOKABLE QVector displayModes() const; Q_INVOKABLE QString formatUserHex(const QString &text); public slots: @@ -167,8 +166,8 @@ private: bool m_showTimestamp; bool m_isStartingLine; - QStringList m_lines; - QStringList m_historyItems; + QVector m_lines; + QVector m_historyItems; QString m_textBuffer; QString m_printFont; diff --git a/src/IO/DataSources/Network.cpp b/src/IO/DataSources/Network.cpp index dddec476..7dfe7308 100644 --- a/src/IO/DataSources/Network.cpp +++ b/src/IO/DataSources/Network.cpp @@ -117,9 +117,9 @@ bool Network::configurationOk() const /** * Returns a list with the available socket types */ -QStringList Network::socketTypes() const +QVector Network::socketTypes() const { - return QStringList { "TCP", "UDP" }; + return QVector { "TCP", "UDP" }; } /** diff --git a/src/IO/DataSources/Network.h b/src/IO/DataSources/Network.h index d2aebdbf..9c50486e 100644 --- a/src/IO/DataSources/Network.h +++ b/src/IO/DataSources/Network.h @@ -59,7 +59,7 @@ class Network : public QObject READ socketTypeIndex WRITE setSocketTypeIndex NOTIFY socketTypeChanged) - Q_PROPERTY(QStringList socketTypes + Q_PROPERTY(QVector socketTypes READ socketTypes CONSTANT) Q_PROPERTY(QString defaultHost @@ -87,7 +87,7 @@ public: bool lookupActive() const; int socketTypeIndex() const; bool configurationOk() const; - QStringList socketTypes() const; + QVector socketTypes() const; QAbstractSocket::SocketType socketType() const; static QString defaultHost() { return "127.0.0.1"; } diff --git a/src/IO/DataSources/Serial.cpp b/src/IO/DataSources/Serial.cpp index c7cd15f4..ec68c527 100644 --- a/src/IO/DataSources/Serial.cpp +++ b/src/IO/DataSources/Serial.cpp @@ -127,7 +127,7 @@ quint8 Serial::portIndex() const /** * Returns the correspoding index of the parity configuration in relation - * to the @c QStringList returned by the @c parityList() function. + * to the @c QVector returned by the @c parityList() function. */ quint8 Serial::parityIndex() const { @@ -136,7 +136,7 @@ quint8 Serial::parityIndex() const /** * Returns the correspoding index of the data bits configuration in relation - * to the @c QStringList returned by the @c dataBitsList() function. + * to the @c QVector returned by the @c dataBitsList() function. */ quint8 Serial::dataBitsIndex() const { @@ -145,7 +145,7 @@ quint8 Serial::dataBitsIndex() const /** * Returns the correspoding index of the stop bits configuration in relation - * to the @c QStringList returned by the @c stopBitsList() function. + * to the @c QVector returned by the @c stopBitsList() function. */ quint8 Serial::stopBitsIndex() const { @@ -154,7 +154,7 @@ quint8 Serial::stopBitsIndex() const /** * Returns the correspoding index of the flow control config. in relation - * to the @c QStringList returned by the @c flowControlList() function. + * to the @c QVector returned by the @c flowControlList() function. */ quint8 Serial::flowControlIndex() const { @@ -169,7 +169,7 @@ quint8 Serial::flowControlIndex() const * be "Select Serial Device". This is inteded to make the user interface * a little more friendly. */ -QStringList Serial::portList() const +QVector Serial::portList() const { return m_portList; } @@ -178,9 +178,9 @@ QStringList Serial::portList() const * Returns a list with the available parity configurations. * This function can be used with a combo-box to build UIs. */ -QStringList Serial::parityList() const +QVector Serial::parityList() const { - QStringList list; + QVector list; list.append(tr("None")); list.append(tr("Even")); list.append(tr("Odd")); @@ -193,7 +193,7 @@ QStringList Serial::parityList() const * Returns a list with the available baud rate configurations. * This function can be used with a combo-box to build UIs. */ -QStringList Serial::baudRateList() const +QVector Serial::baudRateList() const { return m_baudRateList; } @@ -202,27 +202,27 @@ QStringList Serial::baudRateList() const * Returns a list with the available data bits configurations. * This function can be used with a combo-box to build UIs. */ -QStringList Serial::dataBitsList() const +QVector Serial::dataBitsList() const { - return QStringList { "5", "6", "7", "8" }; + return QVector { "5", "6", "7", "8" }; } /** * Returns a list with the available stop bits configurations. * This function can be used with a combo-box to build UIs. */ -QStringList Serial::stopBitsList() const +QVector Serial::stopBitsList() const { - return QStringList { "1", "1.5", "2" }; + return QVector { "1", "1.5", "2" }; } /** * Returns a list with the available flow control configurations. * This function can be used with a combo-box to build UIs. */ -QStringList Serial::flowControlList() const +QVector Serial::flowControlList() const { - QStringList list; + QVector list; list.append(tr("None")); list.append("RTS/CTS"); list.append("XON/XOFF"); @@ -546,14 +546,14 @@ void Serial::setFlowControl(const quint8 flowControlIndex) } /** - * Scans for new serial ports available & generates a QStringList with current + * Scans for new serial ports available & generates a QVector with current * serial ports. */ void Serial::refreshSerialDevices() { // Create device list, starting with dummy header // (for a more friendly UI when no devices are attached) - QStringList ports; + QVector ports; ports.append(tr("Select Port")); // Search for available ports and add them to the lsit @@ -619,7 +619,7 @@ void Serial::handleError(QSerialPort::SerialPortError error) void Serial::readSettings() { // Register standard baud rates - QStringList stdBaudRates + QVector stdBaudRates = { "300", "1200", "2400", "4800", "9600", "19200", "38400", "57600", "74880", "115200", "230400", "250000", "500000", "1000000", "2000000" }; diff --git a/src/IO/DataSources/Serial.h b/src/IO/DataSources/Serial.h index 965bcfe1..6edef4ca 100644 --- a/src/IO/DataSources/Serial.h +++ b/src/IO/DataSources/Serial.h @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -76,22 +75,22 @@ class Serial : public QObject READ baudRate WRITE setBaudRate NOTIFY baudRateChanged) - Q_PROPERTY(QStringList portList + Q_PROPERTY(QVector portList READ portList NOTIFY availablePortsChanged) - Q_PROPERTY(QStringList parityList + Q_PROPERTY(QVector parityList READ parityList CONSTANT) - Q_PROPERTY(QStringList baudRateList + Q_PROPERTY(QVector baudRateList READ baudRateList NOTIFY baudRateListChanged) - Q_PROPERTY(QStringList dataBitsList + Q_PROPERTY(QVector dataBitsList READ dataBitsList CONSTANT) - Q_PROPERTY(QStringList stopBitsList + Q_PROPERTY(QVector stopBitsList READ stopBitsList CONSTANT) - Q_PROPERTY(QStringList flowControlList + Q_PROPERTY(QVector flowControlList READ flowControlList CONSTANT) // clang-format on @@ -125,12 +124,12 @@ public: quint8 stopBitsIndex() const; quint8 flowControlIndex() const; - QStringList portList() const; - QStringList parityList() const; - QStringList baudRateList() const; - QStringList dataBitsList() const; - QStringList stopBitsList() const; - QStringList flowControlList() const; + QVector portList() const; + QVector parityList() const; + QVector baudRateList() const; + QVector dataBitsList() const; + QVector stopBitsList() const; + QVector flowControlList() const; qint32 baudRate() const; QSerialPort::Parity parity() const; @@ -181,8 +180,8 @@ private: quint8 m_stopBitsIndex; quint8 m_flowControlIndex; - QStringList m_portList; - QStringList m_baudRateList; + QVector m_portList; + QVector m_baudRateList; }; } } diff --git a/src/IO/Manager.cpp b/src/IO/Manager.cpp index e61704b8..f5cb2590 100644 --- a/src/IO/Manager.cpp +++ b/src/IO/Manager.cpp @@ -268,9 +268,9 @@ QString Manager::receivedDataLength() const /** * Returns a list with the possible data source options. */ -QStringList Manager::dataSourcesList() const +QVector Manager::dataSourcesList() const { - QStringList list; + QVector list; list.append(tr("Serial port")); list.append(tr("Network port")); return list; diff --git a/src/IO/Manager.h b/src/IO/Manager.h index cbb91d18..4a4a8d5b 100644 --- a/src/IO/Manager.h +++ b/src/IO/Manager.h @@ -151,7 +151,7 @@ public: QString separatorSequence() const; QString receivedDataLength() const; - Q_INVOKABLE QStringList dataSourcesList() const; + Q_INVOKABLE QVector dataSourcesList() const; Q_INVOKABLE qint64 writeData(const QByteArray &data); public slots: diff --git a/src/JSON/Editor.cpp b/src/JSON/Editor.cpp index 717078a8..9b015ef2 100644 --- a/src/JSON/Editor.cpp +++ b/src/JSON/Editor.cpp @@ -90,19 +90,19 @@ Editor *Editor::getInstance() * interface to allow the user to build accelerometer, gyro & map widgets directly from * the UI. */ -QStringList Editor::availableGroupLevelWidgets() +QVector Editor::availableGroupLevelWidgets() { - return QStringList { tr("Dataset widgets"), tr("Accelerometer"), tr("Gyroscope"), - tr("Map"), tr("Multiple data plot") }; + return QVector { tr("Dataset widgets"), tr("Accelerometer"), tr("Gyroscope"), + tr("Map"), tr("Multiple data plot") }; } /** * Returns a list with the available dataset-level widgets. This list is used by the user * interface to allow the user to build gauge, bar & compass widgets directly from the UI. */ -QStringList Editor::availableDatasetLevelWidgets() +QVector Editor::availableDatasetLevelWidgets() { - return QStringList { tr("None"), tr("Gauge"), tr("Bar/level"), tr("Compass") }; + return QVector { tr("None"), tr("Gauge"), tr("Bar/level"), tr("Compass") }; } /** diff --git a/src/JSON/Editor.h b/src/JSON/Editor.h index 3263db9e..d7b91b3d 100644 --- a/src/JSON/Editor.h +++ b/src/JSON/Editor.h @@ -24,7 +24,6 @@ #define JSON_EDITOR_H #include -#include #include "Group.h" #include "Dataset.h" @@ -89,8 +88,8 @@ signals: public: static Editor *getInstance(); - Q_INVOKABLE QStringList availableGroupLevelWidgets(); - Q_INVOKABLE QStringList availableDatasetLevelWidgets(); + Q_INVOKABLE QVector availableGroupLevelWidgets(); + Q_INVOKABLE QVector availableDatasetLevelWidgets(); QString title() const; QString separator() const; diff --git a/src/MQTT/Client.cpp b/src/MQTT/Client.cpp index 50463a9f..b5dea170 100644 --- a/src/MQTT/Client.cpp +++ b/src/MQTT/Client.cpp @@ -180,17 +180,17 @@ bool Client::isConnectedToHost() const /** * Returns a list with the available client operation modes. */ -QStringList Client::clientModes() const +QVector Client::clientModes() const { - return QStringList { tr("Publisher"), tr("Subscriber") }; + return QVector { tr("Publisher"), tr("Subscriber") }; } /** * Returns a list with the supported MQTT versions */ -QStringList Client::mqttVersions() const +QVector Client::mqttVersions() const { - return QStringList { "MQTT 3.1.0", "MQTT 3.1.1" }; + return QVector { "MQTT 3.1.0", "MQTT 3.1.1" }; } /** diff --git a/src/MQTT/Client.h b/src/MQTT/Client.h index c5fc9315..d9362587 100644 --- a/src/MQTT/Client.h +++ b/src/MQTT/Client.h @@ -76,10 +76,10 @@ class Client : public QObject Q_PROPERTY(bool lookupActive READ lookupActive NOTIFY lookupActiveChanged) - Q_PROPERTY(QStringList mqttVersions + Q_PROPERTY(QVector mqttVersions READ mqttVersions CONSTANT) - Q_PROPERTY(QStringList clientModes + Q_PROPERTY(QVector clientModes READ clientModes CONSTANT) Q_PROPERTY(quint16 defaultPort @@ -114,8 +114,8 @@ public: bool lookupActive() const; bool isSubscribed() const; bool isConnectedToHost() const; - QStringList clientModes() const; - QStringList mqttVersions() const; + QVector clientModes() const; + QVector mqttVersions() const; quint16 defaultPort() const { return 1883; } QString defaultHost() const { return "127.0.0.1"; } diff --git a/src/Misc/ThemeManager.cpp b/src/Misc/ThemeManager.cpp index 213298fb..d66af6f7 100644 --- a/src/Misc/ThemeManager.cpp +++ b/src/Misc/ThemeManager.cpp @@ -101,7 +101,7 @@ void ThemeManager::setTheme(const int id) if (ans == QMessageBox::Yes) { qApp->quit(); - QProcess::startDetached(qApp->arguments()[0], qApp->arguments()); + QProcess::startDetached(qApp->arguments().at(0), qApp->arguments()); } } @@ -519,12 +519,12 @@ QColor ThemeManager::connectButtonUnchecked() const return m_connectButtonUnchecked; } -QStringList ThemeManager::widgetColors() const +QVector ThemeManager::widgetColors() const { return m_widgetColors; } -QStringList ThemeManager::availableThemes() const +QVector ThemeManager::availableThemes() const { return m_availableThemes; } diff --git a/src/Misc/ThemeManager.h b/src/Misc/ThemeManager.h index 49c526c7..6b4229ff 100644 --- a/src/Misc/ThemeManager.h +++ b/src/Misc/ThemeManager.h @@ -192,10 +192,10 @@ class ThemeManager : public QObject Q_PROPERTY(QColor connectButtonUnchecked READ connectButtonUnchecked NOTIFY themeChanged) - Q_PROPERTY(QStringList widgetColors + Q_PROPERTY(QVector widgetColors READ widgetColors NOTIFY themeChanged) - Q_PROPERTY(QStringList availableThemes + Q_PROPERTY(QVector availableThemes READ availableThemes NOTIFY availableThemesChanged) // clang-format on @@ -262,8 +262,8 @@ public: QColor connectButtonChecked() const; QColor connectButtonUnchecked() const; - QStringList widgetColors() const; - QStringList availableThemes() const; + QVector widgetColors() const; + QVector availableThemes() const; public slots: void setTheme(const int id); @@ -278,8 +278,8 @@ private: private: int m_themeId; QSettings m_settings; - QStringList m_availableThemes; - QStringList m_availableThemesPaths; + QVector m_availableThemes; + QVector m_availableThemesPaths; QColor m_base; QColor m_link; @@ -333,7 +333,7 @@ private: QColor m_widgetControlBackground; QColor m_connectButtonChecked; QColor m_connectButtonUnchecked; - QStringList m_widgetColors; + QVector m_widgetColors; }; } diff --git a/src/Misc/Translator.cpp b/src/Misc/Translator.cpp index 1a3c6011..f09db22f 100644 --- a/src/Misc/Translator.cpp +++ b/src/Misc/Translator.cpp @@ -147,9 +147,9 @@ QString Translator::acknowledgementsText() const /** * Returns a list with the available translation languages. */ -QStringList Translator::availableLanguages() const +QVector Translator::availableLanguages() const { - return QStringList { "English", "Español", "简体中文", "Deutsch", "Русский" }; + return QVector { "English", "Español", "简体中文", "Deutsch", "Русский" }; } /** diff --git a/src/Misc/Translator.h b/src/Misc/Translator.h index 6baace78..9798c859 100644 --- a/src/Misc/Translator.h +++ b/src/Misc/Translator.h @@ -41,7 +41,7 @@ class Translator : public QObject READ language WRITE setLanguage NOTIFY languageChanged) - Q_PROPERTY(QStringList availableLanguages + Q_PROPERTY(QVector availableLanguages READ availableLanguages CONSTANT) // clang-format on @@ -57,7 +57,7 @@ public: int language() const; int systemLanguage() const; - QStringList availableLanguages() const; + QVector availableLanguages() const; Q_INVOKABLE QString welcomeConsoleText() const; Q_INVOKABLE QString acknowledgementsText() const; diff --git a/src/UI/Dashboard.cpp b/src/UI/Dashboard.cpp index da896bca..e6226a3a 100644 --- a/src/UI/Dashboard.cpp +++ b/src/UI/Dashboard.cpp @@ -168,13 +168,13 @@ int Dashboard::accelerometerCount() const { return m_accelerometerWidgets.count( //-------------------------------------------------------------------------------------------------- /** - * Returns a @c QStringList with the titles of all the widgets that compose the current - * JSON frame. + * Returns a @c list with the titles of all the widgets that compose the current JSON + * frame. * * We need to be careful to sincronize the order of the widgets in order to allow * the global-index system to work correctly. */ -QStringList Dashboard::widgetTitles() const +QVector Dashboard::widgetTitles() const { // Warning: maintain same order as the view option repeaters in ViewOptions.qml! @@ -505,16 +505,16 @@ bool Dashboard::accelerometerVisible(const int index) const { return getVisibili //-------------------------------------------------------------------------------------------------- // clang-format off -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_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); } -QStringList Dashboard::multiPlotTitles() const { return groupTitles(m_multiPlotWidgets); } -QStringList Dashboard::thermometerTitles() const { return datasetTitles(m_thermometerWidgets); } -QStringList Dashboard::accelerometerTitles() const { return groupTitles(m_accelerometerWidgets); } +QVector Dashboard::barTitles() const { return datasetTitles(m_barWidgets); } +QVector Dashboard::mapTitles() const { return groupTitles(m_mapWidgets); } +QVector Dashboard::plotTitles() const { return datasetTitles(m_plotWidgets); } +QVector Dashboard::groupTitles() const { return groupTitles(m_groupWidgets); } +QVector Dashboard::gaugeTitles() const { return datasetTitles(m_gaugeWidgets); } +QVector Dashboard::compassTitles() const { return datasetTitles(m_compassWidgets); } +QVector Dashboard::gyroscopeTitles() const { return groupTitles(m_gyroscopeWidgets); } +QVector Dashboard::multiPlotTitles() const { return groupTitles(m_multiPlotWidgets); } +QVector Dashboard::thermometerTitles() const { return datasetTitles(m_thermometerWidgets); } +QVector Dashboard::accelerometerTitles() const { return groupTitles(m_accelerometerWidgets); } // clang-format on //-------------------------------------------------------------------------------------------------- @@ -770,9 +770,9 @@ QVector Dashboard::getWidgetDatasets(const QString &handle) con /** * Returns the titles of the datasets contained in the specified @a vector. */ -QStringList Dashboard::datasetTitles(const QVector &vector) const +QVector Dashboard::datasetTitles(const QVector &vector) const { - QStringList list; + QVector list; foreach (auto set, vector) list.append(set->title()); @@ -782,9 +782,9 @@ QStringList Dashboard::datasetTitles(const QVector &vector) con /** * Returns the titles of the groups contained in the specified @a vector. */ -QStringList Dashboard::groupTitles(const QVector &vector) const +QVector Dashboard::groupTitles(const QVector &vector) const { - QStringList list; + QVector list; foreach (auto group, vector) list.append(group->title()); diff --git a/src/UI/Dashboard.h b/src/UI/Dashboard.h index 263c07dd..b676479f 100644 --- a/src/UI/Dashboard.h +++ b/src/UI/Dashboard.h @@ -73,34 +73,34 @@ class Dashboard : public QObject Q_PROPERTY(int accelerometerCount READ accelerometerCount NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList mapTitles + Q_PROPERTY(QVector mapTitles READ mapTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList barTitles + Q_PROPERTY(QVector barTitles READ barTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList plotTitles + Q_PROPERTY(QVector plotTitles READ plotTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList groupTitles + Q_PROPERTY(QVector groupTitles READ groupTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList gaugeTitles + Q_PROPERTY(QVector gaugeTitles READ gaugeTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList compassTitles + Q_PROPERTY(QVector compassTitles READ compassTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList gyroscopeTitles + Q_PROPERTY(QVector gyroscopeTitles READ gyroscopeTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList multiPlotTitles + Q_PROPERTY(QVector multiPlotTitles READ multiPlotTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList thermometerTitles + Q_PROPERTY(QVector thermometerTitles READ thermometerTitles NOTIFY widgetCountChanged) - Q_PROPERTY(QStringList accelerometerTitles + Q_PROPERTY(QVector accelerometerTitles READ accelerometerTitles NOTIFY widgetCountChanged) // clang-format on @@ -159,7 +159,7 @@ public: int accelerometerCount() const; Q_INVOKABLE bool frameValid() const; - Q_INVOKABLE QStringList widgetTitles() const; + Q_INVOKABLE QVector widgetTitles() const; Q_INVOKABLE int relativeIndex(const int globalIndex) const; Q_INVOKABLE bool widgetVisible(const int globalIndex) const; Q_INVOKABLE QString widgetIcon(const int globalIndex) const; @@ -176,16 +176,16 @@ public: Q_INVOKABLE bool thermometerVisible(const int index) const; Q_INVOKABLE bool accelerometerVisible(const int index) const; - QStringList barTitles() const; - QStringList mapTitles() const; - QStringList plotTitles() const; - QStringList groupTitles() const; - QStringList gaugeTitles() const; - QStringList compassTitles() const; - QStringList gyroscopeTitles() const; - QStringList multiPlotTitles() const; - QStringList thermometerTitles() const; - QStringList accelerometerTitles() const; + QVector barTitles() const; + QVector mapTitles() const; + QVector plotTitles() const; + QVector groupTitles() const; + QVector gaugeTitles() const; + QVector compassTitles() const; + QVector gyroscopeTitles() const; + QVector multiPlotTitles() const; + QVector thermometerTitles() const; + QVector accelerometerTitles() const; public slots: void setBarVisible(const int index, const bool visible); @@ -211,8 +211,8 @@ private: QVector getWidgetGroups(const QString &handle) const; QVector getWidgetDatasets(const QString &handle) const; - QStringList groupTitles(const QVector &vector) const; - QStringList datasetTitles(const QVector &vector) const; + QVector groupTitles(const QVector &vector) const; + QVector datasetTitles(const QVector &vector) const; bool getVisibility(const QVector &vector, const int index) const; void setVisibility(QVector &vector, const int index, const bool visible); diff --git a/src/Widgets/Plot.cpp b/src/Widgets/Plot.cpp index 12437dda..c2dc8a85 100644 --- a/src/Widgets/Plot.cpp +++ b/src/Widgets/Plot.cpp @@ -357,9 +357,11 @@ void Plot::replot() curveData->values().unlock(); } -void Plot::updateData() { +void Plot::updateData() +{ auto dataset = UI::Dashboard::getInstance()->getPlot(m_index); - const QPointF s(static_cast(m_elapsedTimer.elapsed()), dataset->value().toDouble()); + const QPointF s(static_cast(m_elapsedTimer.elapsed()), + dataset->value().toDouble()); SignalData::instance().append(s); updateCurve(); } @@ -370,8 +372,6 @@ void Plot::setIntervalLength(double interval) { m_interval.setMaxValue(m_interval.minValue() + interval); setAxisScale(QwtAxis::XBottom, m_interval.minValue(), m_interval.maxValue()); - - replot(); } } @@ -412,7 +412,7 @@ void Plot::updateCurve() void Plot::incrementInterval() { m_interval - = QwtInterval(m_interval.maxValue(), m_interval.maxValue() + m_interval.width()); + = QwtInterval(m_interval.maxValue(), m_interval.maxValue() + m_interval.width()); CurveData *curveData = static_cast(m_curve->data()); curveData->values().clearStaleValues(m_interval.minValue()); diff --git a/src/Widgets/Terminal.cpp b/src/Widgets/Terminal.cpp index 2056d458..790aebc1 100644 --- a/src/Widgets/Terminal.cpp +++ b/src/Widgets/Terminal.cpp @@ -934,7 +934,7 @@ QList AnsiEscapeCodeHandler::parseText(const FormattedText &input } // get the number QString strNumber; - QStringList numbers; + QVector numbers; while (!strippedText.isEmpty()) { if (strippedText.at(0).isDigit())