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

调整检查配置界面页面布局，增加交互信息文本框

This commit is contained in:
yangjiaxuan 2023-09-11 16:00:44 +08:00
parent 8a1bf42167
commit 4d1286bf73
11 changed files with 440 additions and 367 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.

201
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -77,35 +77,40 @@
<translation type="vanished">设备类型：</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="22"/>
<location filename="dialog_inputserialnum.ui" line="225"/>
<source>Scanner：</source>
<translation>设备名：</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="95"/>
<location filename="dialog_inputserialnum.ui" line="142"/>
<source>serialNum:</source>
<translation>序列号：</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="118"/>
<location filename="dialog_inputserialnum.ui" line="165"/>
<source>Set Sn</source>
<translation>设置序列号</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="189"/>
<location filename="dialog_inputserialnum.ui" line="41"/>
<source>Set configuration</source>
<translation>目标配置写入到设备</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="211"/>
<location filename="dialog_inputserialnum.ui" line="69"/>
<source>Check configuration</source>
<translation>检查配置是否一致</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="233"/>
<location filename="dialog_inputserialnum.ui" line="97"/>
<source>Enter Test</source>
<translation>进入测试</translation>
</message>
<message>
<location filename="dialog_inputserialnum.ui" line="238"/>
<source>Reboot</source>
<translation>重启</translation>
</message>
<message>
<source>OK</source>
<translation type="vanished">确定</translation>
@ -115,165 +120,186 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="312"/>
<location filename="dialog_inputserialnum.cpp" line="317"/>
<location filename="dialog_inputserialnum.cpp" line="381"/>
<location filename="dialog_inputserialnum.cpp" line="388"/>
<location filename="dialog_inputserialnum.cpp" line="397"/>
<location filename="dialog_inputserialnum.cpp" line="404"/>
<location filename="dialog_inputserialnum.cpp" line="419"/>
<location filename="dialog_inputserialnum.cpp" line="426"/>
<location filename="dialog_inputserialnum.cpp" line="435"/>
<location filename="dialog_inputserialnum.cpp" line="442"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="342"/>
<location filename="dialog_inputserialnum.cpp" line="376"/>
<source>Speed mode</source>
<translation>速度模式</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="349"/>
<location filename="dialog_inputserialnum.cpp" line="343"/>
<source>Failed!</source>
<translation>失败!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="350"/>
<source>Succeed!</source>
<translation>成功!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="386"/>
<source>Sleep time</source>
<translation>休眠时间</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="356"/>
<location filename="dialog_inputserialnum.cpp" line="395"/>
<source>Vid and Pid</source>
<translation>Vid和Pid</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="363"/>
<location filename="dialog_inputserialnum.cpp" line="367"/>
<location filename="dialog_inputserialnum.cpp" line="441"/>
<source>Prompt</source>
<translation>提示</translation>
<translation type="vanished">提示</translation>
</message>
<message>
<source>Inconsistent configuration %1detected, reconfigured, please check again</source>
<translation type="vanished">检测到配置%1不一致，已重新配置，请再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="367"/>
<location filename="dialog_inputserialnum.cpp" line="405"/>
<source>Consistent configuration</source>
<translation>配置一致！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="381"/>
<location filename="dialog_inputserialnum.cpp" line="419"/>
<source>device is lost</source>
<translation>设备已丢失</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="388"/>
<location filename="dialog_inputserialnum.cpp" line="426"/>
<source>Serial num is empty</source>
<translation>序列号为空</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="397"/>
<location filename="dialog_inputserialnum.cpp" line="435"/>
<source>sn is illegal</source>
<translation>序列号不合法</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="404"/>
<location filename="dialog_inputserialnum.cpp" line="442"/>
<source>The device is testing</source>
<translation>该设备正在进行测试</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="312"/>
<location filename="dialog_inputserialnum.cpp" line="345"/>
<source>set sn failed</source>
<translation>设置序列号失败</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="41"/>
<location filename="dialog_inputserialnum.cpp" line="39"/>
<source>Device name: %1</source>
<translation>设备名： %1</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="230"/>
<location filename="dialog_inputserialnum.cpp" line="241"/>
<source>Target Configration:</source>
<oldsource>Target Configration:
</oldsource>
<translation>目标配置:</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="231"/>
<location filename="dialog_inputserialnum.cpp" line="258"/>
<location filename="dialog_inputserialnum.cpp" line="431"/>
<location filename="dialog_inputserialnum.cpp" line="107"/>
<location filename="dialog_inputserialnum.cpp" line="242"/>
<location filename="dialog_inputserialnum.cpp" line="269"/>
<location filename="dialog_inputserialnum.cpp" line="469"/>
<source>Speep mode: %1PPM</source>
<oldsource>Speep mode: %1PPM
</oldsource>
<translation>速度模式: %1PPM</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="232"/>
<location filename="dialog_inputserialnum.cpp" line="259"/>
<location filename="dialog_inputserialnum.cpp" line="432"/>
<location filename="dialog_inputserialnum.cpp" line="107"/>
<location filename="dialog_inputserialnum.cpp" line="124"/>
<location filename="dialog_inputserialnum.cpp" line="148"/>
<source>Set</source>
<translation>设置</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="124"/>
<location filename="dialog_inputserialnum.cpp" line="243"/>
<location filename="dialog_inputserialnum.cpp" line="270"/>
<location filename="dialog_inputserialnum.cpp" line="470"/>
<source>Sleep time: %1minute</source>
<oldsource>Sleep time: %1minute
</oldsource>
<translation>休眠时间: %1分钟</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="233"/>
<location filename="dialog_inputserialnum.cpp" line="260"/>
<location filename="dialog_inputserialnum.cpp" line="433"/>
<location filename="dialog_inputserialnum.cpp" line="148"/>
<location filename="dialog_inputserialnum.cpp" line="244"/>
<location filename="dialog_inputserialnum.cpp" line="271"/>
<location filename="dialog_inputserialnum.cpp" line="471"/>
<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="257"/>
<location filename="dialog_inputserialnum.cpp" line="268"/>
<source>Current Configration of device:</source>
<translation>当前设备配置:</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="309"/>
<location filename="dialog_inputserialnum.cpp" line="339"/>
<location filename="dialog_inputserialnum.cpp" line="343"/>
<location filename="dialog_inputserialnum.cpp" line="350"/>
<source>Set serial number: %1 </source>
<translation>设置序列号: %1 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="313"/>
<source>Test result: Failed!</source>
<translation>测试结果：失败！</translation>
<translation type="vanished">测试结果：失败！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="318"/>
<source>Test result: Succeed!</source>
<translation>测试结果：成功！</translation>
<translation type="vanished">测试结果：成功！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="363"/>
<location filename="dialog_inputserialnum.cpp" line="380"/>
<location filename="dialog_inputserialnum.cpp" line="389"/>
<source>Inconsistent configuration %1detected, please reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重新配置后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="435"/>
<location filename="dialog_inputserialnum.cpp" line="398"/>
<source>Inconsistent configuration %1detected, please reboot and reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重启后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="473"/>
<source>Set configuration to device </source>
<translation>将目标配置设置到设备 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="436"/>
<location filename="dialog_inputserialnum.cpp" line="474"/>
<source>Test content: </source>
<translation>测试内容： </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="441"/>
<source>Success, please check the configuration</source>
<translation>成功，请检查配置</translation>
<translation type="vanished">成功，请检查配置</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="232"/>
<location filename="dialog_inputserialnum.cpp" line="259"/>
<location filename="dialog_inputserialnum.cpp" line="432"/>
<location filename="dialog_inputserialnum.cpp" line="124"/>
<location filename="dialog_inputserialnum.cpp" line="243"/>
<location filename="dialog_inputserialnum.cpp" line="270"/>
<location filename="dialog_inputserialnum.cpp" line="470"/>
<source>Sleep time: Not sleeping</source>
<translation>休眠时间: 不休眠</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="309"/>
<location filename="dialog_inputserialnum.cpp" line="435"/>
<location filename="dialog_inputserialnum.cpp" line="339"/>
<location filename="dialog_inputserialnum.cpp" line="473"/>
<source>Tester: %1, Test item: %2</source>
<translation>测试员: %1, 测试项: %2</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="317"/>
<location filename="dialog_inputserialnum.cpp" line="352"/>
<source>set sn succeed</source>
<translation>设置序列号成功</translation>
</message>
@ -559,57 +585,62 @@
<translation>记住密码</translation>
</message>
<message>
<location filename="dialog_login.ui" line="244"/>
<location filename="dialog_login.ui" line="242"/>
<source>show password</source>
<translation>显示密码</translation>
</message>
<message>
<location filename="dialog_login.ui" line="257"/>
<source>dbHost:</source>
<translation>数据库地址：</translation>
</message>
<message>
<location filename="dialog_login.ui" line="267"/>
<location filename="dialog_login.ui" line="280"/>
<source>dbPort:</source>
<translation>数据库端口：</translation>
</message>
<message>
<location filename="dialog_login.ui" line="290"/>
<location filename="dialog_login.ui" line="303"/>
<source>ftpHost:</source>
<translation>FTP地址：</translation>
</message>
<message>
<location filename="dialog_login.ui" line="313"/>
<location filename="dialog_login.ui" line="326"/>
<source>ftpPort:</source>
<translation>FTP端口：</translation>
</message>
<message>
<location filename="dialog_login.ui" line="351"/>
<location filename="dialog_login.ui" line="364"/>
<source>Burn</source>
<translation>烧录工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="367"/>
<location filename="dialog_login.ui" line="380"/>
<source>InitTest</source>
<translation>初检工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="380"/>
<location filename="dialog_login.ui" line="393"/>
<source>ImageTest</source>
<translation>图像测试工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="336"/>
<location filename="dialog_login.ui" line="349"/>
<source>PressureTest</source>
<translation>压力测试工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="412"/>
<location filename="dialog_login.ui" line="425"/>
<source>Register</source>
<translation>注册</translation>
</message>
<message>
<location filename="dialog_login.ui" line="418"/>
<location filename="dialog_login.ui" line="431"/>
<source>Select Profile</source>
<translation>选择配置文件</translation>
</message>
<message>
<location filename="dialog_login.ui" line="430"/>
<location filename="dialog_login.ui" line="443"/>
<source>Select config file</source>
<translation>选择配置文件</translation>
</message>
@ -622,7 +653,7 @@
<translation type="vanished">端口号：</translation>
</message>
<message>
<location filename="dialog_login.ui" line="393"/>
<location filename="dialog_login.ui" line="406"/>
<source>LOG IN</source>
<translation>登录</translation>
</message>
@ -631,55 +662,55 @@
<translation type="vanished">退出</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="31"/>
<location filename="dialog_login.cpp" line="49"/>
<source>Set host and port</source>
<translation>设置IP与端口</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="32"/>
<location filename="dialog_login.cpp" line="50"/>
<source>Minimize</source>
<translation>最小化</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="33"/>
<location filename="dialog_login.cpp" line="51"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="34"/>
<location filename="dialog_login.cpp" line="52"/>
<source>LogIn</source>
<translation>登录</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="147"/>
<location filename="dialog_login.cpp" line="153"/>
<location filename="dialog_login.cpp" line="159"/>
<location filename="dialog_login.cpp" line="165"/>
<location filename="dialog_login.cpp" line="171"/>
<location filename="dialog_login.cpp" line="177"/>
<location filename="dialog_login.cpp" line="183"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="147"/>
<location filename="dialog_login.cpp" line="165"/>
<source>Account dose not exist</source>
<translation>账户不存在</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="153"/>
<location filename="dialog_login.cpp" line="171"/>
<source>Password can not be empty</source>
<translation>密码不能为空</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="159"/>
<location filename="dialog_login.cpp" line="177"/>
<source>Password error</source>
<translation>密码错误</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="165"/>
<location filename="dialog_login.cpp" line="183"/>
<source>Please select a profile first</source>
<translation>请先选择配置文件</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="241"/>
<location filename="dialog_login.cpp" line="261"/>
<source>Select profile</source>
<translation>选择配置文件</translation>
</message>
@ -1525,10 +1556,10 @@
</message>
<message>
<location filename="mainwindow.cpp" line="321"/>
<location filename="mainwindow.cpp" line="554"/>
<location filename="mainwindow.cpp" line="594"/>
<location filename="mainwindow.cpp" line="606"/>
<location filename="mainwindow.cpp" line="683"/>
<location filename="mainwindow.cpp" line="549"/>
<location filename="mainwindow.cpp" line="589"/>
<location filename="mainwindow.cpp" line="601"/>
<location filename="mainwindow.cpp" line="678"/>
<source>tips</source>
<translation>提示</translation>
</message>
@ -1554,8 +1585,8 @@
</message>
<message>
<location filename="mainwindow.cpp" line="321"/>
<location filename="mainwindow.cpp" line="594"/>
<location filename="mainwindow.cpp" line="606"/>
<location filename="mainwindow.cpp" line="589"/>
<location filename="mainwindow.cpp" line="601"/>
<source>Is testing, do not close!</source>
<translation>测试中，请勿关闭！</translation>
</message>
@ -1577,8 +1608,8 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="554"/>
<location filename="mainwindow.cpp" line="683"/>
<location filename="mainwindow.cpp" line="549"/>
<location filename="mainwindow.cpp" line="678"/>
<source>cannot create more table</source>
<translation>不能创建更多项目</translation>
</message>

96
app/HGProductionTool/dialog_inputserialnum.cpp
View File

@ -35,8 +35,6 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l
}
ui->pbtn_enterTest->setEnabled(false);
ui->textEdit_curConfig->setReadOnly(true);
ui->textEdit_target->setReadOnly(true);
ui->label_scanner->setText(tr("Device name: %1").arg(m_devName));
@ -105,6 +103,9 @@ void Dialog_InputSerialNum::setSpeedMode()
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
delete lp;
QString info = tr("Set") + tr("Speep mode: %1PPM").arg(QString::number(speedMode));
addInteractInfo(info, true);
}
void Dialog_InputSerialNum::setSleepTime()
@ -119,6 +120,9 @@ void Dialog_InputSerialNum::setSleepTime()
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
delete lp;
QString info = tr("Set") + (sleepTime > 0 ? tr("Sleep time: %1minute").arg(QString::number(sleepTime)) : tr("Sleep time: Not sleeping"));
addInteractInfo(info, true);
}
void Dialog_InputSerialNum::setVidPid()
@ -136,6 +140,13 @@ void Dialog_InputSerialNum::setVidPid()
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
delete lp;
char buf[10];
sprintf(buf, "%x", jsonGlobal.vid_to);
char buf2[10];
sprintf(buf2, "%x", jsonGlobal.pid_to);
QString info = tr("Set") + tr("Vid: %1 Pid: %2").arg(QString::fromStdString(buf)).arg(QString::fromStdString(buf2));
addInteractInfo(info, true);
}
void Dialog_InputSerialNum::rebootDevice()
@ -210,7 +221,7 @@ int Dialog_InputSerialNum::getDevPid()
void Dialog_InputSerialNum::updateTargetCfg()
{
ui->textEdit_target->clear();
ui->textBrowser_target->clear();
AnalysisJson analysisJson(m_profileName);
AnalysisJson::json_global jsonGlobal = analysisJson.GetGlobal();
@ -227,17 +238,17 @@ void Dialog_InputSerialNum::updateTargetCfg()
sprintf(buf2, "%x", pid_to);
QString content;
content.append(tr("Target Configration:") + "\n\t");
content.append(tr("Speep mode: %1PPM").arg(QString::number(speedMode)) + "\n\t");
content.append((sleepTime > 0 ? tr("Sleep time: %1minute").arg(QString::number(sleepTime)) : tr("Sleep time: Not sleeping")) + "\n\t");
content.append(tr("Vid: %1 Pid: %2").arg(QString::fromStdString(buf)).arg(QString::fromStdString(buf2)) + "\n\t");
content.append(tr("Target Configration:") + "\n\n");
content.append(tr("Speep mode: %1PPM").arg(QString::number(speedMode)) + "\n");
content.append((sleepTime > 0 ? tr("Sleep time: %1minute").arg(QString::number(sleepTime)) : tr("Sleep time: Not sleeping")) + "\n");
content.append(tr("Vid: %1 Pid: %2").arg(QString::fromStdString(buf)).arg(QString::fromStdString(buf2)) + "\n");
ui->textEdit_target->setText(content);
ui->textBrowser_target->setText(content);
}
void Dialog_InputSerialNum::updateCurDeviceCfg()
{
ui->textEdit_curConfig->clear();
ui->textBrowser_curConfig->clear();
if (m_handle == nullptr)
return;
@ -254,12 +265,12 @@ void Dialog_InputSerialNum::updateCurDeviceCfg()
sprintf(buf2, "%x", pid_to);
QString content;
content.append(tr("Current Configration of device:") + "\n\t");
content.append(tr("Speep mode: %1PPM").arg(QString::number(speedMode)) + "\n\t");
content.append(sleepTime > 0 ? tr("Sleep time: %1minute").arg(QString::number(sleepTime)) : tr("Sleep time: Not sleeping") + "\n\t");
content.append(tr("Vid: %1 Pid: %2").arg(QString::fromStdString(buf)).arg(QString::fromStdString(buf2)) + "\n\t");
content.append(tr("Current Configration of device:") + "\n\n");
content.append(tr("Speep mode: %1PPM").arg(QString::number(speedMode)) + "\n");
content.append(sleepTime > 0 ? tr("Sleep time: %1minute").arg(QString::number(sleepTime)) : tr("Sleep time: Not sleeping") + "\n");
content.append(tr("Vid: %1 Pid: %2").arg(QString::fromStdString(buf)).arg(QString::fromStdString(buf2)) + "\n");
ui->textEdit_curConfig->setText(content);
ui->textBrowser_curConfig->setText(content);
}
QString Dialog_InputSerialNum::getLogPath()
@ -296,6 +307,25 @@ void Dialog_InputSerialNum::writeTestLog(QString logContent)
file.close();
}
void Dialog_InputSerialNum::addInteractInfo(QString info, bool isNormal)
{
QDateTime dateTime= QDateTime::currentDateTime();
QString curTime = dateTime .toString("yyyy-MM-dd hh:mm:ss");
QString content = "[" + curTime + "] ";
content.append(info + "\n");
if (isNormal)
ui->textBrowser_info->insertPlainText(content);
else
{
ui->textBrowser_info->setTextColor(Qt::red);
ui->textBrowser_info->insertPlainText(content);
}
ui->textBrowser_info->moveCursor(QTextCursor::End);
ui->textBrowser_info->setTextColor(Qt::black);
}
void Dialog_InputSerialNum::on_testResult()
{
//m_mainWnd->releaseTesting();
@ -309,13 +339,17 @@ void Dialog_InputSerialNum::on_pbtn_setSn_clicked()
QString testLog = tr("Tester: %1, Test item: %2").arg(m_accountName).arg(QString(tr("Set serial number: %1 ").arg(sn)));
if(SANE_STATUS_GOOD != sane_io_control(m_handle, IO_CTRL_CODE_SET_SERIAL, &serialNum[0], nullptr))
{
QMessageBox::information(this, tr("tips"), tr("set sn failed"));
writeTestLog(testLog + tr("Test result: Failed!"));
//QMessageBox::information(this, tr("tips"), tr("set sn failed"));
QString info = QString(tr("Set serial number: %1 ").arg(sn)) + tr("Failed!");
writeTestLog(testLog + tr("set sn failed"));
addInteractInfo(info, false);
}
else
{
QMessageBox::information(this, tr("tips"), tr("set sn succeed"));
writeTestLog(testLog + tr("Test result: Succeed!"));
//QMessageBox::information(this, tr("tips"), tr("set sn succeed"));
QString info = QString(tr("Set serial number: %1 ").arg(sn)) + tr("Succeed!");
writeTestLog(testLog + tr("set sn succeed"));
addInteractInfo(info, true);
}
}
@ -342,6 +376,9 @@ void Dialog_InputSerialNum::on_pbtn_checkConfig_clicked()
item.append(tr("Speed mode"));
item.append(" ");
right = false;
QString info = tr("Inconsistent configuration %1detected, please reconfigure, and check again").arg(item);
addInteractInfo(info, false);
}
if (sleepTime_to != sleepTime)
@ -349,6 +386,8 @@ void Dialog_InputSerialNum::on_pbtn_checkConfig_clicked()
item.append(tr("Sleep time"));
item.append(" ");
right = false;
QString info = tr("Inconsistent configuration %1detected, please reconfigure, and check again").arg(item);
addInteractInfo(info, false);
}
if (vid != vid_to || pid != pid_to)
@ -356,17 +395,15 @@ void Dialog_InputSerialNum::on_pbtn_checkConfig_clicked()
item.append(tr("Vid and Pid"));
item.append(" ");
right = false;
QString info = tr("Inconsistent configuration %1detected, please reboot and reconfigure, and check again").arg(item);
addInteractInfo(info, false);
}
if (!right)
ui->pbtn_enterTest->setEnabled(right);
if (right)
{
QMessageBox::information(this, tr("Prompt"), tr("Inconsistent configuration %1detected, please reconfigure, and check again").arg(item));
ui->pbtn_enterTest->setEnabled(false);
}
else
{
QMessageBox::information(this, tr("Prompt"), tr("Consistent configuration"));
ui->pbtn_enterTest->setEnabled(true);
QString info = tr("Consistent configuration");
addInteractInfo(info, true);
}
delete lp;
@ -439,5 +476,10 @@ void Dialog_InputSerialNum::on_pbtn_setConfig_clicked()
updateTargetCfg();
updateCurDeviceCfg();
QMessageBox::information(this, tr("Prompt"), (tr("Success, please check the configuration")));
//QMessageBox::information(this, tr("Prompt"), (tr("Success, please check the configuration")));
}
void Dialog_InputSerialNum::on_pbtn_reboot_clicked()
{
rebootDevice();
}

3
app/HGProductionTool/dialog_inputserialnum.h
View File

@ -39,6 +39,7 @@ private:
void updateCurDeviceCfg();
QString getLogPath();
void writeTestLog(QString logContent);
void addInteractInfo(QString info, bool isNormal);
signals:
void testResult();
@ -67,6 +68,8 @@ private slots:
void on_pbtn_setConfig_clicked();
void on_pbtn_reboot_clicked();
private:
Ui::Dialog_InputSerialNum *ui;

306
app/HGProductionTool/dialog_inputserialnum.ui
View File

@ -6,170 +6,22 @@
<rect>
<x>0</x>
<y>0</y>
<width>614</width>
<height>384</height>
<width>795</width>
<height>608</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_scanner">
<property name="text">
<string>Scanner：</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTextEdit" name="textEdit_target"/>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="textEdit_curConfig"/>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>25</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_sn">
<property name="minimumSize">
<size>
<width>71</width>
<height>21</height>
</size>
</property>
<property name="text">
<string>serialNum:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_sn">
<property name="minimumSize">
<size>
<width>241</width>
<height>31</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbtn_setSn">
<property name="minimumSize">
<size>
<width>131</width>
<height>31</height>
</size>
</property>
<property name="text">
<string>Set Sn</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="minimumSize">
<size>
<width>43</width>
<height>23</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>7</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pbtn_setConfig">
<property name="geometry">
<rect>
<x>570</x>
<y>150</y>
<width>190</width>
<height>30</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>190</width>
@ -189,9 +41,15 @@
<string>Set configuration</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbtn_checkConfig">
<property name="geometry">
<rect>
<x>570</x>
<y>230</y>
<width>190</width>
<height>30</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>190</width>
@ -211,9 +69,15 @@
<string>Check configuration</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbtn_enterTest">
<property name="geometry">
<rect>
<x>570</x>
<y>310</y>
<width>190</width>
<height>30</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>190</width>
@ -233,23 +97,121 @@
<string>Enter Test</string>
</property>
</widget>
<widget class="QTextBrowser" name="textBrowser_info">
<property name="geometry">
<rect>
<x>10</x>
<y>320</y>
<width>521</width>
<height>231</height>
</rect>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>110</y>
<width>521</width>
<height>191</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTextBrowser" name="textBrowser_target"/>
</item>
<item>
<spacer name="horizontalSpacer_5">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_curConfig"/>
</item>
</layout>
</widget>
<widget class="QLabel" name="label_scanner">
<property name="geometry">
<rect>
<x>20</x>
<y>10</y>
<width>531</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Scanner：</string>
</property>
</widget>
<widget class="QPushButton" name="pbtn_reboot">
<property name="geometry">
<rect>
<x>610</x>
<y>400</y>
<width>101</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>Reboot</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_sn">
<property name="geometry">
<rect>
<x>110</x>
<y>50</y>
<width>261</width>
<height>31</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>40</width>
<height>20</height>
<width>241</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QLabel" name="label_sn">
<property name="geometry">
<rect>
<x>20</x>
<y>50</y>
<width>71</width>
<height>31</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>71</width>
<height>21</height>
</size>
</property>
<property name="text">
<string>serialNum:</string>
</property>
</widget>
<widget class="QPushButton" name="pbtn_setSn">
<property name="geometry">
<rect>
<x>390</x>
<y>50</y>
<width>141</width>
<height>31</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>131</width>
<height>31</height>
</size>
</property>
<property name="text">
<string>Set Sn</string>
</property>
</widget>
</widget>
<resources/>
<connections/>

30
app/HGProductionTool/dialog_login.cpp
View File

@ -23,11 +23,29 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
ft.setPointSize(15);
this->setFont(ft);
QFont ft2;
ft2.setPointSize(8);
ui->lineEdit_password->setFont(ft2);
ui->pbtn_setting->setVisible(false);
ui->radioButton_pressureTest->setVisible(false);
saveCfgValue("admin", "password", getCfgValue("admin", "password", QString("huagaoadmin")));
int type = getCfgValue("login", "station", 0);
if (LogInType_Burn == type)
{
ui->radioButton_burn->setChecked(true);
}
else if (LogInType_InitTest == type)
{
ui->radioButton_initTest->setChecked(true);
}
else if (LogInType_ImageTest == type)
{
ui->radioButton_imageTest->setChecked(true);
}
ui->pbtn_setting->setToolTip(tr("Set host and port"));
ui->pbtn_minum->setToolTip(tr("Minimize"));
ui->pbtn_close->setToolTip(tr("Close"));
@ -38,6 +56,7 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
m_profileName = getCfgValue("login", "profile", m_profileName);
ui->lineEdit_account->setText(getCfgValue("login", "account", QString("")));
ui->lineEdit_profilePath->setText(m_profileName);
ui->checkBox_showPswd->setChecked(getCfgValue("login", "showPassword", false));
ui->checkBox_rememberPswd->setChecked(getCfgValue("login", "rememberPassword", false));
if (ui->lineEdit_account->text() == "admin")
ui->checkBox_rememberPswd->setChecked(false);
@ -166,8 +185,6 @@ void Dialog_logIn::on_pbtn_login_clicked()
return;
}
saveCfgValue("login", "account", account);
if (ui->radioButton_burn->isChecked())
m_loginType = LogInType_Burn;
else if (ui->radioButton_initTest->isChecked())
@ -177,6 +194,11 @@ void Dialog_logIn::on_pbtn_login_clicked()
else if (ui->radioButton_pressureTest->isChecked())
m_loginType = LogInType_PressureTest;
saveCfgValue("login", "account", account);
saveCfgValue("login", "station", m_loginType);
saveCfgValue("login", "rememberPassword", ui->checkBox_rememberPswd->isChecked());
saveCfgValue("login", "showPassword", ui->checkBox_showPswd->isChecked());
m_accountName = account;
accept();
@ -244,7 +266,7 @@ void Dialog_logIn::on_pbtn_selectCfgFile_clicked()
saveCfgValue("login", "profile", m_profileName);
}
void Dialog_logIn::on_checkBox_rememberPswd_toggled(bool checked)
void Dialog_logIn::on_checkBox_showPswd_toggled(bool checked)
{
saveCfgValue("login", "rememberPassword", checked);
ui->lineEdit_password->setEchoMode(checked ? QLineEdit::Normal : QLineEdit::Password);
}

2
app/HGProductionTool/dialog_login.h
View File

@ -48,7 +48,7 @@ private slots:
void on_pbtn_selectCfgFile_clicked();
void on_checkBox_rememberPswd_toggled(bool checked);
void on_checkBox_showPswd_toggled(bool checked);
private:
Ui::Dialog_logIn *ui;

17
app/HGProductionTool/dialog_login.ui
View File

@ -220,8 +220,8 @@ QPushButton#pbtn_close::hover
<property name="geometry">
<rect>
<x>310</x>
<y>90</y>
<width>121</width>
<y>80</y>
<width>141</width>
<height>21</height>
</rect>
</property>
@ -229,6 +229,19 @@ QPushButton#pbtn_close::hover
<string>remember password</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox_showPswd">
<property name="geometry">
<rect>
<x>310</x>
<y>100</y>
<width>141</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>show password</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="page_2">
<widget class="QLabel" name="label_dbHost">

11
app/HGProductionTool/mainwindow.cpp
View File

@ -34,10 +34,10 @@ MainWindow::MainWindow(Dialog_logIn::LogInType loginType, const QString &profile
ui->act_manage->setVisible(false);
ui->act_export->setVisible(false);
ui->act_upload->setVisible(false);
ui->act_openLog->setVisible(false);
// ui->act_openLog->setVisible(false);
if (m_accountName == "admin")
ui->act_openLog->setVisible(true);
// if (m_accountName == "admin")
// ui->act_openLog->setVisible(true);
ui->act_refreshDevice->setShortcut(QKeySequence("F5"));
@ -388,11 +388,6 @@ QString MainWindow::getDevSn(SANE_Handle handle)
return QString::fromStdString(serialNum.c_str());
}
void MainWindow::setLogOutStatus(bool show)
{
ui->act_logOut->setVisible(show);
}
QString MainWindow::getDevType(SANE_Handle handle)
{
std::string firmWareNum;

1
app/HGProductionTool/mainwindow.h
View File

@ -36,7 +36,6 @@ public:
void releaseTesting();
bool isTesting();
QString getDevSn(SANE_Handle handle);
void setLogOutStatus(bool show);
protected:
void closeEvent(QCloseEvent *event);

6
app/HGProductionTool/mainwindow.ui
View File

@ -74,6 +74,9 @@
<property name="text">
<string>act_logOut</string>
</property>
<property name="shortcut">
<string>Ctrl+Q</string>
</property>
</action>
<action name="act_close">
<property name="text">
@ -94,6 +97,9 @@
<property name="text">
<string>act_openLog</string>
</property>
<property name="shortcut">
<string>Ctrl+L</string>
</property>
</action>
</widget>
<resources/>