From d34884046fdf86947e9eaa68535e0c2d8f789c2a Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 4 Aug 2024 22:39:14 +0800 Subject: [PATCH] update --- src/app/syncbox16ch/syncbox16ch.cpp | 5 +++-- src/zqui/zqui/mainwindow.cpp | 26 +++++++++++++++++--------- src/zqui/zqui/mainwindow.h | 3 +++ src/zqui/zqui/mainwindow.ui | 2 +- src/zqui/zqui/zqui.cpp | 11 ++++++++--- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/app/syncbox16ch/syncbox16ch.cpp b/src/app/syncbox16ch/syncbox16ch.cpp index 11604cb..08e6324 100644 --- a/src/app/syncbox16ch/syncbox16ch.cpp +++ b/src/app/syncbox16ch/syncbox16ch.cpp @@ -1,6 +1,7 @@ #include "syncbox16ch.h" #include "ui_syncbox16ch.h" +#include "zqui/zqui/zqui.hpp" typedef enum { koutput_mode_continue_mode, @@ -98,8 +99,8 @@ void SyncBox16CH::onModeChange() { } void SyncBox16CH::on_SendButton_clicked() { + ICLEAR(); + ISHOW("on send button"); - - } diff --git a/src/zqui/zqui/mainwindow.cpp b/src/zqui/zqui/mainwindow.cpp index f39137b..08881f0 100644 --- a/src/zqui/zqui/mainwindow.cpp +++ b/src/zqui/zqui/mainwindow.cpp @@ -10,8 +10,6 @@ #include "zqui/base/QFunction.hpp" #include "zqui/channelmgr/channelmgr.hpp" - - using namespace iflytop; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); @@ -26,8 +24,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi ui->version_pos2->hide(); ui->version_label_po3->hide(); ui->version_pos3->hide(); - - } void MainWindow::buildUI() { @@ -77,7 +73,6 @@ void MainWindow::buildUI() { void MainWindow::on_serialPortCB_customContextMenuRequested(const QPoint &pos) {} void MainWindow::setVersionInfo(int pos, QString versionName, QString version) { - if (pos == 1) { ui->version_label_po1->setText(versionName); ui->version_pos1->setText(version); @@ -123,22 +118,35 @@ void MainWindow::timerEvent(QTimerEvent *event) { } void MainWindow::iShow(QString content) { - QString info; - info.append(content); - ui->CmdBrowser->append(info); + if (icontent.isEmpty()) { + icontent.append(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") + ":" + "\n"); + } + icontent.append(" " + content + "\n"); + ui->CmdBrowser->setText(icontent); +} +void MainWindow::iClear() { + ui->CmdBrowser->clear(); + icontent.clear(); } -void MainWindow::iClear() { ui->CmdBrowser->clear(); } void MainWindow::reportShow(QString content) { QString info; + info.append(QDateTime::currentDateTime().toString("hh:mm:ss.zzz")); info.append(content); + if (ui->ReportBrowser->document()->lineCount() > 1000) { + ui->ReportBrowser->document()->clear(); + } ui->ReportBrowser->append(info); } void MainWindow::reportClear() { ui->ReportBrowser->clear(); } void MainWindow::binaryShow(QString content) { QString info; + info.append(QDateTime::currentDateTime().toString("hh:mm:ss.zzz")); info.append(content); + if (ui->BinaryBrowser->document()->lineCount() > 1000) { + ui->BinaryBrowser->document()->clear(); + } ui->BinaryBrowser->append(info); } void MainWindow::binaryClear() { ui->BinaryBrowser->clear(); } diff --git a/src/zqui/zqui/mainwindow.h b/src/zqui/zqui/mainwindow.h index 7c251f2..2a76915 100644 --- a/src/zqui/zqui/mainwindow.h +++ b/src/zqui/zqui/mainwindow.h @@ -42,6 +42,9 @@ class MainWindow : public QMainWindow { public: Ui::MainWindow *ui; + QString icontent; + + MainWindow(QWidget *parent = nullptr); ~MainWindow() {}; diff --git a/src/zqui/zqui/mainwindow.ui b/src/zqui/zqui/mainwindow.ui index 11a3419..5475939 100644 --- a/src/zqui/zqui/mainwindow.ui +++ b/src/zqui/zqui/mainwindow.ui @@ -991,7 +991,7 @@ background-color: rgb(245, 245, 245); QTabWidget::Rounded - 1 + 0 Qt::ElideLeft diff --git a/src/zqui/zqui/zqui.cpp b/src/zqui/zqui/zqui.cpp index 2577984..33404a7 100644 --- a/src/zqui/zqui/zqui.cpp +++ b/src/zqui/zqui/zqui.cpp @@ -25,7 +25,9 @@ void ZQUI::iShow(const char *fmt, ...) { vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); QString text(buf); - pmainW->iShow(text); + + doinui([this,text](){ pmainW->iShow(text); }); + } void ZQUI::iRawShow(const char *fmt, ...) { va_list args; @@ -35,6 +37,7 @@ void ZQUI::iRawShow(const char *fmt, ...) { va_end(args); QString text(buf); pmainW->iShow(text); + doinui([this,text](){ pmainW->iShow(text); }); } void ZQUI::iClear() { pmainW->iClear(); } @@ -45,7 +48,8 @@ void ZQUI::reportShow(const char *fmt, ...) { vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); QString text(buf); - pmainW->reportShow(text); + doinui([this,text](){ pmainW->reportShow(text); }); + } void ZQUI::reportClear() { pmainW->reportClear(); } @@ -56,7 +60,8 @@ void ZQUI::binaryShow(const char *fmt, ...) { vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); QString text(buf); - pmainW->binaryShow(text); + doinui([this,text](){ pmainW->binaryShow(text); }); + } void ZQUI::binaryClear() { pmainW->binaryClear(); }