From d4ae45d1dc8f1e87933e85bca2fdfe3fad777bfc Mon Sep 17 00:00:00 2001 From: Carl <732416424@qq.com> Date: Mon, 4 Nov 2024 18:07:54 +0800 Subject: [PATCH] [Add] English version 1.0.0 --- Language/BatteryMonitor_CHN.qm | Bin 1713 -> 22 bytes Language/BatteryMonitor_ENG.qm | Bin 979 -> 14230 bytes dialoglogin.cpp | 19 ++++++++- dialoglogin.h | 1 + mainwindow.cpp | 24 +++++++++--- mainwindow.h | 4 ++ mainwindow.ui | 69 ++++++++++++++++----------------- modbusrtu.cpp | 6 +++ modbusrtu.h | 5 ++- 9 files changed, 83 insertions(+), 45 deletions(-) diff --git a/Language/BatteryMonitor_CHN.qm b/Language/BatteryMonitor_CHN.qm index bd7bce8cc0bbb38a0b1b74b0b1b2aee4e6cf90c9..ae247bce803ef44461bb43c214ed3b03f201f91f 100644 GIT binary patch delta 8 PcmdnUD>gxdiP0GV3EBa_ literal 1713 zcmah|T}TvB6u#@;-JRW47b+;Chw&lk#aJUjDhzj3q};&OcHrP)f{A3)V zJRadm47MHNsqJ7#5T5sgokxxa@UfR8M>)pQgI)5_gR@{Oyislx?l*Yp1JH%C-jO^wM|1g{|2gm$7ewxSfjBPp&gk>vn!QT@if_PXE<5Gvsc<(GJDc$AwuMe`7 zneHJdbK+y&<+HD27j?4y3RRKVpd^YkrdYW+Q*Y(YOt0?X4iGiY))9r8(1t87vG-IaLa*Og!$dH?BowTq4>G_KkB+-CYMa8%N$ny|t#^x8ktJ(WTxmZK?# zGP|n8L`uk*=?y4c)lMxl!vpBhqOK5E9m~-L+RJ@kg;fhF%NF4D`=)vw=BQ2)3t>=C z+_{}*>}!iAL- diff --git a/Language/BatteryMonitor_ENG.qm b/Language/BatteryMonitor_ENG.qm index 2851da24cb1ff9b70234f1fa7da5c776252a1912..469fbfd57f674739ab803a18ab088369cf351d8b 100644 GIT binary patch literal 14230 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 diff --git a/dialoglogin.cpp b/dialoglogin.cpp index 27409d0..c624531 100644 --- a/dialoglogin.cpp +++ b/dialoglogin.cpp @@ -10,6 +10,7 @@ #include "appserial.h" #include "modbusrtu.h" #include +#include DialogLogin::DialogLogin(QWidget *parent) : QDialog(parent) @@ -84,11 +85,24 @@ void DialogLogin::init() connect(m_ModbusRTU, &ModbusRTU::sig_showModbusData_base_info_list_47_49_51_53_55, m_MainWindow, &MainWindow::slot_pageHomeBaseInfo47_49_51_53_55); //写寄存器的信号与槽的连接 - connect(m_MainWindow, &MainWindow::write_regs_signals, m_ModbusRTU, &ModbusRTU::write_regs_slot); + connect(m_MainWindow, &MainWindow::write_regs_signals, m_ModbusRTU, &ModbusRTU::write_regs_slot, Qt::QueuedConnection); //读寄存器的信号与槽的连接 - connect(m_MainWindow, &MainWindow::read_regs_signals, m_ModbusRTU, &ModbusRTU::read_regs_slot); + connect(m_MainWindow, &MainWindow::read_regs_signals, m_ModbusRTU, &ModbusRTU::read_regs_slot, Qt::QueuedConnection); connect(m_ModbusRTU, &ModbusRTU::sig_showReadHoldingRegs, m_MainWindow, &MainWindow::slot_pageParaSetShow); + + //主窗口关闭时，关闭线程 + connect(m_MainWindow, &MainWindow::closeThread, this, [=]{ + qDebug() << "关闭线程"; + m_ModbusRTU->quit(); + }); + + // QMetaObject::invokeMethod(m_ModbusRTU,"read_regs_slot",Qt::QueuedConnection); + // connect(m_ModbusRTU, &ModbusRTU::sig_readMoveToThread, m_ModbusRTU, &ModbusRTU::read_regs_slot, Qt::QueuedConnection); + // thread = new QThread; + + // m_ModbusRTU->moveToThread(thread); + // thread->start(); } void DialogLogin::serialInit() @@ -247,6 +261,7 @@ void DialogLogin::slot_btnConnect_clicked() m_MainWindow->statusBarConnectedIcon->setPixmap(QPixmap(QIcon(":/Image/connected2.png").pixmap(QSize(24, 24)))); m_MainWindow->show(); // m_MainWindow->showMaximized(); + // m_ModbusRTU->start(); m_ModbusRTU->start(); } else { diff --git a/dialoglogin.h b/dialoglogin.h index 50cd32c..2ddb72b 100644 --- a/dialoglogin.h +++ b/dialoglogin.h @@ -31,6 +31,7 @@ private: AppSerial *m_Serial; ModbusRTU *m_ModbusRTU; QSettings *ini; + // QThread *thread; int BCUNumbers; signals: diff --git a/mainwindow.cpp b/mainwindow.cpp index 7f1be71..8ad5ede 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -26,11 +26,15 @@ #include #include "modbusrtu.h" #include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) { + qDebug() << "mainwindow:进入线程：" << QThread::currentThread(); + // QMetaObject::invokeMethod(this, "write_regs_slot", Qt::QueuedConnection); + // QMetaObject::invokeMethod(this, "read_regs_slot", Qt::QueuedConnection); ui->setupUi(this); this->init(); this->setMenuStyle(); @@ -218,12 +222,12 @@ void MainWindow::init() //设置按钮的提示文本 - ui->btnHome->setToolTip("概述信息"); - ui->btnBattery->setToolTip("详细信息"); - ui->btnParaSet->setToolTip("参数设置"); - ui->btnDebug->setToolTip("报文信息"); - ui->btnFlash->setToolTip("升级调试"); - ui->btnSetup->setToolTip("串口信息"); + ui->btnHome->setToolTip("概述信息(Overview Information)"); + ui->btnBattery->setToolTip("详细信息(Detailed Information)"); + ui->btnParaSet->setToolTip("参数设置(Parameter Settings)"); + ui->btnDebug->setToolTip("报文信息(Message Information)"); + ui->btnFlash->setToolTip("升级调试(Upgrade Debugging)"); + ui->btnSetup->setToolTip("串口信息(Serial Port)"); ui->btnSetup->setStyleSheet("QToolTip { position: absolute; left: 20px; top: 20px; }"); // ui->btnRecord->setToolTip("记录导出"); @@ -3307,6 +3311,13 @@ void MainWindow::slot_pageParaSetShow(QByteArray byteArray, int dataType, int ro } +void MainWindow::closeEvent(QCloseEvent *e) +{ + emit closeThread(); + + QWidget::closeEvent(e); +} + void MainWindow::on_pageParaSetWrite_clicked() { BatteryConfig::Item item; @@ -3705,4 +3716,5 @@ void MainWindow::on_pageParaSetWrite_clicked() void MainWindow::on_tabChanged(int index) { tabWidget_paraset_index = index; + ui->pageParaSetCheck->setCheckState(Qt::Unchecked); } diff --git a/mainwindow.h b/mainwindow.h index 999d5bb..503af76 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -119,6 +119,7 @@ signals: void closeLogin(); void write_regs_signals(int addr, const uint16_t data); void read_regs_signals(int addr, int nb, uint16_t *data, int row); + void closeThread(); public: void slot_getBcuNumberFromDialoglogin(int number); @@ -131,6 +132,9 @@ public: void slot_pageHomeBaseInfo47_49_51_53_55(QList byteArray, int dataType); void slot_pageParaSetShow(QByteArray byteArray, int dataType, int row, int nb); +protected: + void closeEvent(QCloseEvent *e) override; + private slots: void on_pageParaSetCheck_stateChanged(int arg1); void on_pageParaSetRead_clicked(); diff --git a/mainwindow.ui b/mainwindow.ui index d6c6ea9..36779a0 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -281,7 +281,7 @@ background-color: rgba(255, 255, 255, 0); - 2 + 1 @@ -290,7 +290,7 @@ background-color: rgba(255, 255, 255, 0); } - + @@ -482,8 +482,11 @@ background-color: rgba(255, 255, 255, 0); 9 + + + - <html><head/><body><p align="center">总正继电器</p></body></html> + 总正继电器 Qt::AlignCenter @@ -499,7 +502,7 @@ background-color: rgba(255, 255, 255, 0); - <html><head/><body><p align="center">预充继电器</p></body></html> + 预充继电器 Qt::AlignCenter @@ -515,7 +518,7 @@ background-color: rgba(255, 255, 255, 0); - <html><head/><body><p align="center">总负继电器</p></body></html> + 总负继电器 Qt::AlignCenter @@ -531,7 +534,7 @@ background-color: rgba(255, 255, 255, 0); - <html><head/><body><p align="center">隔离开关</p></body></html> + 隔离开关 Qt::AlignCenter @@ -749,8 +752,8 @@ background-color: rgba(255, 255, 255, 0); 0 0 - 614 - 235 + 1113 + 379 @@ -2378,7 +2381,7 @@ background-color: rgba(255, 255, 255, 0); - 1 + 2 @@ -19177,7 +19180,7 @@ background-color: rgba(255, 255, 255, 0); - check all + 全部勾选 @@ -19197,14 +19200,14 @@ background-color: rgba(255, 255, 255, 0); - read + 读取 - write + 写入 @@ -19355,14 +19358,14 @@ background-color: rgba(255, 255, 255, 0); - Display + 显示 - Clear + 清除 @@ -19392,21 +19395,21 @@ li.checked::marker { content: "\2612"; } - Save Log + 保存 - SendData + 发送数据 - Time Starmp + 时间戳 @@ -19452,13 +19455,13 @@ li.checked::marker { content: "\2612"; } - File + 文件 - Connection + 连接 @@ -19467,36 +19470,30 @@ li.checked::marker { content: "\2612"; } - View + 视图 - Help + 帮助 - Language + 语言 - Debug - - - - - Flash + 调试 - @@ -19509,22 +19506,22 @@ li.checked::marker { content: "\2612"; } - Exit + 退出 - Connect + 连接 - Disconnect + 断开 - Auto Connect + 自动连接 @@ -19535,7 +19532,7 @@ li.checked::marker { content: "\2612"; } true - Show Status Bar + 显示状态栏 @@ -19549,7 +19546,7 @@ li.checked::marker { content: "\2612"; } true - English + 英语 @@ -19560,7 +19557,7 @@ li.checked::marker { content: "\2612"; } true - Chinese + 中文 diff --git a/modbusrtu.cpp b/modbusrtu.cpp index 6bfb632..6741674 100644 --- a/modbusrtu.cpp +++ b/modbusrtu.cpp @@ -7,6 +7,8 @@ ModbusRTU::ModbusRTU(QObject *parent) : QThread(parent) { init(); + // start(); + } ModbusRTU::~ModbusRTU() @@ -23,6 +25,8 @@ void ModbusRTU::init() void ModbusRTU::run() { qDebug() << "进入线程：" << QThread::currentThread(); + // QMetaObject::invokeMethod(QThread::currentThread(), "read_regs_slot", Qt::QueuedConnection); + // QMetaObject::invokeMethod(QThread::currentThread(), "write_regs_slot", Qt::QueuedConnection); while(true) { // qDebug() << "11111111111111111111111111111111"; @@ -166,6 +170,7 @@ void ModbusRTU::run() void ModbusRTU::write_regs_slot(int addr,const uint16_t data) { + qDebug() << "write:进入线程：" << QThread::currentThread(); int rc = write_single_register(addr, data); if(MODBUS_ERR == rc) { qDebug() << "######modbus no message"; @@ -175,6 +180,7 @@ void ModbusRTU::write_regs_slot(int addr,const uint16_t data) void ModbusRTU::read_regs_slot(int addr, int nb, uint16_t *data, int row) { + qDebug() << "read:进入线程：" << QThread::currentThread(); int rc = read_holding_register(addr, nb, data); if(MODBUS_ERR == rc) { // qDebug() << "modbus no message"; diff --git a/modbusrtu.h b/modbusrtu.h index 6727d85..f23d86e 100644 --- a/modbusrtu.h +++ b/modbusrtu.h @@ -13,6 +13,8 @@ class ModbusRTU : public QThread public: ModbusRTU(QObject *parent = nullptr); ~ModbusRTU(); + +public slots: void write_regs_slot(int addr, const uint16_t data); void read_regs_slot(int addr, int nb, uint16_t *data, int row); @@ -25,7 +27,7 @@ public: int dataBit; int stopBit; -protected: +public: void run() override; private: @@ -70,6 +72,7 @@ signals: void sig_showModbusData_base_info_list_47_49_51_53_55(QList byteArray,int dataType); void sig_showReadHoldingRegs(QByteArray byteArray,int dataType, int row, int nb); + public slots: };