lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加状态按钮，修改vidpid时提示重启

This commit is contained in:
yangjiaxuan 2023-09-13 11:11:53 +08:00
parent cc4f3866de
commit c6e72e8a17
5 changed files with 184 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

193
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -116,6 +116,11 @@
<source>Select Log Path</source>
<translation>选择日志路径</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="244"/>
<source>Status</source>
<translation></translation>
</message>
<message>
<source>OK</source>
<translation type="vanished">确定</translation>
@ -125,35 +130,36 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="430"/>
<location filename="dialog_inputserialnum.cpp" line="437"/>
<location filename="dialog_inputserialnum.cpp" line="446"/>
<location filename="dialog_inputserialnum.cpp" line="453"/>
<location filename="dialog_inputserialnum.cpp" line="458"/>
<location filename="dialog_inputserialnum.cpp" line="465"/>
<location filename="dialog_inputserialnum.cpp" line="474"/>
<location filename="dialog_inputserialnum.cpp" line="481"/>
<location filename="dialog_inputserialnum.cpp" line="522"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="387"/>
<location filename="dialog_inputserialnum.cpp" line="406"/>
<source>Speed mode</source>
<translation>速度模式</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="354"/>
<location filename="dialog_inputserialnum.cpp" line="373"/>
<source>Failed!</source>
<translation>失败!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="361"/>
<location filename="dialog_inputserialnum.cpp" line="380"/>
<source>Succeed!</source>
<translation>成功!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="397"/>
<location filename="dialog_inputserialnum.cpp" line="416"/>
<source>Sleep time</source>
<translation>休眠时间</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="406"/>
<location filename="dialog_inputserialnum.cpp" line="425"/>
<source>Vid and Pid</source>
<translation>Vid和Pid</translation>
</message>
@ -166,96 +172,125 @@
<translation type="vanished">检测到配置%1不一致，已重新配置，请再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="416"/>
<location filename="dialog_inputserialnum.cpp" line="435"/>
<source>Consistent configuration</source>
<translation>配置一致！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="430"/>
<location filename="dialog_inputserialnum.cpp" line="458"/>
<source>device is lost</source>
<translation>设备已丢失</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="437"/>
<location filename="dialog_inputserialnum.cpp" line="465"/>
<source>Serial num is empty</source>
<translation>序列号为空</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="446"/>
<location filename="dialog_inputserialnum.cpp" line="474"/>
<source>sn is illegal</source>
<translation>序列号不合法</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="453"/>
<location filename="dialog_inputserialnum.cpp" line="481"/>
<source>The device is testing</source>
<translation>该设备正在进行测试</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="355"/>
<location filename="dialog_inputserialnum.cpp" line="374"/>
<source>set sn failed</source>
<translation>设置序列号失败</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="48"/>
<location filename="dialog_inputserialnum.cpp" line="51"/>
<source>Device name: %1</source>
<translation>设备名： %1</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="250"/>
<location filename="dialog_inputserialnum.cpp" line="255"/>
<source>Target Configration:</source>
<oldsource>Target Configration:
</oldsource>
<translation>目标配置:</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="116"/>
<location filename="dialog_inputserialnum.cpp" line="251"/>
<location filename="dialog_inputserialnum.cpp" line="278"/>
<location filename="dialog_inputserialnum.cpp" line="480"/>
<location filename="dialog_inputserialnum.cpp" line="121"/>
<location filename="dialog_inputserialnum.cpp" line="256"/>
<location filename="dialog_inputserialnum.cpp" line="283"/>
<location filename="dialog_inputserialnum.cpp" line="508"/>
<source>Speep mode: %1PPM</source>
<oldsource>Speep mode: %1PPM
</oldsource>
<translation>速度模式: %1PPM</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="116"/>
<location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="157"/>
<location filename="dialog_inputserialnum.cpp" line="349"/>
<source>Pass</source>
<translation>通过</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="121"/>
<location filename="dialog_inputserialnum.cpp" line="138"/>
<location filename="dialog_inputserialnum.cpp" line="162"/>
<source>Set</source>
<translation>设置</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="252"/>
<location filename="dialog_inputserialnum.cpp" line="279"/>
<location filename="dialog_inputserialnum.cpp" line="481"/>
<location filename="dialog_inputserialnum.cpp" line="138"/>
<location filename="dialog_inputserialnum.cpp" line="257"/>
<location filename="dialog_inputserialnum.cpp" line="284"/>
<location filename="dialog_inputserialnum.cpp" line="509"/>
<source>Sleep time: %1minute</source>
<oldsource>Sleep time: %1minute
</oldsource>
<translation>休眠时间: %1分钟</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="157"/>
<location filename="dialog_inputserialnum.cpp" line="253"/>
<location filename="dialog_inputserialnum.cpp" line="280"/>
<location filename="dialog_inputserialnum.cpp" line="482"/>
<location filename="dialog_inputserialnum.cpp" line="162"/>
<location filename="dialog_inputserialnum.cpp" line="258"/>
<location filename="dialog_inputserialnum.cpp" line="285"/>
<location filename="dialog_inputserialnum.cpp" line="510"/>
<source>Vid: %1 Pid: %2</source>
<oldsource>Vid: %1 Pid: %2
</oldsource>
<translation>Vid: %1 Pid: %2</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="277"/>
<location filename="dialog_inputserialnum.cpp" line="282"/>
<source>Current Configration of device:</source>
<translation>当前设备配置:</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="350"/>
<location filename="dialog_inputserialnum.cpp" line="354"/>
<location filename="dialog_inputserialnum.cpp" line="361"/>
<source>Fail</source>
<translation>无法通过</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="369"/>
<location filename="dialog_inputserialnum.cpp" line="373"/>
<location filename="dialog_inputserialnum.cpp" line="380"/>
<source>Set serial number: %1 </source>
<translation>设置序列号: %1 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="520"/>
<source>Detected that the current device&apos;s vid-pid and device object are not consistent. </source>
<translation>检测到当前设备的vid-pid和设备对象不一致. </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="521"/>
<source>Please reboot device to update. </source>
<translation>请重启设备刷新. </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="523"/>
<source>Do you want to restart now?</source>
<translation>是否立即重启设备?</translation>
</message>
<message>
<source>Detected that the current device&apos;s vid-pid and device object are not consistent. Do you want to restart now?</source>
<translation type="vanished">检测到当前设备的vid-pid和设备对象不是一致的，是否立即重启?</translation>
</message>
<message>
<source>Test result: Failed!</source>
<translation type="vanished">测试结果：失败！</translation>
@ -265,23 +300,23 @@
<translation type="vanished">测试结果：成功！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="391"/>
<location filename="dialog_inputserialnum.cpp" line="400"/>
<location filename="dialog_inputserialnum.cpp" line="410"/>
<location filename="dialog_inputserialnum.cpp" line="419"/>
<source>Inconsistent configuration %1detected, please reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重新配置后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="409"/>
<location filename="dialog_inputserialnum.cpp" line="428"/>
<source>Inconsistent configuration %1detected, please reboot and reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重启后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="484"/>
<location filename="dialog_inputserialnum.cpp" line="512"/>
<source>Set configuration to device </source>
<translation>将目标配置设置到设备 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="485"/>
<location filename="dialog_inputserialnum.cpp" line="513"/>
<source>Test content: </source>
<translation>测试内容： </translation>
</message>
@ -290,21 +325,21 @@
<translation type="vanished">成功，请检查配置</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="252"/>
<location filename="dialog_inputserialnum.cpp" line="279"/>
<location filename="dialog_inputserialnum.cpp" line="481"/>
<location filename="dialog_inputserialnum.cpp" line="138"/>
<location filename="dialog_inputserialnum.cpp" line="257"/>
<location filename="dialog_inputserialnum.cpp" line="284"/>
<location filename="dialog_inputserialnum.cpp" line="509"/>
<source>Sleep time: Not sleeping</source>
<translation>休眠时间: 不休眠</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="350"/>
<location filename="dialog_inputserialnum.cpp" line="484"/>
<location filename="dialog_inputserialnum.cpp" line="369"/>
<location filename="dialog_inputserialnum.cpp" line="512"/>
<source>Tester: %1, Test item: %2</source>
<translation>测试员: %1, 测试项: %2</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="362"/>
<location filename="dialog_inputserialnum.cpp" line="381"/>
<source>set sn succeed</source>
<translation>设置序列号成功</translation>
</message>
@ -422,23 +457,21 @@
<translation>选择路径</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="30"/>
<location filename="dialog_setlogpath.cpp" line="38"/>
<location filename="dialog_setlogpath.cpp" line="39"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="30"/>
<source>Directory can not be empty</source>
<translation>文件不能为空</translation>
<translation type="vanished">文件不能为空</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="38"/>
<location filename="dialog_setlogpath.cpp" line="39"/>
<source>Create logPath failed</source>
<translation>创建文件失败</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="54"/>
<location filename="dialog_setlogpath.cpp" line="55"/>
<source>Browse directory</source>
<translation>打开文件</translation>
</message>
@ -716,55 +749,55 @@
<translation type="vanished">退出</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="49"/>
<location filename="dialog_login.cpp" line="50"/>
<source>Set host and port</source>
<translation>设置IP与端口</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="50"/>
<location filename="dialog_login.cpp" line="51"/>
<source>Minimize</source>
<translation>最小化</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="51"/>
<location filename="dialog_login.cpp" line="52"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="52"/>
<location filename="dialog_login.cpp" line="53"/>
<source>LogIn</source>
<translation>登录</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="166"/>
<location filename="dialog_login.cpp" line="172"/>
<location filename="dialog_login.cpp" line="178"/>
<location filename="dialog_login.cpp" line="184"/>
<location filename="dialog_login.cpp" line="167"/>
<location filename="dialog_login.cpp" line="173"/>
<location filename="dialog_login.cpp" line="179"/>
<location filename="dialog_login.cpp" line="185"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="166"/>
<location filename="dialog_login.cpp" line="167"/>
<source>Account dose not exist</source>
<translation>账户不存在</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="172"/>
<location filename="dialog_login.cpp" line="173"/>
<source>Password can not be empty</source>
<translation>密码不能为空</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="178"/>
<location filename="dialog_login.cpp" line="179"/>
<source>Password error</source>
<translation>密码错误</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="184"/>
<location filename="dialog_login.cpp" line="185"/>
<source>Please select a profile first</source>
<translation>请先选择配置文件</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="263"/>
<location filename="dialog_login.cpp" line="264"/>
<source>Select profile</source>
<translation>选择配置文件</translation>
</message>
@ -1624,38 +1657,38 @@
<translation type="vanished">数据库错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="321"/>
<location filename="mainwindow.cpp" line="549"/>
<location filename="mainwindow.cpp" line="589"/>
<location filename="mainwindow.cpp" line="601"/>
<location filename="mainwindow.cpp" line="678"/>
<location filename="mainwindow.cpp" line="322"/>
<location filename="mainwindow.cpp" line="550"/>
<location filename="mainwindow.cpp" line="590"/>
<location filename="mainwindow.cpp" line="602"/>
<location filename="mainwindow.cpp" line="679"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="57"/>
<location filename="mainwindow.cpp" line="58"/>
<source>production tool-burn station</source>
<translation>华高生产工具-烧录工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="101"/>
<location filename="mainwindow.cpp" line="102"/>
<source>production tool-init test station</source>
<translation>华高生产工具-初检工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="103"/>
<location filename="mainwindow.cpp" line="104"/>
<source>production tool-image test station</source>
<translation>华高生产工具-图像测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="105"/>
<location filename="mainwindow.cpp" line="106"/>
<source>production tool-pressure test station</source>
<translation>华高生产工具-压力测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="321"/>
<location filename="mainwindow.cpp" line="589"/>
<location filename="mainwindow.cpp" line="601"/>
<location filename="mainwindow.cpp" line="322"/>
<location filename="mainwindow.cpp" line="590"/>
<location filename="mainwindow.cpp" line="602"/>
<source>Is testing, do not close!</source>
<translation>测试中，请勿关闭！</translation>
</message>
@ -1677,8 +1710,8 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="549"/>
<location filename="mainwindow.cpp" line="678"/>
<location filename="mainwindow.cpp" line="550"/>
<location filename="mainwindow.cpp" line="679"/>
<source>cannot create more table</source>
<translation>不能创建更多项目</translation>
</message>

45
app/HGProductionTool/dialog_inputserialnum.cpp
View File

@ -20,7 +20,9 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l
m_devType(devType),
m_devName(devName),
m_hg(nullptr),
m_curIndex(0)
m_curIndex(0),
m_originVid(0),
m_originPid(0)
{
ui->setupUi(this);
@ -43,10 +45,10 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l
ui->pbtn_slectLogPath->setVisible(true);
}
updatePassStatus(false);
ui->pbtn_enterTest->setEnabled(false);
ui->label_scanner->setText(tr("Device name: %1").arg(m_devName));
ui->lineEdit_sn->setValidator(new QRegExpValidator(QRegExp("[a-zA-Z0-9]+$")));
ui->lineEdit_sn->setMaxLength(14);
@ -66,6 +68,9 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l
connect(this, SIGNAL(testResult()), this, SLOT(on_testResult()));
m_originVid = getDevVid();
m_originPid = getDevPid();
setSleepTime();
updateTargetCfg();
updateCurDeviceCfg();
@ -337,6 +342,20 @@ void Dialog_InputSerialNum::addInteractInfo(QString info, bool isNormal)
ui->textBrowser_info->setTextColor(Qt::black);
}
void Dialog_InputSerialNum::updatePassStatus(bool pass)
{
if (pass)
{
ui->pushButton_status->setText(tr("Pass"));
ui->pushButton_status->setStyleSheet("background-color: yellow");
}
else
{
ui->pushButton_status->setText(tr("Fail"));
ui->pushButton_status->setStyleSheet("background-color: red");
}
}
void Dialog_InputSerialNum::on_testResult()
{
//m_mainWnd->releaseTesting();
@ -410,6 +429,12 @@ void Dialog_InputSerialNum::on_pbtn_checkConfig_clicked()
addInteractInfo(info, false);
}
if (m_originVid != vid_to || m_originPid != pid_to)
{
right = false;
}
updatePassStatus(right);
ui->pbtn_enterTest->setEnabled(right);
if (right)
{
@ -487,6 +512,20 @@ void Dialog_InputSerialNum::on_pbtn_setConfig_clicked()
updateTargetCfg();
updateCurDeviceCfg();
if (m_originVid != vid_to || m_originPid != pid_to)
{
QString info = tr("Detected that the current device's vid-pid and device object are not consistent. ");
addInteractInfo(info + tr("Please reboot device to update. "), false);
QMessageBox msg(QMessageBox::Question, tr("tips"),
info + tr("Do you want to restart now?"),
QMessageBox::Yes | QMessageBox::No, this);
msg.exec();
if (msg.clickedButton() == msg.button(QMessageBox::Yes))
{
rebootDevice();
}
}
//QMessageBox::information(this, tr("Prompt"), (tr("Success, please check the configuration")));
}

3
app/HGProductionTool/dialog_inputserialnum.h
View File

@ -40,6 +40,7 @@ private:
QString getLogPath();
void writeTestLog(QString logContent);
void addInteractInfo(QString info, bool isNormal);
void updatePassStatus(bool pass);
signals:
void testResult();
@ -88,6 +89,8 @@ private:
hgscanner *m_hg;
int m_curIndex;
int m_originVid;
int m_originPid;
};
#endif // DIALOG_INPUTSERIALNUM_H

39
app/HGProductionTool/dialog_inputserialnum.ui
View File

@ -17,21 +17,21 @@
<property name="geometry">
<rect>
<x>570</x>
<y>150</y>
<y>210</y>
<width>190</width>
<height>30</height>
<height>35</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>190</width>
<height>30</height>
<height>35</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>190</width>
<height>30</height>
<height>35</height>
</size>
</property>
<property name="layoutDirection">
@ -45,21 +45,21 @@
<property name="geometry">
<rect>
<x>570</x>
<y>230</y>
<y>300</y>
<width>190</width>
<height>30</height>
<height>35</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>190</width>
<height>30</height>
<height>35</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>190</width>
<height>30</height>
<height>35</height>
</size>
</property>
<property name="layoutDirection">
@ -73,21 +73,21 @@
<property name="geometry">
<rect>
<x>570</x>
<y>310</y>
<y>380</y>
<width>190</width>
<height>30</height>
<height>35</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>190</width>
<height>30</height>
<height>35</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>190</width>
<height>30</height>
<height>35</height>
</size>
</property>
<property name="layoutDirection">
@ -149,7 +149,7 @@
<property name="geometry">
<rect>
<x>610</x>
<y>400</y>
<y>460</y>
<width>101</width>
<height>41</height>
</rect>
@ -231,6 +231,19 @@
<string>Select Log Path</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_status">
<property name="geometry">
<rect>
<x>610</x>
<y>120</y>
<width>111</width>
<height>51</height>
</rect>
</property>
<property name="text">
<string>Status</string>
</property>
</widget>
</widget>
<resources/>
<connections/>