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

Merge branch 'master' of http://192.168.10.5:8099/sane/code_production

This commit is contained in:
13038267101 2022-12-31 17:02:30 +08:00
parent 7397197ef3 b41abffba4
commit f7e958b5b7
9 changed files with 161 additions and 99 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.

166
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -124,12 +124,12 @@
<translation>否</translation> <translation>否</translation>
</message> </message>
<message> <message>
<location filename="dialog_userinput.ui" line="160"/> <location filename="dialog_userinput.ui" line="163"/>
<source>OK</source> <source>OK</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="dialog_userinput.ui" line="167"/> <location filename="dialog_userinput.ui" line="170"/>
<source>Cancel</source> <source>Cancel</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
@ -286,32 +286,32 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="233"/> <location filename="dialog_login.ui" line="167"/>
<source>account:</source> <source>account:</source>
<translation>账户：</translation> <translation>账户：</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="273"/> <location filename="dialog_login.ui" line="190"/>
<source>password:</source> <source>password:</source>
<translation>密码：</translation> <translation>密码：</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="313"/> <location filename="dialog_login.ui" line="215"/>
<source>dbHost:</source> <source>dbHost:</source>
<translation>数据库地址：</translation> <translation>数据库地址：</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="353"/> <location filename="dialog_login.ui" line="238"/>
<source>dbPort:</source> <source>dbPort:</source>
<translation>数据库端口：</translation> <translation>数据库端口：</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="393"/> <location filename="dialog_login.ui" line="261"/>
<source>ftpHost:</source> <source>ftpHost:</source>
<translation>FTP地址：</translation> <translation>FTP地址：</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="433"/> <location filename="dialog_login.ui" line="284"/>
<source>ftpPort:</source> <source>ftpPort:</source>
<translation>FTP端口：</translation> <translation>FTP端口：</translation>
</message> </message>
@ -324,12 +324,12 @@
<translation type="vanished">端口号：</translation> <translation type="vanished">端口号：</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="170"/> <location filename="dialog_login.ui" line="322"/>
<source>LOG IN</source> <source>LOG IN</source>
<translation>登录</translation> <translation>登录</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="183"/> <location filename="dialog_login.ui" line="309"/>
<source>EXIT</source> <source>EXIT</source>
<translation>退出</translation> <translation>退出</translation>
</message> </message>
@ -349,17 +349,17 @@
<translation>关闭</translation> <translation>关闭</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="27"/> <location filename="dialog_login.cpp" line="26"/>
<source>LogIn</source> <source>LogIn</source>
<translation>登录</translation> <translation>登录</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="113"/> <location filename="dialog_login.cpp" line="116"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="113"/> <location filename="dialog_login.cpp" line="116"/>
<source>Login failed: </source> <source>Login failed: </source>
<translation>登录失败： </translation> <translation>登录失败： </translation>
</message> </message>
@ -500,133 +500,145 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="80"/> <location filename="form_maininterface.ui" line="29"/>
<source>devStatus</source>
<translation></translation>
</message>
<message>
<location filename="form_maininterface.ui" line="87"/>
<source>Privious Step</source> <source>Privious Step</source>
<translation>上一步</translation> <translation>上一步</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="94"/> <location filename="form_maininterface.ui" line="101"/>
<source>PASS</source> <source>PASS</source>
<translation>通过</translation> <translation>通过</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="101"/> <location filename="form_maininterface.ui" line="108"/>
<source>FAIL</source> <source>FAIL</source>
<translation>不通过</translation> <translation>不通过</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="108"/> <location filename="form_maininterface.ui" line="115"/>
<source>START</source> <source>START</source>
<translation>开始测试</translation> <translation>开始测试</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="122"/> <location filename="form_maininterface.ui" line="129"/>
<source>LeftRotate</source> <source>LeftRotate</source>
<translation>左旋转</translation> <translation>左旋转</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="129"/> <location filename="form_maininterface.ui" line="136"/>
<source>RightRotate</source> <source>RightRotate</source>
<translation>右旋转</translation> <translation>右旋转</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="42"/> <location filename="form_maininterface.ui" line="49"/>
<source>STOP</source> <source>STOP</source>
<translation>关闭</translation> <translation>关闭</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="115"/> <location filename="form_maininterface.ui" line="122"/>
<source>SHOWIMG</source> <source>SHOWIMG</source>
<translation>加载图片</translation> <translation>加载图片</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.ui" line="87"/> <location filename="form_maininterface.ui" line="94"/>
<source>Next Step</source> <source>Next Step</source>
<translation>下一步</translation> <translation>下一步</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="87"/> <location filename="form_maininterface.cpp" line="89"/>
<location filename="form_maininterface.cpp" line="158"/>
<source>Device has connected</source> <source>Device has connected</source>
<translation>设备已连接</translation> <translation>设备已连接</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="89"/> <location filename="form_maininterface.cpp" line="91"/>
<source>Device hasnot connected</source> <source>Device hasnot connected</source>
<translation>设备未连接</translation> <translation>设备未连接</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="90"/> <location filename="form_maininterface.cpp" line="92"/>
<source>Device type:</source> <source>Device type:</source>
<translation>设备型号：</translation> <translation>设备型号：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="90"/> <location filename="form_maininterface.cpp" line="92"/>
<source> SerialNum:</source> <source> SerialNum:</source>
<translation> 序列号：</translation> <translation> 序列号：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="90"/> <location filename="form_maininterface.cpp" line="93"/>
<location filename="form_maininterface.cpp" line="161"/>
<source> connect status:</source> <source> connect status:</source>
<translation> 设备连接状态：</translation> <translation> 设备连接状态：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="99"/> <location filename="form_maininterface.cpp" line="102"/>
<source>load last image which uploaded last time</source> <source>load last image which uploaded last time</source>
<translation>加载上一次上传的图片</translation> <translation>加载上一次上传的图片</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="161"/> <location filename="form_maininterface.cpp" line="160"/>
<location filename="form_maininterface.cpp" line="539"/> <source>Device has disconnected</source>
<translation>设备已断开</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="175"/>
<location filename="form_maininterface.cpp" line="589"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="179"/> <location filename="form_maininterface.cpp" line="197"/>
<source>yes</source> <source>yes</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="180"/> <location filename="form_maininterface.cpp" line="198"/>
<source>no</source> <source>no</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="288"/> <location filename="form_maininterface.cpp" line="311"/>
<source>ID</source> <source>ID</source>
<translation>序号</translation> <translation>序号</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="288"/> <location filename="form_maininterface.cpp" line="311"/>
<source>Test items</source> <source>Test items</source>
<translation>测试项</translation> <translation>测试项</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="288"/> <location filename="form_maininterface.cpp" line="311"/>
<source>status</source> <source>status</source>
<translation>测试状态</translation> <translation>测试状态</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="436"/> <location filename="form_maininterface.cpp" line="461"/>
<source>not test</source> <source>not test</source>
<translation>未测试</translation> <translation>未测试</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="436"/> <location filename="form_maininterface.cpp" line="461"/>
<source>not pass</source> <source>not pass</source>
<translation>不通过</translation> <translation>不通过</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="436"/> <location filename="form_maininterface.cpp" line="461"/>
<source>not support</source> <source>not support</source>
<translation>不支持</translation> <translation>不支持</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="436"/> <location filename="form_maininterface.cpp" line="461"/>
<source>pass</source> <source>pass</source>
<translation>通过</translation> <translation>通过</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="539"/> <location filename="form_maininterface.cpp" line="589"/>
<source>no image</source> <source>no image</source>
<translation>无图</translation> <translation>无图</translation>
</message> </message>
@ -692,7 +704,7 @@
<translation>上传配置文件</translation> <translation>上传配置文件</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="412"/> <location filename="mainwindow.cpp" line="431"/>
<source>Account login elsewhere</source> <source>Account login elsewhere</source>
<translation>账户在其他地方登录</translation> <translation>账户在其他地方登录</translation>
</message> </message>
@ -701,104 +713,108 @@
<translation type="vanished">网络连接断开</translation> <translation type="vanished">网络连接断开</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="415"/> <location filename="mainwindow.cpp" line="434"/>
<source>You have been forced offline by the administrator account</source> <source>You have been forced offline by the administrator account</source>
<translation>你已被管理员账户强制下线</translation> <translation>你已被管理员账户强制下线</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="418"/> <location filename="mainwindow.cpp" line="437"/>
<source>Data base error</source> <source>Data base error</source>
<translation>数据库错误</translation> <translation>数据库错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="266"/> <location filename="mainwindow.cpp" line="272"/>
<location filename="mainwindow.cpp" line="361"/> <location filename="mainwindow.cpp" line="374"/>
<location filename="mainwindow.cpp" line="382"/> <location filename="mainwindow.cpp" line="396"/>
<location filename="mainwindow.cpp" line="398"/> <location filename="mainwindow.cpp" line="407"/>
<location filename="mainwindow.cpp" line="428"/> <location filename="mainwindow.cpp" line="447"/>
<location filename="mainwindow.cpp" line="446"/> <location filename="mainwindow.cpp" line="465"/>
<location filename="mainwindow.cpp" line="471"/> <location filename="mainwindow.cpp" line="490"/>
<location filename="mainwindow.cpp" line="475"/> <location filename="mainwindow.cpp" line="494"/>
<location filename="mainwindow.cpp" line="484"/> <location filename="mainwindow.cpp" line="503"/>
<location filename="mainwindow.cpp" line="496"/> <location filename="mainwindow.cpp" line="515"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="266"/> <location filename="mainwindow.cpp" line="272"/>
<location filename="mainwindow.cpp" line="484"/> <location filename="mainwindow.cpp" line="503"/>
<location filename="mainwindow.cpp" line="496"/> <location filename="mainwindow.cpp" line="515"/>
<source>Is testing, do not close!</source> <source>Is testing, do not close!</source>
<translation>测试中，请勿关闭！</translation> <translation>测试中，请勿关闭！</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="362"/> <location filename="mainwindow.cpp" line="375"/>
<source>Are you sure to connect the new device</source> <source>Are you sure to connect the new device</source>
<translation>检测到设备连接，是否启动测试？</translation> <translation>检测到设备连接，是否启动测试？</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="364"/> <location filename="mainwindow.cpp" line="377"/>
<source>yes</source> <source>yes</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="365"/> <location filename="mainwindow.cpp" line="378"/>
<source>no</source> <source>no</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="382"/> <location filename="mainwindow.cpp" line="396"/>
<location filename="mainwindow.cpp" line="446"/> <location filename="mainwindow.cpp" line="465"/>
<source>cannot create more table</source> <source>cannot create more table</source>
<translation>不能创建更多项目</translation> <translation>不能创建更多项目</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="398"/>
<source>The device has disconnected</source> <source>The device has disconnected</source>
<translation>设备已断开连接</translation> <translation type="vanished">设备已断开连接</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="466"/> <location filename="mainwindow.cpp" line="407"/>
<source>Open device failed</source>
<translation>打开设备失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="485"/>
<source>save</source> <source>save</source>
<translation>保存</translation> <translation>保存</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="466"/> <location filename="mainwindow.cpp" line="485"/>
<source>xls(*.xls)</source> <source>xls(*.xls)</source>
<translation>xls表格(*.xls)</translation> <translation>xls表格(*.xls)</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="471"/> <location filename="mainwindow.cpp" line="490"/>
<source>export succeed</source> <source>export succeed</source>
<translation>导出成功</translation> <translation>导出成功</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="475"/> <location filename="mainwindow.cpp" line="494"/>
<source>export failed</source> <source>export failed</source>
<translation>导出失败</translation> <translation>导出失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="508"/> <location filename="mainwindow.cpp" line="527"/>
<source>Illegal user</source> <source>Illegal user</source>
<translation>非法的用户</translation> <translation>非法的用户</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="512"/> <location filename="mainwindow.cpp" line="531"/>
<source>Wrong password</source> <source>Wrong password</source>
<translation>密码错误</translation> <translation>密码错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="516"/> <location filename="mainwindow.cpp" line="535"/>
<source>Database error</source> <source>Database error</source>
<translation>数据库错误</translation> <translation>数据库错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="520"/> <location filename="mainwindow.cpp" line="539"/>
<source>connect error</source> <source>connect error</source>
<translation>连接错误</translation> <translation>连接错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="524"/> <location filename="mainwindow.cpp" line="543"/>
<source>Failed</source> <source>Failed</source>
<translation>错误</translation> <translation>错误</translation>
</message> </message>
@ -806,14 +822,14 @@
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="hgscanner.cpp" line="62"/> <location filename="hgscanner.cpp" line="67"/>
<source>success: </source> <source>success: </source>
<oldsource>success</oldsource> <oldsource>success</oldsource>
<translation>成功: </translation> <translation>成功: </translation>
</message> </message>
<message> <message>
<location filename="hgscanner.cpp" line="47"/> <location filename="hgscanner.cpp" line="48"/>
<location filename="hgscanner.cpp" line="64"/> <location filename="hgscanner.cpp" line="69"/>
<source>failed: </source> <source>failed: </source>
<translation>失败： </translation> <translation>失败： </translation>
</message> </message>

11
app/HGProductionTool/dialog_login.cpp
View File

@ -26,6 +26,13 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
ui->label_title->setText(tr("LogIn")); ui->label_title->setText(tr("LogIn"));
ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password); ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
QString ipStr = "\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b";
QString portStr = "[0-9]+$";
ui->lineEdit_dbHost->setValidator(new QRegExpValidator(QRegExp(ipStr)));
ui->lineEdit_ftpHost->setValidator(new QRegExpValidator(QRegExp(ipStr)));
ui->lineEdit_dbPort->setValidator(new QRegExpValidator(QRegExp(portStr)));
ui->lineEdit_ftpPort->setValidator(new QRegExpValidator(QRegExp(portStr)));
QString account("root"); QString account("root");
QString dbHost("192.168.1.70"); QString dbHost("192.168.1.70");
QString dbPort("3306"); QString dbPort("3306");
@ -33,7 +40,6 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
QString ftpPort("21"); QString ftpPort("21");
ui->lineEdit_account->setText(getCfgValue("login", "account", account)); ui->lineEdit_account->setText(getCfgValue("login", "account", account));
ui->lineEdit_dbHost->setText(getCfgValue("login", "dbHost", dbHost)); ui->lineEdit_dbHost->setText(getCfgValue("login", "dbHost", dbHost));
ui->lineEdit_dbPort->setText(getCfgValue("login", "dbPort", dbPort)); ui->lineEdit_dbPort->setText(getCfgValue("login", "dbPort", dbPort));
ui->lineEdit_ftpHost->setText(getCfgValue("login", "ftpHost", ftpHost)); ui->lineEdit_ftpHost->setText(getCfgValue("login", "ftpHost", ftpHost));
@ -161,7 +167,8 @@ QString Dialog_logIn::getCfgValue(const char *appName, const char *key, const QS
HGBase_GetConfigPath(cfgPath, 512); HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "config.ini"); strcat(cfgPath, "config.ini");
std::string def2 = getStdString(def);
HGChar value[512] = {0}; HGChar value[512] = {0};
HGBase_GetProfileString(cfgPath, appName, key, getStdString(def).c_str(), value, 512); HGBase_GetProfileString(cfgPath, appName, key, def2.c_str(), value, 512);
return StdStringToUtf8(value).c_str(); return StdStringToUtf8(value).c_str();
} }

12
app/HGProductionTool/dialog_login.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>455</width> <width>473</width>
<height>278</height> <height>278</height>
</rect> </rect>
</property> </property>
@ -146,7 +146,7 @@ QPushButton#pbtn_close::hover
<rect> <rect>
<x>40</x> <x>40</x>
<y>40</y> <y>40</y>
<width>381</width> <width>411</width>
<height>141</height> <height>141</height>
</rect> </rect>
</property> </property>
@ -220,7 +220,7 @@ QPushButton#pbtn_close::hover
<rect> <rect>
<x>150</x> <x>150</x>
<y>20</y> <y>20</y>
<width>151</width> <width>171</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
@ -243,7 +243,7 @@ QPushButton#pbtn_close::hover
<rect> <rect>
<x>150</x> <x>150</x>
<y>50</y> <y>50</y>
<width>151</width> <width>171</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
@ -266,7 +266,7 @@ QPushButton#pbtn_close::hover
<rect> <rect>
<x>150</x> <x>150</x>
<y>80</y> <y>80</y>
<width>151</width> <width>171</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
@ -289,7 +289,7 @@ QPushButton#pbtn_close::hover
<rect> <rect>
<x>150</x> <x>150</x>
<y>110</y> <y>110</y>
<width>151</width> <width>171</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>

25
app/HGProductionTool/form_maininterface.cpp
View File

@ -65,6 +65,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, SANE_Handle ha
, m_mainwnd(mainwnd) , m_mainwnd(mainwnd)
, m_hg(nullptr) , m_hg(nullptr)
, m_handle(handle) , m_handle(handle)
, m_disconnect(false)
, m_pdtToolDbuserMgr(pdtToolDbuserMgr) , m_pdtToolDbuserMgr(pdtToolDbuserMgr)
, m_pdtToolDbDevice(pdtToolDbDevice) , m_pdtToolDbDevice(pdtToolDbDevice)
, m_serialNum(serialNum) , m_serialNum(serialNum)
@ -89,7 +90,8 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, SANE_Handle ha
str = tr("Device has connected"); str = tr("Device has connected");
else else
str = tr("Device hasnot connected"); str = tr("Device hasnot connected");
ui->label_sn->setText(tr("Device type:") + m_devType + tr(" SerialNum:") + m_serialNum + tr(" connect status:") + str); ui->label_sn->setText(tr("Device type:") + m_devType + tr(" SerialNum:") + m_serialNum);
ui->label_devStatus->setText(tr(" connect status:") + str);
setMinimumWidth(500); setMinimumWidth(500);
ui->tableWidget->setMinimumWidth(400); ui->tableWidget->setMinimumWidth(400);
@ -150,6 +152,13 @@ hgscanner *Form_mainInterface::getScanner()
return m_hg; return m_hg;
} }
void Form_mainInterface::setDevDisconnect()
{
QString str = tr("Device has disconnected");
ui->label_devStatus->setText(tr(" connect status:") + str);
m_disconnect = true;
}
void Form_mainInterface::paintEvent(QPaintEvent *event) void Form_mainInterface::paintEvent(QPaintEvent *event)
{ {
(void)event; (void)event;
@ -166,6 +175,11 @@ void Form_mainInterface::on_testResult(QString text)
updateUiEnabled(true); updateUiEnabled(true);
m_isTesting = false; m_isTesting = false;
m_mainwnd->releaseTesting(); m_mainwnd->releaseTesting();
if (m_disconnect)
{
m_mainwnd->RemoveInterface(this);
}
} }
void Form_mainInterface::on_testResultImg(void *img) void Form_mainInterface::on_testResultImg(void *img)
@ -195,6 +209,11 @@ void Form_mainInterface::on_testDistortion(QString name, void *data)
updateUiEnabled(true); updateUiEnabled(true);
m_isTesting = false; m_isTesting = false;
m_mainwnd->releaseTesting(); m_mainwnd->releaseTesting();
if (m_disconnect)
{
m_mainwnd->RemoveInterface(this);
}
} }
} }
@ -489,7 +508,7 @@ void Form_mainInterface::updateUiEnabled(bool enable)
void Form_mainInterface::setGlobalCfg(AnalysisJson analysisJson) void Form_mainInterface::setGlobalCfg(AnalysisJson analysisJson)
{ {
AnalysisJson::json_global jsonGlobal = analysisJson.GetGlobal(); AnalysisJson::json_global jsonGlobal = analysisJson.GetGlobal();
LPWRITECFG p; LPWRITECFG p = new WRITECFG;
p->cat = WRITE_CAT_VID; p->cat = WRITE_CAT_VID;
p->val = &jsonGlobal.vid_to; p->val = &jsonGlobal.vid_to;
@ -510,6 +529,8 @@ void Form_mainInterface::setGlobalCfg(AnalysisJson analysisJson)
p->cat = WRITE_CAT_SERIALNUM; p->cat = WRITE_CAT_SERIALNUM;
p->val = &m_serialNum; p->val = &m_serialNum;
func_test_go((const wchar_t*)WRITE_CFG_NAME, (const wchar_t*)p, m_hg); func_test_go((const wchar_t*)WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
delete p;
} }
void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous) void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)

2
app/HGProductionTool/form_maininterface.h
View File

@ -29,6 +29,7 @@ public:
QString getDevName(); QString getDevName();
SANE_Handle getDevHandle(); SANE_Handle getDevHandle();
hgscanner *getScanner(); hgscanner *getScanner();
void setDevDisconnect();
protected: protected:
void paintEvent(QPaintEvent *event) override; void paintEvent(QPaintEvent *event) override;
@ -87,6 +88,7 @@ private:
class MainWindow *m_mainwnd; class MainWindow *m_mainwnd;
hgscanner *m_hg; hgscanner *m_hg;
SANE_Handle m_handle; SANE_Handle m_handle;
bool m_disconnect;
HGPdtToolDbUserMgr m_pdtToolDbuserMgr; HGPdtToolDbUserMgr m_pdtToolDbuserMgr;
HGPdtToolDbDevice m_pdtToolDbDevice; HGPdtToolDbDevice m_pdtToolDbDevice;
QString m_serialNum; QString m_serialNum;

7
app/HGProductionTool/form_maininterface.ui
View File

@ -23,6 +23,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label_devStatus">
<property name="text">
<string>devStatus</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">

13
app/HGProductionTool/mainwindow.cpp
View File

@ -374,7 +374,8 @@ void MainWindow::on_sane_dev_arrive(QString devName)
{ {
SANE_Handle devHandle = nullptr; SANE_Handle devHandle = nullptr;
sane_open(devName.toStdString().c_str(), &devHandle); sane_open(devName.toStdString().c_str(), &devHandle);
if (nullptr != devHandle)
{
Dialog_InputSerialNum dlg(this, getDevSn(devHandle), getDevType(devHandle)); Dialog_InputSerialNum dlg(this, getDevSn(devHandle), getDevType(devHandle));
if (dlg.exec()) if (dlg.exec())
{ {
@ -394,6 +395,11 @@ void MainWindow::on_sane_dev_arrive(QString devName)
sane_close(devHandle); sane_close(devHandle);
} }
} }
else
{
QMessageBox::information(this, tr("tips"), tr("Open device failed"));
}
}
} }
void MainWindow::on_sane_dev_remove(QString devName) void MainWindow::on_sane_dev_remove(QString devName)
@ -401,10 +407,13 @@ void MainWindow::on_sane_dev_remove(QString devName)
Form_mainInterface *interface = FindInterfaceByDevName(devName); Form_mainInterface *interface = FindInterfaceByDevName(devName);
if (interface != nullptr) if (interface != nullptr)
{ {
QMessageBox::information(this, tr("tips"), tr("The device has disconnected")); interface->setDevDisconnect();
if (!interface->isTesting())
{
RemoveInterface(interface); RemoveInterface(interface);
} }
} }
}
void MainWindow::on_update_userStatus() void MainWindow::on_update_userStatus()
{ {

BIN
cfg-tools/solution/Release/config/stored.txt
View File

Binary file not shown.