refactor
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
#include <QModbusDataUnit>
|
||||
#include <QTimer>
|
||||
|
||||
class ColoredSquare : public QWidget {
|
||||
class ColoredSquare final : public QWidget {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ColoredSquare(QWidget *parent = nullptr);
|
||||
@@ -25,12 +25,12 @@ private:
|
||||
QColor m_color;
|
||||
};
|
||||
|
||||
class Mainwindows : public QWidget {
|
||||
class MainWindows final : public QWidget {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Mainwindows(QWidget *parent = nullptr);
|
||||
~Mainwindows() override;
|
||||
explicit MainWindows(QWidget *parent = nullptr);
|
||||
~MainWindows() override;
|
||||
|
||||
private slots:
|
||||
void onStateChanged(QModbusDevice::State state);
|
||||
@@ -41,17 +41,16 @@ private slots:
|
||||
private:
|
||||
void createUIElements();
|
||||
void initModbusConnection();
|
||||
void writeRegister(int index);
|
||||
void readRegisters();
|
||||
void loadConfiguration();
|
||||
|
||||
QTableWidget* m_table;
|
||||
QTableWidget* m_table{};
|
||||
QString m_ipAddress;
|
||||
int m_port;
|
||||
int m_port{};
|
||||
QVector<int> m_buttonRegisters;
|
||||
QVector<int> m_indicatorRegisters;
|
||||
int m_buttonCount;
|
||||
int m_indicatorCount;
|
||||
int m_buttonCount{};
|
||||
int m_indicatorCount{};
|
||||
QVector<QPushButton*> m_buttons;
|
||||
QVector<ColoredSquare*> m_squares;
|
||||
QVector<int> m_colorIndices;
|
||||
@@ -61,13 +60,13 @@ private:
|
||||
QVector<QString> m_indicatorLabels;
|
||||
|
||||
QModbusTcpClient* m_modbusClient;
|
||||
QPushButton* m_connectButton;
|
||||
QPushButton* m_connectButton{};
|
||||
bool m_connected;
|
||||
int m_responseTimeout;
|
||||
int m_connectTimeout;
|
||||
int m_pollInterval;
|
||||
QTimer* m_pollTimer;
|
||||
QLabel* m_statusLabel;
|
||||
int m_responseTimeout{};
|
||||
int m_connectTimeout{};
|
||||
int m_pollInterval{};
|
||||
QTimer* m_pollTimer{};
|
||||
QLabel* m_statusLabel{};
|
||||
int m_requestCounter;
|
||||
int m_responseCounter;
|
||||
void updateStatusBar();
|
||||
|
||||
Reference in New Issue
Block a user