From f1347cf13aee0840b35648ed1e750160f746bdc3 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 27 Jun 2024 21:14:21 +0800 Subject: [PATCH] update --- src/mainwindow.cpp | 47 +++++++++++++++++++++++++++++++++++++----- src/mainwindow.h | 4 +++- src/mainwindow.ui | 60 ++++++++++++++++++++++-------------------------------- 3 files changed, 69 insertions(+), 42 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e516a9c..62f27a9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -285,23 +285,43 @@ void MainWindow::processException(const zexception &e) { // int32_t MainWindow::getDeviceId() { return PublicState_DeviceIDVal; } +map moduleTypes; + void MainWindow::constructAppUI() { ModuleOperaTab::inst()->construct(ui->moduleOpera); + // khbot_module + // ktemperature_ctrl_module + // kfan_ctrl_module + // kcode_scaner + // kpipette_ctrl_module + // ka8000_optical_module + // ktmc_step_motor + // kmini_servo_motor_module + // kboard + // ka8000_idcard_reader + // ka8000_plate_code_scaner + + int32_t tabindex = 2; BoardExtTab::inst()->construct(ui->buttonTabWidget); - + moduleTypes[kboard] = tabindex++; StepMotorCtrlTab::inst()->construct(ui->buttonTabWidget); - StepMotorCtrlTab::inst()->constructRegTab(ui->buttonTabWidget); - + moduleTypes[ktmc_step_motor] = tabindex++; MiniServoTab::inst()->construct(ui->buttonTabWidget); + moduleTypes[kmini_servo_motor_module] = tabindex++; CodeScanerTab::inst()->construct(ui->buttonTabWidget); + moduleTypes[kcode_scaner] = tabindex++; PipetteCtrlTab::inst()->construct(ui->buttonTabWidget); - + moduleTypes[kpipette_ctrl_module] = tabindex++; WaterCoolingTemperatureControlerTab::inst()->construct(ui->buttonTabWidget); + moduleTypes[ktemperature_ctrl_module] = tabindex++; FanCtrlTab::inst()->construct(ui->buttonTabWidget); + moduleTypes[kfan_ctrl_module] = tabindex++; XYRobotTab::inst()->construct(ui->buttonTabWidget); - + moduleTypes[khbot_module] = tabindex++; IDCardReaderTab::inst()->construct(ui->buttonTabWidget); + moduleTypes[ka8000_idcard_reader] = tabindex++; PlateCodeScanerTab::inst()->construct(ui->buttonTabWidget); + moduleTypes[ka8000_plate_code_scaner] = tabindex++; } void MainWindow::on_PublicState_ConfirmKey_clicked() {} @@ -337,3 +357,20 @@ void MainWindow::on_dumpRegListButton_clicked() { ZQUI::ins()->ishow("%-50s %d", regtable[i].regname, regtable[i].index); } } + +void MainWindow::on_boardId_tableWidget_cellDoubleClicked(int row, int column) { + try { + // row + int32_t moduleType; + // ui->boardId_tableWidget->get + + QString id = ui->boardId_tableWidget->item(row, 1)->text(); + ui->PublicState_DeviceID->setText(id); + ui->ModuleNameText->setText(ui->boardId_tableWidget->item(row, 2)->text()); + ICM->readreg(id.toInt(), kreg_module_type, &moduleType); + ui->buttonTabWidget->setCurrentIndex(moduleTypes[moduleType]); + + } catch (const std::exception &e) { + ZQUI::ins()->ishow("Error:%s", e.what()); + } +} diff --git a/src/mainwindow.h b/src/mainwindow.h index d6eb563..c5be252 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -101,7 +101,9 @@ class MainWindow : public QMainWindow { void on_dumpRegListButton_clicked(); - signals: + void on_boardId_tableWidget_cellDoubleClicked(int row, int column); + +signals: void doinui_signal(QFunction); private: diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 215fe4c..7be0279 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -706,7 +706,7 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - 设备ID + 模块名ID @@ -735,37 +735,7 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - false - - - 状态 - - - + @@ -786,12 +756,15 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - 设备连接状态 + 模块名 - - + + + + false + 0 @@ -1496,6 +1469,11 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { 41 + + + 板夹仓水冷模块 + + - @@ -1506,6 +1484,11 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { 42 + + + 气溶胶风扇 + + 孵育盘加热板 @@ -1531,6 +1514,11 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { 51 + + + 孵育盘水冷模块 + + - @@ -1538,7 +1526,7 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - 52 +