生产工具在序列号确认项里增加读取电机版本号
This commit is contained in:
parent
c231cc8913
commit
bea6dff192
Binary file not shown.
|
@ -707,68 +707,67 @@ Pid: %2</translation>
|
|||
<context>
|
||||
<name>Dialog_logIn</name>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="26"/>
|
||||
<location filename="dialog_login.ui" line="14"/>
|
||||
<source>Dialog</source>
|
||||
<translation>登录</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="36"/>
|
||||
<source>Login</source>
|
||||
<translation>登录</translation>
|
||||
<translation type="vanished">登录</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="48"/>
|
||||
<location filename="dialog_login.ui" line="170"/>
|
||||
<source>station1</source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="64"/>
|
||||
<location filename="dialog_login.ui" line="108"/>
|
||||
<source>station2</source>
|
||||
<translation>图像测试工位</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="77"/>
|
||||
<location filename="dialog_login.ui" line="36"/>
|
||||
<source>station3</source>
|
||||
<translation>成品检验工位</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="158"/>
|
||||
<location filename="dialog_login.ui" line="131"/>
|
||||
<source>account:</source>
|
||||
<translation>账户:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="181"/>
|
||||
<location filename="dialog_login.ui" line="157"/>
|
||||
<source>password:</source>
|
||||
<translation>密码:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="194"/>
|
||||
<location filename="dialog_login.ui" line="144"/>
|
||||
<source>device type:</source>
|
||||
<translation>设备类型:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="217"/>
|
||||
<location filename="dialog_login.ui" line="82"/>
|
||||
<source>device config:</source>
|
||||
<translation>设备配置:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="240"/>
|
||||
<location filename="dialog_login.ui" line="186"/>
|
||||
<source>view directory</source>
|
||||
<translation>打开文件目录</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="253"/>
|
||||
<location filename="dialog_login.ui" line="212"/>
|
||||
<source>update connfig</source>
|
||||
<translation>刷新配置</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="145"/>
|
||||
<location filename="dialog_login.ui" line="199"/>
|
||||
<source>remember password</source>
|
||||
<oldsource>Show password</oldsource>
|
||||
<translation>记住密码</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="122"/>
|
||||
<location filename="dialog_login.ui" line="49"/>
|
||||
<source>show password</source>
|
||||
<translation>显示密码</translation>
|
||||
</message>
|
||||
|
@ -817,7 +816,7 @@ Pid: %2</translation>
|
|||
<translation type="vanished">压力测试工位</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="109"/>
|
||||
<location filename="dialog_login.ui" line="95"/>
|
||||
<source>Register</source>
|
||||
<translation>注册</translation>
|
||||
</message>
|
||||
|
@ -838,7 +837,7 @@ Pid: %2</translation>
|
|||
<translation type="vanished">端口号:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_login.ui" line="90"/>
|
||||
<location filename="dialog_login.ui" line="225"/>
|
||||
<source>LOG IN</source>
|
||||
<translation>登录</translation>
|
||||
</message>
|
||||
|
@ -1509,10 +1508,15 @@ Pid: %2</translation>
|
|||
<translation>设备型号:%1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="1035"/>
|
||||
<location filename="form_maininterface.cpp" line="948"/>
|
||||
<source>device serial number:</source>
|
||||
<translation>设备序列号:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="951"/>
|
||||
<source>Motor version:</source>
|
||||
<translation>电机版本号:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Serial number: %1, Test item: %2, Test result: Failed! Reason: %3</source>
|
||||
<oldsource>Serial number: %1, Test item: %2, Test result: Failed! Reason: %3</oldsource>
|
||||
|
@ -1524,16 +1528,16 @@ Pid: %2</translation>
|
|||
<translation type="vanished">设备序列号: %1, 测试项: %2, 测试结果: 通过!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="913"/>
|
||||
<location filename="form_maininterface.cpp" line="1029"/>
|
||||
<location filename="form_maininterface.cpp" line="925"/>
|
||||
<location filename="form_maininterface.cpp" line="1049"/>
|
||||
<source>device history scan count:</source>
|
||||
<translation>设备历史扫描张数:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="789"/>
|
||||
<location filename="form_maininterface.cpp" line="793"/>
|
||||
<location filename="form_maininterface.cpp" line="797"/>
|
||||
<location filename="form_maininterface.cpp" line="801"/>
|
||||
<location filename="form_maininterface.cpp" line="805"/>
|
||||
<location filename="form_maininterface.cpp" line="809"/>
|
||||
<location filename="form_maininterface.cpp" line="813"/>
|
||||
<source>Prompt</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
|
@ -1565,22 +1569,22 @@ Pid: %2</translation>
|
|||
<translation>测试员: %1, 测试项: %2, 测试结果: 通过!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="789"/>
|
||||
<location filename="form_maininterface.cpp" line="801"/>
|
||||
<source>No paper</source>
|
||||
<translation>无纸</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="793"/>
|
||||
<location filename="form_maininterface.cpp" line="805"/>
|
||||
<source>Device is sleeping</source>
|
||||
<translation>设备处于休眠模式</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="797"/>
|
||||
<location filename="form_maininterface.cpp" line="809"/>
|
||||
<source>Counting mode</source>
|
||||
<translation>设备处于计数模式</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="801"/>
|
||||
<location filename="form_maininterface.cpp" line="813"/>
|
||||
<source>Other error</source>
|
||||
<translation>其他错误</translation>
|
||||
</message>
|
||||
|
@ -1689,8 +1693,8 @@ Pid: %2</translation>
|
|||
<translation type="vanished">Pid:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="907"/>
|
||||
<location filename="form_maininterface.cpp" line="1023"/>
|
||||
<location filename="form_maininterface.cpp" line="919"/>
|
||||
<location filename="form_maininterface.cpp" line="1043"/>
|
||||
<source>device roller count:</source>
|
||||
<translation>设备滚轴张数:</translation>
|
||||
</message>
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -98,6 +98,7 @@ private:
|
|||
QString getDevVid();
|
||||
QString getDevPid();
|
||||
QString getDevSn();
|
||||
QString getDevMotorVersion();
|
||||
int getRollerNum();
|
||||
int getHistoryCount();
|
||||
void getLogInfo(int ret);
|
||||
|
|
Loading…
Reference in New Issue