From a2231a24563512a82cc2788c1c21c7ac50a1ea9f Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Wed, 28 Dec 2022 19:53:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B9=E5=9B=BE=E5=83=8F=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/base/test.vcxproj | 8 ++++---- db/HGPdtToolDb/HGPdtToolDb.cpp | 11 +++++++++++ db/HGPdtToolDb/HGPdtToolDb.def | 1 + db/HGPdtToolDb/HGPdtToolDb.h | 3 +++ db/HGPdtToolDb/HGPdtToolDbImpl.cpp | 30 ++++++++++++++++++++++++++++++ db/HGPdtToolDb/HGPdtToolDbImpl.hpp | 1 + 6 files changed, 50 insertions(+), 4 deletions(-) diff --git a/code/base/test.vcxproj b/code/base/test.vcxproj index a1c42c9..ea9003d 100644 --- a/code/base/test.vcxproj +++ b/code/base/test.vcxproj @@ -29,26 +29,26 @@ DynamicLibrary true - v143 + v142 Unicode DynamicLibrary false - v143 + v142 true Unicode DynamicLibrary true - v143 + v142 Unicode DynamicLibrary false - v143 + v142 true Unicode diff --git a/db/HGPdtToolDb/HGPdtToolDb.cpp b/db/HGPdtToolDb/HGPdtToolDb.cpp index 9d9e897..fbad352 100644 --- a/db/HGPdtToolDb/HGPdtToolDb.cpp +++ b/db/HGPdtToolDb/HGPdtToolDb.cpp @@ -374,6 +374,17 @@ HGResult HGAPI HGPdtToolDb_DownloadDeviceEntryImage(HGPdtToolDbDevice device, HG return deviceImpl->DownloadEntryImage(entryName, ftpHost, ftpPort, fileName); } +HGResult HGAPI HGPdtToolDb_CheckDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName) +{ + if (NULL == device) + { + return HGBASE_ERR_INVALIDARG; + } + + HGPdtToolDbDeviceImpl* deviceImpl = (HGPdtToolDbDeviceImpl*)device; + return deviceImpl->CheckEntryImage(entryName); +} + HGResult HGAPI HGPdtToolDb_UploadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName) { diff --git a/db/HGPdtToolDb/HGPdtToolDb.def b/db/HGPdtToolDb/HGPdtToolDb.def index ef70870..54fce4e 100644 --- a/db/HGPdtToolDb/HGPdtToolDb.def +++ b/db/HGPdtToolDb/HGPdtToolDb.def @@ -34,4 +34,5 @@ HGPdtToolDb_GetDeviceEntryExcepDesc HGPdtToolDb_SetDeviceEntryStatus HGPdtToolDb_SetDeviceEntryExcepDesc HGPdtToolDb_DownloadDeviceEntryImage +HGPdtToolDb_CheckDeviceEntryImage HGPdtToolDb_UploadDeviceEntryImage diff --git a/db/HGPdtToolDb/HGPdtToolDb.h b/db/HGPdtToolDb/HGPdtToolDb.h index 4e912b9..584818a 100644 --- a/db/HGPdtToolDb/HGPdtToolDb.h +++ b/db/HGPdtToolDb/HGPdtToolDb.h @@ -202,6 +202,9 @@ HGEXPORT HGResult HGAPI HGPdtToolDb_SetDeviceEntryExcepDesc(HGPdtToolDbDevice de HGEXPORT HGResult HGAPI HGPdtToolDb_DownloadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName); +/* 检查某个测试项关联的图像 */ +HGEXPORT HGResult HGAPI HGPdtToolDb_CheckDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName); + /* 上传/更新某个测试项关联的图像 */ HGEXPORT HGResult HGAPI HGPdtToolDb_UploadDeviceEntryImage(HGPdtToolDbDevice device, HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName); diff --git a/db/HGPdtToolDb/HGPdtToolDbImpl.cpp b/db/HGPdtToolDb/HGPdtToolDbImpl.cpp index f22bcb4..0785dbf 100644 --- a/db/HGPdtToolDb/HGPdtToolDbImpl.cpp +++ b/db/HGPdtToolDb/HGPdtToolDbImpl.cpp @@ -1565,6 +1565,36 @@ HGResult HGPdtToolDbDeviceImpl::DownloadEntryImage(HGUInt entryName, const HGCha return DownloadFile(ftpHost, ftpPort, remotePath.c_str(), fileName); } +HGResult HGPdtToolDbDeviceImpl::CheckEntryImage(HGUInt entryName) +{ + if (NULL == m_userMgr->m_sql) + { + return HGBASE_ERR_FAIL; + } + + const HGChar* entryNameStr = NULL; + if (entryName >= HGPDTTOOLDB_ENTRYNAME_CONFIGURE_SPEED_MODE && entryName <= HGPDTTOOLDB_ENTRYNAME_MECH_PAPER_FEEDING_INCLINATION) + entryNameStr = IMAGE_INSPECTION[entryName - HGPDTTOOLDB_ENTRYNAME_CONFIGURE_SPEED_MODE]; + if (NULL == entryNameStr) + { + return HGBASE_ERR_INVALIDARG; + } + + std::string remotePath; + HGResult res = GetEntryImageRemotePath(entryNameStr, remotePath); + if (HGBASE_ERR_OK != res) + { + return res; + } + + if (remotePath.empty()) + { + return HGBASE_ERR_FAIL; + } + + return HGBASE_ERR_OK; +} + HGResult HGPdtToolDbDeviceImpl::UploadEntryImage(HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar* fileName) { if (NULL == m_userMgr->m_sql) diff --git a/db/HGPdtToolDb/HGPdtToolDbImpl.hpp b/db/HGPdtToolDb/HGPdtToolDbImpl.hpp index d0c3fc9..ca35cc8 100644 --- a/db/HGPdtToolDb/HGPdtToolDbImpl.hpp +++ b/db/HGPdtToolDb/HGPdtToolDbImpl.hpp @@ -87,6 +87,7 @@ public: HGResult GetEntryExcepDesc(HGUInt entryName, HGChar* excepDesc, HGUInt maxLen); HGResult SetEntryExcepDesc(HGUInt entryName, const HGChar* excepDesc); HGResult DownloadEntryImage(HGUInt entryName, const HGChar *ftpHost, HGUShort ftpPort, const HGChar* fileName); + HGResult CheckEntryImage(HGUInt entryName); HGResult UploadEntryImage(HGUInt entryName, const HGChar* ftpHost, HGUShort ftpPort, const HGChar *fileName); private: From 0bd8886684ca408a21b1893083bebd34a89005af Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 28 Dec 2022 21:03:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/HGProductionTool.pro | 5 +- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 9103 -> 9248 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 191 ++++++++++--------- app/HGProductionTool/dialog_userinput.cpp | 38 +++- app/HGProductionTool/dialog_userinput.h | 4 +- app/HGProductionTool/dialog_userinput.ui | 29 ++- app/HGProductionTool/form_maininterface.cpp | 39 ++-- app/HGProductionTool/hgscanner.cpp | 5 +- 8 files changed, 192 insertions(+), 119 deletions(-) diff --git a/app/HGProductionTool/HGProductionTool.pro b/app/HGProductionTool/HGProductionTool.pro index c953320..bb705ff 100644 --- a/app/HGProductionTool/HGProductionTool.pro +++ b/app/HGProductionTool/HGProductionTool.pro @@ -25,13 +25,14 @@ win32 { contains(QT_ARCH, i386) { LIBS += -L../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc LIBS += -L../../../sdk/lib/win/x86/OEM/huagao -lsane - LIBS += -L../../code/base/Debug/ -ltest CONFIG(release, debug|release) { LIBS += -L../../db/Release -lHGPdtToolDb + LIBS += -L../../code/base/Release/ -ltest DESTDIR = ../../../release/win/x86/Release } CONFIG(debug, debug|release) { LIBS += -L../../db/Debug -lHGPdtToolDb + LIBS += -L../../code/base/Debug/ -ltest } } contains(QT_ARCH, x86_64){ @@ -39,10 +40,12 @@ win32 { LIBS += -L../../../sdk/lib/win/x64/OEM/huagao -lsane CONFIG(release, debug|release) { LIBS += -L../../db/x64/Release -lHGPdtToolDb + LIBS += -L../../code/base/x64/Release/ -ltest DESTDIR = ../../../release/win/x64/Release } CONFIG(debug, debug|release) { LIBS += -L../../db/x64/Debug -lHGPdtToolDb + LIBS += -L../../code/base/x64/Debug/ -ltest } } } diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index 5712cb7fcc2eee6bdedaf4eb860f8aa10e1be6c4..69bc9ae386994e89505b77fba8060f491769d5ce 100644 GIT binary patch delta 1239 zcmX|ICNS#`L(17?njfNMKG;+~S3rClU7~k+?*oc`K1nPGn#-rq5`!|4mfcOT_09Rc8^U zeND8c8$z!T#fMN|r_t7~(J?^m2Zcnsh(_fau^%SahcsFQa00bfX!IlxzS3wZBDOcV zzOT_zOYBFJL^4n8m0fVXK%?zb;+D2xeTTUAXNb}tCE+C)%D6*9=LnG_mxSIvqLdC2 zjzx*|jT+f$jfMsPF-}sewqa`5m~vjD&8N|^f<%4`I!sVm@w-IQ097n4g`u;wvgQHk zqw2R}NMx4Q&TufYhqjFP(bZvHq_7Q!=IWZ)-y^c@)@@2Z17lZp-*{P~tn<35>0_%A z@1Sn#ftM(Iz3$igMvTGEevIsr{)bVF zV$P8MdNhdrD*Z1N-$5_P77wo@G9Ohr#wqS)J6C*8WSUYRXPoih*`qD1a97bNUDs%? z(x`N?CyzvkQXgS2FoQ&yv+UKy^N5%(ZqB|N@HC(M>q^V63ORTgigAoa3j(* zZj&}OBzaoedJ{tYnAAN2;Y_#mvEx1jU(l#LEFHH@qJeg4>{LFcb5gqG5;5M0oHE&p z240iPoBE*hhwQzAcjVjhs&HQ%0(tVt=4o``mdE-LDPJv*ok2m?Uq-rtaWm6Kz8{8i zo;Ql)hhdO6dhTLvxn|tyz`0arDjvea{4SHP=4BXr+f;in4`a_Z)nCAQ>JihnCHtWF zhH2+-EY=~@KW~;o@2olCa3=*U_yEnf6xrj&zpz2c9mNH+O$p$CChIwM1DoL}Q}*V* z4*vy8BC;7Wx0H)%m3Z!41JVttPZ`|m0nU8lGCQp2af|Ujq#iWH^-TSIb*?zC$h>2= zL-hoLVqm$at>%;gC6uhojx+^oqXAb#DAF8rZLDo-Sm*MGL$N?87F7$xEVV5s5_0{2SBy6M{eft-#3evU@RZjz2K+JIzXK*OYXATM delta 1155 zcmXAoeN0t#7{|Zo-1BnJIrp3c+$$GRE{$O3)*6}K)(guuLCPjv!eCNa5R&8qy?~|I zHOZ{NSzXv1%a>`wyl7Goi_97WQmAQ5GV=wN-ek3EENn~vu)eqR$JysR&+j?U@B4gz zzjL5)_wsjr+FO7$0eF9YFC#OO0mu&l?o$pe6;O-#>~xs=s>6)!KuI@ijsWH9z?>4` znL}*U1Vn~eGwm?Vau^6g`Y;y|>K)o^ARSJ``yASBB>(^P0tM;Pl3|tzDC!kl%cu_HnLSA*JZ%B4 zYiG^iFa;q>}w^wuHh*4L4R* SRfofB;yqMUSzBGzAp8fFl^J*d diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index 0b805fd..2a69151 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -24,7 +24,7 @@ 取消 - + input excep desc: 请输入异常说明： @@ -85,18 +85,18 @@ 取消 - - + + tips 提示 - + Serial num is empty 序列号为空 - + The device is testing 该设备正在进行测试 @@ -114,25 +114,35 @@ - + YES - 确定 + 是 - + NO - + 否 - + OK 确定 - + Cancel 取消 + + + tips + 提示 + + + + please input valid contents + 请输入有效内容 + Dialog_accountManage @@ -162,50 +172,50 @@ 重置密码 - - - + + + tips 提示 - + create user failed: 创建账户失败： - + Question 询问 - + Are you sure to destroy: 请确认是否删除账户： - + yes 确定 - + no 取消 - + destroy user failed: 销毁账户失败： - + change password succeed 修改密码成功 - + change password failed: 修改密码失败： @@ -218,17 +228,17 @@ 修改密码 - + old password: 旧密码： - + new password: 新密码： - + cfm password: 确认新密码： @@ -247,18 +257,18 @@ 取消 - - + + tips 提示 - + The passwords entered twice are inconsistent 两次输入的密码不一致 - + Change passwords failed: 修改密码失败： @@ -324,32 +334,32 @@ 退出 - + Set host and port 设置IP与端口 - + Minimize 最小化 - + Close 关闭 - + LogIn 登录 - + tips 提示 - + Login failed: 登录失败： @@ -387,12 +397,12 @@ 创建账户 - + Reset password 重置密码 - + new password: 新密码： @@ -445,34 +455,34 @@ 上传 - + Browse directory 打开文件 - + config(*json) 配置文件(*json) - - - + + + tips 提示 - + empty filename 文件为空 - + upload succeed 上传成功 - + upload failed: 上传失败： @@ -535,88 +545,88 @@ 下一步 - + Device has connected 设备已连接 - + Device hasnot connected 设备未连接 - + Device type: 设备型号： - + SerialNum: 序列号： - + connect status: 设备连接状态： - + load last image which uploaded last time 加载上一次上传的图片 - - + + tips 提示 - + yes 确定 - + no 取消 - + ID 序号 - + Test items 测试项 - + status 测试状态 - + not test 未测试 - + not pass 不通过 - + not support 不支持 - + pass 通过 - + no image 无图 @@ -682,7 +692,7 @@ 上传配置文件 - + Account login elsewhere 账户在其他地方登录 @@ -691,94 +701,94 @@ 网络连接断开 - + You have been forced offline by the administrator account 你已被管理员账户强制下线 - + Data base error 数据库错误 - - - - - - - + + + + + + + tips 提示 - + Are you sure to connect the new device 检测到设备连接，是否启动测试？ - + yes 确定 - + no 取消 - - + + cannot create more table 不能创建更多项目 - + The device has disconnected 设备已断开连接 - + save 保存 - + xls(*.xls) xls表格(*.xls) - + export succeed 导出成功 - + export failed 导出失败 - + Illegal user 非法的用户 - + Wrong password 密码错误 - + Database error 数据库错误 - + connect error 连接错误 - + Failed 错误 @@ -787,8 +797,9 @@ QObject - success - 成功 + success: + success + 成功: diff --git a/app/HGProductionTool/dialog_userinput.cpp b/app/HGProductionTool/dialog_userinput.cpp index fbeb7ed..a83e524 100644 --- a/app/HGProductionTool/dialog_userinput.cpp +++ b/app/HGProductionTool/dialog_userinput.cpp @@ -1,8 +1,9 @@ #include "dialog_userinput.h" #include "ui_dialog_userinput.h" #include +#include -Dialog_UserInput::Dialog_UserInput(ui_helper::value_type type, const QString &title, const QString &desc, QWidget *parent) : +Dialog_UserInput::Dialog_UserInput(ui_helper::value_type type, const QString &title, const wchar_t* desc, QWidget *parent) : QDialog(parent), ui(new Ui::Dialog_UserInput), m_type(type), @@ -11,18 +12,31 @@ Dialog_UserInput::Dialog_UserInput(ui_helper::value_type type, const QString &ti { ui->setupUi(this); + ui->radioButton_yes->setVisible(false); + ui->radioButton_no->setVisible(false); + ui->lineEdit->setVisible(false); + ui->comboBox->setVisible(false); if (type == ui_helper::VAL_TYPE_BOOL) { + ui->label->setText(QString::fromStdWString(m_desc)); ui->radioButton_yes->setVisible(true); ui->radioButton_no->setVisible(true); - ui->lineEdit->setVisible(false); } else if (type == ui_helper::VAL_TYPE_INT || type == ui_helper::VAL_TYPE_FLOAT || type == ui_helper::VAL_TYPE_STRING) { - ui->radioButton_yes->setVisible(false); - ui->radioButton_no->setVisible(false); + ui->label->setText(QString::fromStdWString(m_desc)); ui->lineEdit->setVisible(true); } + else if (type == ui_helper::VAL_TYPE_RANGE) + { + while(*m_desc != '\0') + { + ui->comboBox->addItem(QString::number(*m_desc)); + m_desc++; + } + + ui->comboBox->setVisible(true); + } setWindowTitle(m_title); @@ -30,7 +44,7 @@ Dialog_UserInput::Dialog_UserInput(ui_helper::value_type type, const QString &ti ft.setPointSize(15); this->setFont(ft); - ui->label->setText(m_desc); + ui->lineEdit->setValidator(new QRegExpValidator(QRegExp("[0-9]+$"))); } @@ -61,12 +75,22 @@ parameter *Dialog_UserInput::getParam() { param->m_sData = ui->lineEdit->text().toStdWString(); } + else if (m_type == ui_helper::VAL_TYPE_RANGE) + { + param->m_iData = ui->comboBox->currentText().toInt(); + } return param; } void Dialog_UserInput::on_pbtn_yes_clicked() { + if (ui->lineEdit->text().isEmpty() && (m_type == ui_helper::VAL_TYPE_INT || m_type == ui_helper::VAL_TYPE_FLOAT || m_type == ui_helper::VAL_TYPE_STRING)) + { + QMessageBox::information(this, tr("tips"), tr("please input valid contents")); + return; + } + getParam(); accept(); } @@ -91,7 +115,7 @@ size_t UserInputParams::get_size() { if (m_type == ui_helper::VAL_TYPE_BOOL) return sizeof(bool); - if (m_type == ui_helper::VAL_TYPE_INT) + if (m_type == ui_helper::VAL_TYPE_INT || m_type == ui_helper::VAL_TYPE_RANGE) return sizeof(int); if (m_type == ui_helper::VAL_TYPE_FLOAT) return sizeof(double); @@ -104,7 +128,7 @@ void *UserInputParams::get_data() { if (m_type == ui_helper::VAL_TYPE_BOOL) return &m_bData; - if (m_type == ui_helper::VAL_TYPE_INT) + if (m_type == ui_helper::VAL_TYPE_INT || m_type == ui_helper::VAL_TYPE_RANGE) return &m_iData; if (m_type == ui_helper::VAL_TYPE_FLOAT) return &m_fData; diff --git a/app/HGProductionTool/dialog_userinput.h b/app/HGProductionTool/dialog_userinput.h index f6bb535..52a156f 100644 --- a/app/HGProductionTool/dialog_userinput.h +++ b/app/HGProductionTool/dialog_userinput.h @@ -30,7 +30,7 @@ class Dialog_UserInput : public QDialog Q_OBJECT public: - explicit Dialog_UserInput(ui_helper::value_type type, const QString &title, const QString &desc, QWidget *parent = nullptr); + explicit Dialog_UserInput(ui_helper::value_type type, const QString &title, const wchar_t* desc, QWidget *parent = nullptr); ~Dialog_UserInput(); parameter *getParam(); @@ -45,7 +45,7 @@ private: ui_helper::value_type m_type; QString m_title; - QString m_desc; + const wchar_t *m_desc; }; #endif // DIALOG_USERINPUT_H diff --git a/app/HGProductionTool/dialog_userinput.ui b/app/HGProductionTool/dialog_userinput.ui index af70dee..8ef5c31 100644 --- a/app/HGProductionTool/dialog_userinput.ui +++ b/app/HGProductionTool/dialog_userinput.ui @@ -7,7 +7,7 @@ 0 0 426 - 147 + 178 @@ -112,6 +112,33 @@ + + + + + + + 171 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index cf1fdd6..a4b4683 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -162,21 +162,6 @@ void Form_mainInterface::on_testResultImg(void *img) ui->pbtn_leftRotate->setVisible(true); ui->pbtn_rightRotate->setVisible(true); - QString fileName = getCacheFileName(); - HGResult ret = HGImgFmt_SaveImage(image, 0, 0, getStdString(fileName).c_str()); - if(ret == HGBASE_ERR_OK) - { - int row = ui->tableWidget->currentRow(); - QTableWidgetItem *item = ui->tableWidget->item(row, 1); - QString title = item->text(); - HGUInt entryName = getTestItem(title); - - ret = HGPdtToolDb_UploadDeviceEntryImage(m_pdtToolDbDevice, entryName, m_mainwnd->m_ftpHost.toStdString().c_str(), - m_mainwnd->m_ftpPort, fileName.toStdString().c_str()); - QFile file(fileName); - file.remove(); - } - HGBase_DestroyImage(image); } @@ -249,6 +234,27 @@ void Form_mainInterface::on_pbtn_pass_clicked() QTableWidgetItem *item2 = ui->tableWidget->item(row, 2); item2->setToolTip(""); + HGImage img = nullptr; + m_view->getImage(&img); + + if (img != nullptr) + { + QString fileName = getCacheFileName(); + HGResult ret = HGImgFmt_SaveImage(img, 0, 0, getStdString(fileName).c_str()); + if(ret == HGBASE_ERR_OK) + { + int row = ui->tableWidget->currentRow(); + QTableWidgetItem *item = ui->tableWidget->item(row, 1); + QString title = item->text(); + HGUInt entryName = getTestItem(title); + + ret = HGPdtToolDb_UploadDeviceEntryImage(m_pdtToolDbDevice, entryName, m_mainwnd->m_ftpHost.toStdString().c_str(), + m_mainwnd->m_ftpPort, fileName.toStdString().c_str()); + QFile file(fileName); + file.remove(); + } + } + on_pbtn_nextStep_clicked(); } @@ -458,9 +464,10 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur m_textTips->setViewContent(m_map_title_name.value(title).desc); ui->stackedWidget->setCurrentWidget(m_textTips); + m_view->clearImage(); HGUInt entryName = getTestItem(title); - if (entryName <= HGPDTTOOLDB_ENTRYNAME_MECH_PAPER_FEEDING_INCLINATION && entryName >= HGPDTTOOLDB_ENTRYNAME_CONFIGURE_SPEED_MODE) + if (HGBASE_ERR_OK == HGPdtToolDb_CheckDeviceEntryImage(m_pdtToolDbDevice, entryName)) { ui->pbtn_showImg->setVisible(true); } diff --git a/app/HGProductionTool/hgscanner.cpp b/app/HGProductionTool/hgscanner.cpp index 7b7da71..cb49541 100644 --- a/app/HGProductionTool/hgscanner.cpp +++ b/app/HGProductionTool/hgscanner.cpp @@ -2,6 +2,7 @@ #include #include "form_maininterface.h" #include "dialog_userinput.h" +#include hgscanner::hgscanner(Form_mainInterface *form, SANE_Handle h) : m_interface(form) @@ -18,7 +19,7 @@ parameter* hgscanner::get_user_input(data_from from, value_type type, const wcha { if (from == DATA_FROM_USER) { - Dialog_UserInput dlg(type, QString::fromStdWString(title), QString::fromStdWString(desc), m_interface); + Dialog_UserInput dlg(type, QString::fromStdWString(title), desc, m_interface); if (dlg.exec()) { return dlg.getParam(); @@ -39,7 +40,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si QString ret; QString info = QString::fromStdWString((const wchar_t*)data); if (flag) - ret = QObject::tr("success"); + ret = QObject::tr("success: ") + info; else ret = QObject::tr("failed: ") + info;