From 9fb38d18d0caf9a5267a5d8781579947ad31a9ef Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 5 Jan 2023 20:37:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=95=B8=E5=8F=98=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 11374 -> 11418 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 60 ++++++++++-------- app/HGProductionTool/form_maininterface.cpp | 62 ++++++++++++------- app/HGProductionTool/form_maininterface.h | 5 +- app/HGProductionTool/form_maininterface.ui | 34 ++++++++-- app/HGProductionTool/hgscanner.cpp | 5 +- 6 files changed, 109 insertions(+), 57 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index f97907140b4438e7b8e562fe2ce7fc6c964b9f0e..6536b2f556af17008d5fd134be192c86054d4dcb 100644 GIT binary patch delta 667 zcmY*VT}YEr7=F+9clOO`Xr{Tj?bA6+$`z!EQrJa57otubQPGWT>vKArG^av{ij-u5 zjbjlaT~uD=ybxBBjQ&_+cHtscNNRy)nxP0u6r}aiT^EPL`|~{S^E_*(22Nl1bJo^i zyN%1;6MWd3H3s7GZUBQD#4AStGN*yo-32gPfZmz_unw|vQYrTU9ra@sWkaN>;~R8N zH~}OBY1)4Yz*Ip34Zi@kSCiJX#{juiWZEGBWD8_zeH1{>CreuntnZVr=jsu6lY3$7 z#r=8iZG|1{ciiWN6o4!<911^mpE9w1|rpY^Lazs-NKW1rP<$>b$- za~z<*S5Iwfqg(@6WZRrGn2<=tT zy`i5DUyWj7)pWA386Y)6<4;Z?UkQExyC2m?csZ|6Q`(2S<~hyJYwZ9#kIId+_mFE+ zX59e*eN-NtYr^CrY?UvPA85~16=GiVEMG8jN)9U*(v!!uug3ELs7?DukT#mC4-riM7EKgo1;6qWslio?aF_sL{DR_>QL!LQYMMqZTc`F?+oshriCe7d6BN~^(O64+11G-ZE>N+5{ zD)F{$idm+_hj(c9DJjc0iodIj%=ZJuKb5y_3&dYkSz{4dDOXQ!-XbgIYP`J*z-u)V zr|9lJ^~K#B>GOO@G%A`bwY~Iej9T*dI)VKsv>Qv$N%dIc-6^0XrwuMAsGwfHDTcM% z`h~`7a{Q79C9h!Q`Dv-RFsjdvSI~Eb^bbCb8h^u6(h*k0ha|&qx2}%Y0`{y8pQ%4# z%ccy|fED=$w!oeu{Bxn@KB(V fKMBNmkE4j2rfWkj^*P7Vrd$0FT& - + connect status: 设备连接状态： - + load last image which uploaded last time 加载上一次上传的图片 - + Device has disconnected 设备已断开 - - + + tips 提示 - + + destortion value: + 畸变修正值： + + yes - 确定 + 确定 - no - 取消 + 取消 - + ID 序号 - + Test items 测试项 - + status 测试状态 - + not test 未测试 - + not pass 不通过 - + not support 不支持 - + pass 通过 - + + image pixel: + 图像像素： + + + no image 无图 @@ -822,47 +830,47 @@ 设备 - + menu_user 用户 - + act_newDevice 新建项目 - + act_manage 账户管理 - + act_changePwd 修改密码 - + act_export 导出 - + act_logOut 登出 - + act_close 关闭 - + act_upload 上传配置文件 - + act_refreshDevice 刷新设备列表 diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 179366a..24defd4 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -40,7 +40,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn:: connect(this, SIGNAL(testResult(QString)), this, SLOT(on_testResult(QString)), Qt::QueuedConnection); connect(this, SIGNAL(testResultImg(void*)), this, SLOT(on_testResultImg(void*)), Qt::QueuedConnection); - connect(this, SIGNAL(testDistortion(QString,void*)), this, SLOT(on_testDistortion(QString,void*)), Qt::QueuedConnection); + connect(this, SIGNAL(testDistortion(float)), this, SLOT(on_testDistortion(float)), Qt::QueuedConnection); connect(this, SIGNAL(testCorrectInfo(QString)), this, SLOT(on_testCorrectInfo(QString)), Qt::QueuedConnection); QString str; @@ -54,6 +54,9 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn:: ui->label_sn->setText(tr("Device type:") + m_devType + tr(" SerialNum:") + m_serialNum); ui->label_devStatus->setText(tr(" connect status:") + str); + ui->label_imgInfo->setVisible(false); + ui->label_destortionInfo->setVisible(false); + setMinimumWidth(500); ui->tableWidget->setMinimumWidth(400); ui->tableWidget->setMaximumWidth(400); @@ -153,7 +156,7 @@ void Form_mainInterface::on_testResultImg(void *img) HGImage image = (HGImage)img; std::string filename = getStdString(getCacheFileName()); - HGResult ret = HGImgFmt_SaveImage(image, 0, 0, filename.c_str()); + HGImgFmt_SaveImage(image, 0, 0, filename.c_str()); m_list_images.push_back(QString::fromStdString(filename)); m_multiIndex = m_list_images.size() - 1; @@ -166,27 +169,18 @@ void Form_mainInterface::on_testResultImg(void *img) HGBase_DestroyImage(image); } -void Form_mainInterface::on_testDistortion(QString name, void *data) +void Form_mainInterface::on_testDistortion(float value) { - QString info = QString::fromStdWString((const wchar_t*)data); - QMessageBox msg(QMessageBox::Question, name, info, QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); - msg.exec(); - if (msg.clickedButton() == msg.button(QMessageBox::Yes)) - { - // func_test_go(HGPDTTOOLDB_NAME_SINGLE_PAGE_TEST_1, L"null", m_hg); - } - else - { - updateUiEnabled(true); - m_isTesting = false; - m_mainwnd->releaseTesting(); + ui->label_destortionInfo->setText(tr("destortion value: ") + QString::number(value, 'f', 4)); + updateImgPixelInfo(); - if (m_disconnect) - { - m_mainwnd->RemoveInterface(this); - } + updateUiEnabled(true); + m_isTesting = false; + m_mainwnd->releaseTesting(); + + if (m_disconnect) + { + m_mainwnd->RemoveInterface(this); } } @@ -409,6 +403,25 @@ void Form_mainInterface::updateUiEnabled(bool enable) ui->pbtn_leftRotate->setEnabled(enable); ui->pbtn_rightRotate->setEnabled(enable); ui->pbtn_stop->setEnabled(enable); + ui->pbtn_prePage->setEnabled(enable); + ui->pbtn_nextPage->setEnabled(enable); +} + +void Form_mainInterface::updateImgPixelInfo() +{ + ui->label_imgInfo->setVisible(true); + ui->label_destortionInfo->setVisible(true); + + HGImage image = NULL; + m_view->getImage(&image); + HGImageInfo imgInfo; + memset(&imgInfo, 0, sizeof(imgInfo)); + HGBase_GetImageInfo(image, &imgInfo); + int imgWidth = imgInfo.width; + int imgHeight = imgInfo.height; + + if (imgWidth > 0 && imgHeight > 0) + ui->label_imgInfo->setText(tr("image pixel: ") + QString::number(imgWidth) + " * " + QString::number(imgHeight) + " "); } void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous) @@ -419,6 +432,8 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur ui->pbtn_showImg->setVisible(false); ui->pbtn_leftRotate->setVisible(false); ui->pbtn_rightRotate->setVisible(false); + ui->pbtn_prePage->setVisible(false); + ui->pbtn_nextPage->setVisible(false); int row = current->row(); int count = ui->tableWidget->rowCount(); ui->pbtn_preStep->setEnabled(row != 0); @@ -459,6 +474,9 @@ void Form_mainInterface::on_pbtn_start_clicked() if (dir.exists()) dir.removeRecursively(); + ui->label_imgInfo->setVisible(false); + ui->label_destortionInfo->setVisible(false); + int row = ui->tableWidget->currentRow(); QTableWidgetItem *item = ui->tableWidget->item(row, 1); QString title = item->text(); @@ -485,6 +503,8 @@ void Form_mainInterface::on_pbtn_showImg_clicked() { ui->pbtn_leftRotate->setVisible(true); ui->pbtn_rightRotate->setVisible(true); + ui->pbtn_prePage->setVisible(true); + ui->pbtn_nextPage->setVisible(true); ui->stackedWidget->setCurrentWidget(m_view); HGImage img = nullptr; HGImgFmt_LoadImage(fileName.toStdString().c_str(), 0, 0, 0, 0, &img); diff --git a/app/HGProductionTool/form_maininterface.h b/app/HGProductionTool/form_maininterface.h index 751ffa4..3776c9e 100644 --- a/app/HGProductionTool/form_maininterface.h +++ b/app/HGProductionTool/form_maininterface.h @@ -38,13 +38,13 @@ protected: signals: void testResult(QString text); void testResultImg(void* img); - void testDistortion(QString title, void *data); + void testDistortion(float value); void testCorrectInfo(QString info); private slots: void on_testResult(QString text); void on_testResultImg(void* img); - void on_testDistortion(QString title, void *data); + void on_testDistortion(float value); void on_testCorrectInfo(QString info); private slots: @@ -78,6 +78,7 @@ private: QString getCachePath(); QString getCacheFileName(); void updateUiEnabled(bool enable); + void updateImgPixelInfo(); private: Ui::Form_mainInterface *ui; diff --git a/app/HGProductionTool/form_maininterface.ui b/app/HGProductionTool/form_maininterface.ui index 9e4b97c..b743c46 100644 --- a/app/HGProductionTool/form_maininterface.ui +++ b/app/HGProductionTool/form_maininterface.ui @@ -167,11 +167,35 @@ - - - - - + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + diff --git a/app/HGProductionTool/hgscanner.cpp b/app/HGProductionTool/hgscanner.cpp index d8953b1..381188c 100644 --- a/app/HGProductionTool/hgscanner.cpp +++ b/app/HGProductionTool/hgscanner.cpp @@ -98,9 +98,8 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si } else if (ev == TEST_EVENT_DISTORTION_VAL) { - float f = *(float*)data; - QString title = QString::fromStdWString(name); - emit m_interface->testDistortion(title, data); + float fValue = *(float*)data; + emit m_interface->testDistortion(fValue); } else if (ev == TEST_EVENT_FALT_INFO) {