diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index 315dcf9..5f04158 100644 Binary files a/app/HGProductionTool/ProductionTool_zh_CN.qm and b/app/HGProductionTool/ProductionTool_zh_CN.qm differ diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index 8bef3b6..1257aaf 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -707,68 +707,67 @@ Pid: %2 Dialog_logIn - + Dialog 登录 - Login - 登录 + 登录 - + station1 - + station2 图像测试工位 - + station3 成品检验工位 - + account: 账户: - + password: 密码: - + device type: 设备类型: - + device config: 设备配置: - + view directory 打开文件目录 - + update connfig 刷新配置 - + remember password Show password 记住密码 - + show password 显示密码 @@ -817,7 +816,7 @@ Pid: %2 压力测试工位 - + Register 注册 @@ -838,7 +837,7 @@ Pid: %2 端口号: - + LOG IN 登录 @@ -1509,10 +1508,15 @@ Pid: %2 设备型号:%1 - + device serial number: 设备序列号: + + + Motor version: + 电机版本号: + Serial number: %1, Test item: %2, Test result: Failed! Reason: %3 Serial number: %1, Test item: %2, Test result: Failed! Reason: %3 @@ -1524,16 +1528,16 @@ Pid: %2 设备序列号: %1, 测试项: %2, 测试结果: 通过! - - + + device history scan count: 设备历史扫描张数: - - - + + + Prompt 提示 @@ -1565,22 +1569,22 @@ Pid: %2 测试员: %1, 测试项: %2, 测试结果: 通过! - + No paper 无纸 - + Device is sleeping 设备处于休眠模式 - + Counting mode 设备处于计数模式 - + Other error 其他错误 @@ -1689,8 +1693,8 @@ Pid: %2 Pid: - - + + device roller count: 设备滚轴张数: diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 3edc556..1945a08 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -760,6 +760,18 @@ QString Form_mainInterface::getDevSn() return QString::fromStdString(serialNum.c_str()); } +QString Form_mainInterface::getDevMotorVersion() +{ + std::string motorNum; + unsigned int motorNumLen = 0; + if(SANE_STATUS_NO_MEM == sane_io_control(m_handle, IO_CTRL_CODE_GET_MOTOR_VERSION, nullptr, &motorNumLen) && motorNumLen) + { + motorNum.resize(motorNumLen); + sane_io_control(m_handle, IO_CTRL_CODE_GET_MOTOR_VERSION, &motorNum[0], &motorNumLen); + } + return QString::fromStdString(motorNum.c_str()); +} + int Form_mainInterface::getRollerNum() { SANE_Int rollCount = 0; @@ -933,8 +945,9 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur } if (name.toStdWString() == HGPDTTOOLDB_NAME_GET_SN) { - QString str(tr("device serial number:") + getDevSn()); - m_textTips->setViewContent(str); + QString snStr(tr("device serial number:") + getDevSn()); + QString motorStr =(tr("Motor version:") + getDevMotorVersion()); + m_textTips->setViewContent(snStr + "\n\n" + motorStr); } } } diff --git a/app/HGProductionTool/form_maininterface.h b/app/HGProductionTool/form_maininterface.h index 98effdd..af8623f 100644 --- a/app/HGProductionTool/form_maininterface.h +++ b/app/HGProductionTool/form_maininterface.h @@ -98,6 +98,7 @@ private: QString getDevVid(); QString getDevPid(); QString getDevSn(); + QString getDevMotorVersion(); int getRollerNum(); int getHistoryCount(); void getLogInfo(int ret);