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-08-31 10:16:44 +08:00
parent 7f1899e741
commit 50144af2b7
19 changed files with 539 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/HGProductionTool/HGProductionTool.pro
View File

@ -75,6 +75,7 @@ win32 {
SOURCES += \
../../../code_app/utility/HGString.cpp \
app_cfg.cpp \
HGImgView.cpp \
HGUIGlobal.cpp \
analysisjson.cpp \
@ -88,6 +89,7 @@ SOURCES += \
dialog_setburnsn.cpp \
dialog_uploadcfgfile.cpp \
dialog_userinput.cpp \
dialog_registeraccount.cpp \
form_burnmode.cpp \
form_maininterface.cpp \
form_texttips.cpp \
@ -98,6 +100,7 @@ SOURCES += \
HEADERS += \
../../../code_app/utility/HGString.h \
app_cfg.h \
HGImgView.h \
HGUIGlobal.h \
analysisjson.h \
@ -111,6 +114,7 @@ HEADERS += \
dialog_setburnsn.h \
dialog_uploadcfgfile.h \
dialog_userinput.h \
dialog_registeraccount.h \
form_burnmode.h \
form_maininterface.h \
form_texttips.h \
@ -129,6 +133,7 @@ FORMS += \
dialog_setburnsn.ui \
dialog_uploadcfgfile.ui \
dialog_userinput.ui \
dialog_registeraccount.ui \
form_burnmode.ui \
form_maininterface.ui \
form_texttips.ui \

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

264
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -118,46 +118,98 @@
<translation>取消</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="140"/>
<location filename="dialog_inputserialnum.cpp" line="147"/>
<location filename="dialog_inputserialnum.cpp" line="156"/>
<location filename="dialog_inputserialnum.cpp" line="154"/>
<location filename="dialog_inputserialnum.cpp" line="163"/>
<location filename="dialog_inputserialnum.cpp" line="180"/>
<location filename="dialog_inputserialnum.cpp" line="185"/>
<location filename="dialog_inputserialnum.cpp" line="170"/>
<location filename="dialog_inputserialnum.cpp" line="189"/>
<location filename="dialog_inputserialnum.cpp" line="194"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="140"/>
<location filename="dialog_inputserialnum.cpp" line="147"/>
<source>device is lost</source>
<translation>设备已丢失</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="147"/>
<location filename="dialog_inputserialnum.cpp" line="154"/>
<source>Serial num is empty</source>
<translation>序列号为空</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="156"/>
<location filename="dialog_inputserialnum.cpp" line="163"/>
<source>sn is illegal</source>
<translation>序列号不合法</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="163"/>
<location filename="dialog_inputserialnum.cpp" line="170"/>
<source>The device is testing</source>
<translation>该设备正在进行测试</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="180"/>
<location filename="dialog_inputserialnum.cpp" line="189"/>
<source>set sn failed</source>
<translation>设置序列号失败</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="185"/>
<location filename="dialog_inputserialnum.cpp" line="194"/>
<source>set sn succeed</source>
<translation>设置序列号成功</translation>
</message>
</context>
<context>
<name>Dialog_RegisterAccount</name>
<message>
<location filename="dialog_registeraccount.ui" line="14"/>
<source>Dialog</source>
<translation></translation>
</message>
<message>
<location filename="dialog_registeraccount.ui" line="26"/>
<location filename="dialog_registeraccount.cpp" line="16"/>
<source>Register</source>
<translation>注册</translation>
</message>
<message>
<location filename="dialog_registeraccount.ui" line="39"/>
<source>Account name:</source>
<translation>用户名:</translation>
</message>
<message>
<location filename="dialog_registeraccount.ui" line="52"/>
<source>Password:</source>
<oldsource>Password</oldsource>
<translation>密码:</translation>
</message>
<message>
<location filename="dialog_registeraccount.ui" line="85"/>
<source>confirm password:</source>
<translation>确认密码:</translation>
</message>
<message>
<location filename="dialog_registeraccount.cpp" line="29"/>
<location filename="dialog_registeraccount.cpp" line="35"/>
<location filename="dialog_registeraccount.cpp" line="41"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_registeraccount.cpp" line="29"/>
<source>Input cannot be empty!</source>
<translation>输入不能为空!</translation>
</message>
<message>
<location filename="dialog_registeraccount.cpp" line="35"/>
<source>Password inconsistency</source>
<translation>密码不一致！</translation>
</message>
<message>
<location filename="dialog_registeraccount.cpp" line="41"/>
<source>User already exists</source>
<translation>用户已存在!</translation>
</message>
</context>
<context>
<name>Dialog_SetBurnSn</name>
<message>
@ -406,25 +458,30 @@
<translation>FTP端口：</translation>
</message>
<message>
<location filename="dialog_login.ui" line="341"/>
<location filename="dialog_login.ui" line="328"/>
<source>Burn</source>
<translation>烧录工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="357"/>
<location filename="dialog_login.ui" line="344"/>
<source>InitTest</source>
<translation>初检工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="370"/>
<location filename="dialog_login.ui" line="357"/>
<source>ImageTest</source>
<translation>图像测试工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="383"/>
<location filename="dialog_login.ui" line="370"/>
<source>PressureTest</source>
<translation>压力测试工位</translation>
</message>
<message>
<location filename="dialog_login.ui" line="383"/>
<source>Register</source>
<translation>注册</translation>
</message>
<message>
<source>host:</source>
<translation type="vanished">IP地址：</translation>
@ -434,52 +491,51 @@
<translation type="vanished">端口号：</translation>
</message>
<message>
<location filename="dialog_login.ui" line="322"/>
<location filename="dialog_login.ui" line="309"/>
<source>LOG IN</source>
<translation>登录</translation>
</message>
<message>
<location filename="dialog_login.ui" line="309"/>
<source>EXIT</source>
<translation>退出</translation>
<translation type="vanished">退出</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="24"/>
<location filename="dialog_login.cpp" line="29"/>
<source>Set host and port</source>
<translation>设置IP与端口</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="25"/>
<location filename="dialog_login.cpp" line="30"/>
<source>Minimize</source>
<translation>最小化</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="26"/>
<location filename="dialog_login.cpp" line="31"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="27"/>
<location filename="dialog_login.cpp" line="32"/>
<source>LogIn</source>
<translation>登录</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="137"/>
<location filename="dialog_login.cpp" line="149"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="137"/>
<location filename="dialog_login.cpp" line="149"/>
<source>Login failed, sure to enter offline mode?</source>
<translation>登录失败，是否进入单机测试模式？</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="138"/>
<location filename="dialog_login.cpp" line="150"/>
<source>yes</source>
<translation>确定</translation>
</message>
<message>
<location filename="dialog_login.cpp" line="139"/>
<location filename="dialog_login.cpp" line="151"/>
<source>no</source>
<translation>取消</translation>
</message>
@ -822,12 +878,12 @@
<translation type="vanished">设备未连接</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="65"/>
<location filename="form_maininterface.cpp" line="67"/>
<source>Device type:</source>
<translation>设备类型：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="65"/>
<location filename="form_maininterface.cpp" line="67"/>
<source> SerialNum:</source>
<translation> 序列号：</translation>
</message>
@ -844,7 +900,7 @@
<translation type="vanished"> 休眠时间： </translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="83"/>
<location filename="form_maininterface.cpp" line="85"/>
<source>load last image which uploaded last time</source>
<translation>加载上一次上传的图片</translation>
</message>
@ -853,14 +909,14 @@
<translation type="vanished">设备已断开</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="162"/>
<location filename="form_maininterface.cpp" line="164"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="205"/>
<location filename="form_maininterface.cpp" line="215"/>
<location filename="form_maininterface.cpp" line="225"/>
<location filename="form_maininterface.cpp" line="207"/>
<location filename="form_maininterface.cpp" line="217"/>
<location filename="form_maininterface.cpp" line="227"/>
<source>destortion value: </source>
<translation>畸变修正值： </translation>
</message>
@ -873,102 +929,114 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="67"/>
<location filename="form_maininterface.cpp" line="69"/>
<source> speed mode:</source>
<translation> 目标配置： 速度模式：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="68"/>
<location filename="form_maininterface.cpp" line="70"/>
<source> sleep time:</source>
<translation> 休眠时间：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="159"/>
<location filename="form_maininterface.cpp" line="161"/>
<source>,but correct information is abnormal</source>
<translation>，但是校正有异常</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="264"/>
<location filename="form_maininterface.cpp" line="266"/>
<source>please verify the configuration of the device:</source>
<translation>请验证设备配置：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="265"/>
<location filename="form_maininterface.cpp" line="267"/>
<source>vid:%1
</source>
<translation>vid:%1
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="266"/>
<location filename="form_maininterface.cpp" line="268"/>
<source>pid:%1
</source>
<translation>pid:%1
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="267"/>
<location filename="form_maininterface.cpp" line="269"/>
<source>sleep time:%1minute
</source>
<translation>休眠时间：%1分钟
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="267"/>
<location filename="form_maininterface.cpp" line="269"/>
<source>sleep time:%1
</source>
<translation>休眠时间：%1
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="267"/>
<location filename="form_maininterface.cpp" line="595"/>
<location filename="form_maininterface.cpp" line="269"/>
<location filename="form_maininterface.cpp" line="603"/>
<source>Not sleeping</source>
<translation>不休眠</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="268"/>
<location filename="form_maininterface.cpp" line="270"/>
<source>speed mode:%1PPM
</source>
<translation>速度模式：%1PPM
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="272"/>
<location filename="form_maininterface.cpp" line="274"/>
<source>device model:%1</source>
<translation>设备型号：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="726"/>
<location filename="form_maininterface.cpp" line="797"/>
<location filename="form_maininterface.cpp" line="348"/>
<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>
<translation>设备序列号: %1, 测试项: %2, 测试结果: 不通过! 原因: %3</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="372"/>
<source>Serial number: %1, Test item: %2, Test result: Pass!</source>
<oldsource>Serial number: %1, Test item: %2, Test result: Pass!</oldsource>
<translation>设备序列号: %1, 测试项: %2, 测试结果: 通过!</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="768"/>
<location filename="form_maininterface.cpp" line="839"/>
<source>device history scan count:</source>
<translation>设备历史扫描张数：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="654"/>
<location filename="form_maininterface.cpp" line="658"/>
<location filename="form_maininterface.cpp" line="662"/>
<location filename="form_maininterface.cpp" line="666"/>
<location filename="form_maininterface.cpp" line="670"/>
<location filename="form_maininterface.cpp" line="674"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="654"/>
<location filename="form_maininterface.cpp" line="662"/>
<source>No paper</source>
<translation>无纸</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="658"/>
<location filename="form_maininterface.cpp" line="666"/>
<source>Device is sleeping</source>
<translation>设备处于休眠模式</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="662"/>
<location filename="form_maininterface.cpp" line="670"/>
<source>Counting mode</source>
<translation>设备处于计数模式</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="666"/>
<location filename="form_maininterface.cpp" line="674"/>
<source>Other error</source>
<translation>其他错误</translation>
</message>
@ -977,37 +1045,37 @@
<translation type="vanished">设备序列号：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="407"/>
<location filename="form_maininterface.cpp" line="415"/>
<source>ID</source>
<translation>序号</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="407"/>
<location filename="form_maininterface.cpp" line="415"/>
<source>Test items</source>
<translation>测试项</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="407"/>
<location filename="form_maininterface.cpp" line="415"/>
<source>status</source>
<translation>测试状态</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="489"/>
<location filename="form_maininterface.cpp" line="497"/>
<source>not test</source>
<translation>未测试</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="489"/>
<location filename="form_maininterface.cpp" line="497"/>
<source>not pass</source>
<translation>不通过</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="489"/>
<location filename="form_maininterface.cpp" line="497"/>
<source>not support</source>
<translation>不支持</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="489"/>
<location filename="form_maininterface.cpp" line="497"/>
<source>pass</source>
<translation>通过</translation>
</message>
@ -1033,31 +1101,31 @@
<translation type="vanished">Pid：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="720"/>
<location filename="form_maininterface.cpp" line="791"/>
<location filename="form_maininterface.cpp" line="762"/>
<location filename="form_maininterface.cpp" line="833"/>
<source>device roller count:</source>
<translation>设备滚轴张数：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="200"/>
<location filename="form_maininterface.cpp" line="555"/>
<location filename="form_maininterface.cpp" line="202"/>
<location filename="form_maininterface.cpp" line="563"/>
<source>image pixel: </source>
<translation>标准圆:宽 * 高: </translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="65"/>
<location filename="form_maininterface.cpp" line="67"/>
<source>FirmwareNum:</source>
<translation>固件号：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="269"/>
<location filename="form_maininterface.cpp" line="271"/>
<source>device serial number:%1
</source>
<translation>设备序列号：%1
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="270"/>
<location filename="form_maininterface.cpp" line="272"/>
<source>device firmware number:%1
</source>
<oldsource>device firmware number:%1</oldsource>
@ -1065,17 +1133,17 @@
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="597"/>
<location filename="form_maininterface.cpp" line="605"/>
<source> minute</source>
<translation> 分钟</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="70"/>
<location filename="form_maininterface.cpp" line="72"/>
<source> VID:</source>
<translation> VID：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="70"/>
<location filename="form_maininterface.cpp" line="72"/>
<source> PID:</source>
<translation> PID：</translation>
</message>
@ -1150,7 +1218,7 @@
<translation>刷新设备列表</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="505"/>
<location filename="mainwindow.cpp" line="506"/>
<source>Account login elsewhere</source>
<translation>账户在其他地方登录</translation>
</message>
@ -1159,51 +1227,51 @@
<translation type="vanished">网络连接断开</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="508"/>
<location filename="mainwindow.cpp" line="509"/>
<source>You have been forced offline by the administrator account</source>
<translation>你已被管理员账户强制下线</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="511"/>
<location filename="mainwindow.cpp" line="512"/>
<source>Data base error</source>
<translation>数据库错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="312"/>
<location filename="mainwindow.cpp" line="521"/>
<location filename="mainwindow.cpp" line="540"/>
<location filename="mainwindow.cpp" line="567"/>
<location filename="mainwindow.cpp" line="571"/>
<location filename="mainwindow.cpp" line="580"/>
<location filename="mainwindow.cpp" line="592"/>
<location filename="mainwindow.cpp" line="668"/>
<location filename="mainwindow.cpp" line="313"/>
<location filename="mainwindow.cpp" line="522"/>
<location filename="mainwindow.cpp" line="541"/>
<location filename="mainwindow.cpp" line="568"/>
<location filename="mainwindow.cpp" line="572"/>
<location filename="mainwindow.cpp" line="581"/>
<location filename="mainwindow.cpp" line="593"/>
<location filename="mainwindow.cpp" line="669"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="47"/>
<location filename="mainwindow.cpp" line="48"/>
<source>production tool-burn station</source>
<translation>华高生产工具-烧录工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="92"/>
<location filename="mainwindow.cpp" line="93"/>
<source>production tool-init test station</source>
<translation>华高生产工具-初检工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="94"/>
<location filename="mainwindow.cpp" line="95"/>
<source>production tool-image test station</source>
<translation>华高生产工具-图像测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="96"/>
<location filename="mainwindow.cpp" line="97"/>
<source>production tool-pressure test station</source>
<translation>华高生产工具-压力测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="312"/>
<location filename="mainwindow.cpp" line="580"/>
<location filename="mainwindow.cpp" line="592"/>
<location filename="mainwindow.cpp" line="313"/>
<location filename="mainwindow.cpp" line="581"/>
<location filename="mainwindow.cpp" line="593"/>
<source>Is testing, do not close!</source>
<translation>测试中，请勿关闭！</translation>
</message>
@ -1225,8 +1293,8 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="540"/>
<location filename="mainwindow.cpp" line="668"/>
<location filename="mainwindow.cpp" line="541"/>
<location filename="mainwindow.cpp" line="669"/>
<source>cannot create more table</source>
<translation>不能创建更多项目</translation>
</message>
@ -1243,47 +1311,47 @@
<translation type="vanished">打开设备失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="562"/>
<location filename="mainwindow.cpp" line="563"/>
<source>save</source>
<translation>保存</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="562"/>
<location filename="mainwindow.cpp" line="563"/>
<source>xls(*.xls)</source>
<translation>xls表格(*.xls)</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="567"/>
<location filename="mainwindow.cpp" line="568"/>
<source>export succeed</source>
<translation>导出成功</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="571"/>
<location filename="mainwindow.cpp" line="572"/>
<source>export failed</source>
<translation>导出失败</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="604"/>
<location filename="mainwindow.cpp" line="605"/>
<source>Illegal user</source>
<translation>非法的用户</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="608"/>
<location filename="mainwindow.cpp" line="609"/>
<source>Wrong password</source>
<translation>密码错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="612"/>
<location filename="mainwindow.cpp" line="613"/>
<source>Database error</source>
<translation>数据库错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="616"/>
<location filename="mainwindow.cpp" line="617"/>
<source>connect error</source>
<translation>连接错误</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="620"/>
<location filename="mainwindow.cpp" line="621"/>
<source>Failed</source>
<translation>错误</translation>
</message>

70
app/HGProductionTool/app_cfg.cpp Normal file
View File

@ -0,0 +1,70 @@
#include "app_cfg.h"
#include "base/HGDef.h"
#include "base/HGInc.h"
#include "base/HGUtility.h"
#include "base/HGIni.h"
#include "HGUIGlobal.h"
#include "HGString.h"
QString getCfgValue(const char *appName, const char *key, const QString &def)
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "config.ini");
HGChar value[512] = {0};
HGBase_GetProfileString(cfgPath, appName, key, getStdString(def).c_str(), value, 512);
return StdStringToUtf8(value).c_str();
}
int getCfgValue(const char *appName, const char *key, int def)
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "config.ini");
HGInt value = 0;
HGBase_GetProfileInt(cfgPath, appName, key, def, &value);
return value;
}
bool getCfgValue(const char *appName, const char *key, bool def)
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "config.ini");
HGInt value = 0;
HGBase_GetProfileInt(cfgPath, appName, key, (HGInt)def, &value);
return (bool)value;
}
void saveCfgValue(const char *appName, const char *key, const QString &value)
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
HGBase_CreateDir(cfgPath);
strcat(cfgPath, "config.ini");
HGBase_SetProfileString(cfgPath, appName, key, getStdString(value).c_str());
}
void saveCfgValue(const char *appName, const char *key, int value)
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
HGBase_CreateDir(cfgPath);
strcat(cfgPath, "config.ini");
HGBase_SetProfileInt(cfgPath, appName, key, value);
}
void saveCfgValue(const char *appName, const char *key, bool value)
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
HGBase_CreateDir(cfgPath);
strcat(cfgPath, "config.ini");
HGBase_SetProfileInt(cfgPath, appName, key, (HGInt)value);
}

14
app/HGProductionTool/app_cfg.h Normal file
View File

@ -0,0 +1,14 @@
#ifndef __APP_CFG_H__
#define __APP_CFG_H__
#include <QString>
QString getCfgValue(const char *appName, const char *key, const QString &def);
int getCfgValue(const char *appName, const char *key, int def);
bool getCfgValue(const char *appName, const char *key, bool def);
void saveCfgValue(const char *appName, const char *key, const QString &value);
void saveCfgValue(const char *appName, const char *key, int value);
void saveCfgValue(const char *appName, const char *key, bool value);
#endif /* __APP_CFG_H__ */

15
app/HGProductionTool/dialog_changepwd.cpp
View File

@ -2,11 +2,15 @@
#include "ui_dialog_changepwd.h"
#include <QMessageBox>
#include "mainwindow.h"
#include "dialog_login.h"
#include "base/HGUtility.h"
#include "app_cfg.h"
Dialog_changePwd::Dialog_changePwd(HGPdtToolDbUserMgr pdtToolDbuserMgr, QWidget *parent) :
QDialog(parent),
m_pdtToolDbuserMgr(pdtToolDbuserMgr),
ui(new Ui::Dialog_changePwd)
Dialog_changePwd::Dialog_changePwd(HGPdtToolDbUserMgr pdtToolDbuserMgr, const QString& accountName, QWidget *parent) :
QDialog(parent)
, m_pdtToolDbuserMgr(pdtToolDbuserMgr)
, m_accountName(accountName)
, ui(new Ui::Dialog_changePwd)
{
ui->setupUi(this);
@ -44,6 +48,9 @@ void Dialog_changePwd::on_pbtn_ok_clicked()
QMessageBox::information(this, tr("tips"), tr("Change passwords failed: ") + MainWindow::getLogInfo(ret));
return;
}
saveCfgValue(m_accountName.toStdString().c_str(), "password", newPwd);
accept();
}

3
app/HGProductionTool/dialog_changepwd.h
View File

@ -13,7 +13,7 @@ class Dialog_changePwd : public QDialog
Q_OBJECT
public:
explicit Dialog_changePwd(HGPdtToolDbUserMgr pdtToolDbuserMgr, QWidget *parent = nullptr);
explicit Dialog_changePwd(HGPdtToolDbUserMgr pdtToolDbuserMgr, const QString& accountName, QWidget *parent = nullptr);
~Dialog_changePwd();
private slots:
@ -25,6 +25,7 @@ private:
Ui::Dialog_changePwd *ui;
HGPdtToolDbUserMgr m_pdtToolDbuserMgr;
QString m_accountName;
};

44
app/HGProductionTool/dialog_login.cpp
View File

@ -4,14 +4,14 @@
#include <QRegExpValidator>
#include <QMouseEvent>
#include "base/HGUtility.h"
#include "base/HGIni.h"
#include "HGUIGlobal.h"
#include "HGString.h"
#include "dialog_registeraccount.h"
#include "app_cfg.h"
Dialog_logIn::Dialog_logIn(QWidget *parent) :
QDialog(parent),
ui(new Ui::Dialog_logIn)
, m_pdtToolDbuserMgr(nullptr)
, m_accountName("")
{
ui->setupUi(this);
@ -21,6 +21,9 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
ft.setPointSize(15);
this->setFont(ft);
ui->pbtn_setting->setVisible(false);
ui->radioButton_pressureTest->setVisible(false);
ui->pbtn_setting->setToolTip(tr("Set host and port"));
ui->pbtn_minum->setToolTip(tr("Minimize"));
ui->pbtn_close->setToolTip(tr("Close"));
@ -74,6 +77,11 @@ Dialog_logIn::LogInType Dialog_logIn::GetLogInType()
return m_loginType;
}
QString Dialog_logIn::GetAccountName()
{
return m_accountName;
}
void Dialog_logIn::mousePressEvent(QMouseEvent *event)
{
if(event->button()==Qt::LeftButton)
@ -124,6 +132,8 @@ void Dialog_logIn::on_pbtn_login_clicked()
else if (ui->radioButton_pressureTest->isChecked())
m_loginType = LogInType_PressureTest;
m_accountName = account;
HGPdtToolDbUserMgr pdtToolDbuserMgr = nullptr;
HGPdtToolDb_CreateUserMgr(dbHost.toStdString().c_str(), dbPort.toInt(), account.toStdString().c_str(), password.toStdString().c_str(),
&pdtToolDbuserMgr);
@ -141,7 +151,7 @@ void Dialog_logIn::on_pbtn_login_clicked()
if (msg.clickedButton() == msg.button(QMessageBox::Yes))
{
m_pdtToolDbuserMgr = nullptr;
accept();;
accept();
}
else
{
@ -150,11 +160,6 @@ void Dialog_logIn::on_pbtn_login_clicked()
}
}
void Dialog_logIn::on_pushButton_exit_clicked()
{
reject();
}
void Dialog_logIn::on_pbtn_setting_clicked(bool checked)
{
if (checked)
@ -177,24 +182,9 @@ void Dialog_logIn::on_pbtn_close_clicked()
close();
}
void Dialog_logIn::saveCfgValue(const char *appName, const char *key, const QString &value)
void Dialog_logIn::on_pbtn_register_clicked()
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
HGBase_CreateDir(cfgPath);
strcat(cfgPath, "config.ini");
HGBase_SetProfileString(cfgPath, appName, key, getStdString(value).c_str());
Dialog_RegisterAccount dlg;
dlg.exec();
}
QString Dialog_logIn::getCfgValue(const char *appName, const char *key, const QString &def)
{
HGChar cfgPath[512];
HGBase_GetConfigPath(cfgPath, 512);
strcat(cfgPath, "config.ini");
std::string def2 = getStdString(def);
HGChar value[512] = {0};
HGBase_GetProfileString(cfgPath, appName, key, def2.c_str(), value, 512);
return StdStringToUtf8(value).c_str();
}

9
app/HGProductionTool/dialog_login.h
View File

@ -28,6 +28,7 @@ public:
QString GetFtpHost();
unsigned short GetFtpPort();
LogInType GetLogInType();
QString GetAccountName();
void mousePressEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
@ -36,17 +37,14 @@ public:
private slots:
void on_pbtn_login_clicked();
void on_pushButton_exit_clicked();
void on_pbtn_setting_clicked(bool checked);
void on_pbtn_minum_clicked();
void on_pbtn_close_clicked();
private:
void saveCfgValue(const char *appName, const char *key, const QString &value);
QString getCfgValue(const char *appName, const char *key, const QString &def);
void on_pbtn_register_clicked();
private:
Ui::Dialog_logIn *ui;
@ -55,6 +53,7 @@ private:
QPoint m_endPos;
bool m_leftMousePressed;
LogInType m_loginType;
QString m_accountName;
};
#endif // DIALOG_LOGIN_H

26
app/HGProductionTool/dialog_login.ui
View File

@ -296,19 +296,6 @@ QPushButton#pbtn_close::hover
</widget>
</widget>
</widget>
<widget class="QPushButton" name="pushButton_exit">
<property name="geometry">
<rect>
<x>270</x>
<y>280</y>
<width>75</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>EXIT</string>
</property>
</widget>
<widget class="QPushButton" name="pbtn_login">
<property name="geometry">
<rect>
@ -383,6 +370,19 @@ QPushButton#pbtn_close::hover
<string>PressureTest</string>
</property>
</widget>
<widget class="QPushButton" name="pbtn_register">
<property name="geometry">
<rect>
<x>260</x>
<y>280</y>
<width>75</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Register</string>
</property>
</widget>
</widget>
<resources/>
<connections/>

48
app/HGProductionTool/dialog_registeraccount.cpp Normal file
View File

@ -0,0 +1,48 @@
#include "dialog_registeraccount.h"
#include "ui_dialog_registeraccount.h"
#include <QMessageBox>
#include "base/HGUtility.h"
#include "app_cfg.h"
Dialog_RegisterAccount::Dialog_RegisterAccount(QWidget *parent) :
QDialog(parent),
ui(new Ui::Dialog_RegisterAccount)
{
ui->setupUi(this);
setWindowTitle(tr("Register"));
setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
ui->lineEdit_confirmPswd->setEchoMode(QLineEdit::EchoMode::Password);
}
Dialog_RegisterAccount::~Dialog_RegisterAccount()
{
delete ui;
}
void Dialog_RegisterAccount::on_pushButton_register_clicked()
{
if (ui->lineEdit_account->text().isEmpty() || ui->lineEdit_password->text().isEmpty() || ui->lineEdit_confirmPswd->text().isEmpty())
{
QMessageBox::information(this, tr("Prompt"), tr("Input cannot be empty!"));
return;
}
if (ui->lineEdit_password->text() != ui->lineEdit_confirmPswd->text())
{
QMessageBox::information(this, tr("Prompt"), tr("Password inconsistency"));
return;
}
if (0)
{
QMessageBox::information(this, tr("Prompt"), tr("User already exists"));
return;
}
saveCfgValue(ui->lineEdit_account->text().toStdString().c_str(), "password", ui->lineEdit_password->text());
accept();
}

25
app/HGProductionTool/dialog_registeraccount.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef DIALOG_REGISTERACCOUNT_H
#define DIALOG_REGISTERACCOUNT_H
#include <QDialog>
namespace Ui {
class Dialog_RegisterAccount;
}
class Dialog_RegisterAccount : public QDialog
{
Q_OBJECT
public:
explicit Dialog_RegisterAccount(QWidget *parent = nullptr);
~Dialog_RegisterAccount();
private slots:
void on_pushButton_register_clicked();
private:
Ui::Dialog_RegisterAccount *ui;
};
#endif // DIALOG_REGISTERACCOUNT_H

101
app/HGProductionTool/dialog_registeraccount.ui Normal file
View File

@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog_RegisterAccount</class>
<widget class="QDialog" name="Dialog_RegisterAccount">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>407</width>
<height>235</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<widget class="QPushButton" name="pushButton_register">
<property name="geometry">
<rect>
<x>150</x>
<y>180</y>
<width>91</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Register</string>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>120</x>
<y>20</y>
<width>41</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Account name:</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>130</x>
<y>70</y>
<width>31</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Password:</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_account">
<property name="geometry">
<rect>
<x>170</x>
<y>29</y>
<width>131</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_password">
<property name="geometry">
<rect>
<x>170</x>
<y>79</y>
<width>131</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>110</x>
<y>120</y>
<width>51</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>confirm password:</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_confirmPswd">
<property name="geometry">
<rect>
<x>170</x>
<y>129</y>
<width>131</width>
<height>21</height>
</rect>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>

2
app/HGProductionTool/form_burnmode.cpp
View File

@ -17,6 +17,8 @@ Form_BurnMode::Form_BurnMode(class MainWindow *mainwnd, QWidget *parent) :
{
ui->setupUi(this);
ui->pbtn_close->setVisible(false);
connect(this, SIGNAL(testResult(bool)), this, SLOT(on_testResult(bool)), Qt::QueuedConnection);
initTableWidget();

48
app/HGProductionTool/form_maininterface.cpp
View File

@ -4,6 +4,7 @@
#include <QMessageBox>
#include <QInputDialog>
#include "base/HGBase.h"
#include "base/HGInfo.h"
#include "imgfmt/HGImgFmt.h"
#include "HGUIGlobal.h"
#include "HGString.h"
@ -14,12 +15,13 @@
#include "dialog_excepdesc.h"
#include "huagao/hgscanner_error.h"
Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::LogInType logInType, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::LogInType logInType, const QString &accountName, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
const QString &serialNum, const QString &devType, const QString &devName, const QString &devFwNum)
: QWidget(mainwnd)
, ui(new Ui::Form_mainInterface)
, m_mainwnd(mainwnd)
, m_logInType(logInType)
, m_accountName(accountName)
, m_hg(nullptr)
, m_handle(handle)
, m_disconnect(false)
@ -342,6 +344,9 @@ void Form_mainInterface::on_pbtn_fail_clicked()
QTableWidgetItem *item2 = ui->tableWidget->item(row, 2);
item2->setToolTip(str);
writeTestLog(tr("Serial number: %1, Test item: %2, Test result: Failed! Reason: %3")
.arg(m_serialNum).arg(title).arg(str));
}
}
}
@ -363,6 +368,11 @@ void Form_mainInterface::on_pbtn_pass_clicked()
QTableWidgetItem *item2 = ui->tableWidget->item(row, 2);
item2->setToolTip("");
writeTestLog(tr("Serial number: %1, Test item: %2, Test result: Pass!")
.arg(m_serialNum).arg(title));
on_pbtn_nextStep_clicked();
}
@ -386,8 +396,6 @@ void Form_mainInterface::on_pbtn_pass_clicked()
// file.remove();
// }
// }
on_pbtn_nextStep_clicked();
}
void Form_mainInterface::on_pbtn_stop_clicked()
@ -667,6 +675,40 @@ void Form_mainInterface::getLogInfo(int ret)
}
}
QString Form_mainInterface::getLogPath()
{
HGChar cachePath[512];
HGBase_GetDocumentsPath(cachePath, 512);
HGChar procName[512];
HGBase_GetProcessName(procName, 512);
strcat(cachePath, procName);
strcat(cachePath, "/Test_Log/");
return getStdFileName(cachePath);
}
void Form_mainInterface::writeTestLog(QString logContent)
{
QString logPath = getLogPath();
HGBase_CreateDir(getStdString(logPath).c_str());
QString fileName = logPath + m_accountName + ".log";
QFile file(fileName);
if(!file.open(QIODevice::ReadWrite | QIODevice::Append))
{
return;
}
QDateTime dateTime= QDateTime::currentDateTime();
QString curTime = dateTime .toString("yyyy-MM-dd hh:mm:ss");
QString content = "[" + curTime + "] ";
content += logContent;
QTextStream txtOutput(&file);
txtOutput << content << endl;
file.close();
}
void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)
{
(void)previous;

5
app/HGProductionTool/form_maininterface.h
View File

@ -21,7 +21,7 @@ class Form_mainInterface : public QWidget
Q_OBJECT
public:
explicit Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::LogInType logInType, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
explicit Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::LogInType logInType, const QString &accountName, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
const QString &serialNum, const QString &devType, const QString &devName, const QString &devFwNum);
~Form_mainInterface();
@ -93,6 +93,8 @@ private:
int getRollerNum();
int getHistoryCount();
void getLogInfo(int ret);
QString getLogPath();
void writeTestLog(QString logContent);
private:
union VIDPID
@ -114,6 +116,7 @@ private:
class MainWindow *m_mainwnd;
Dialog_logIn::LogInType m_logInType;
QString m_accountName;
hgscanner *m_hg;
SANE_Handle m_handle;
bool m_disconnect;

2
app/HGProductionTool/main.cpp
View File

@ -18,7 +18,7 @@ int main(int argc, char *argv[])
Dialog_logIn login;
if (login.exec())
{
MainWindow w(login.GetUserMgr(), login.GetLogInType(), login.GetFtpHost(), login.GetFtpPort());
MainWindow w(login.GetUserMgr(), login.GetLogInType(), login.GetAccountName(), login.GetFtpHost(), login.GetFtpPort());
a.exec();
if (w.isExitApp())
{

13
app/HGProductionTool/mainwindow.cpp
View File

@ -11,7 +11,7 @@
#include "dialog_inputserialnum.h"
#include "dialog_hgmessagebox.h"
MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInType loginType, const QString &ftpHost, unsigned short ftpPort, QWidget *parent)
MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInType loginType, const QString &accountName, const QString &ftpHost, unsigned short ftpPort, QWidget *parent)
: QMainWindow(parent)
, ui(new Ui::MainWindow)
, m_pdtToolDbuserMgr(pdtToolDbuserMgr)
@ -20,6 +20,7 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
, m_lock(nullptr)
, m_testingRef(0)
, m_loginType(loginType)
, m_accountName(accountName)
, m_formBurnMode(nullptr)
, m_top_splitter(nullptr)
, m_bot_splitter(nullptr)
@ -29,6 +30,10 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
ui->setupUi(this);
ui->act_newDevice->setVisible(false);
ui->act_close->setVisible(false);
ui->act_manage->setVisible(false);
ui->act_export->setVisible(false);
ui->act_refreshDevice->setShortcut(QKeySequence("F5"));
QFont ft;
@ -533,7 +538,7 @@ void MainWindow::on_act_newDevice_triggered()
HGPdtToolDbDevice pdtToolDbDevice = nullptr;
HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, m_inputSnDlg->GetSn().toStdString().c_str(), &pdtToolDbDevice);
Form_mainInterface *mainInterface = new Form_mainInterface(this, m_loginType, nullptr, m_pdtToolDbuserMgr, pdtToolDbDevice,
Form_mainInterface *mainInterface = new Form_mainInterface(this, m_loginType, m_accountName, nullptr, m_pdtToolDbuserMgr, pdtToolDbDevice,
m_inputSnDlg->GetSn(), m_inputSnDlg->GetDevType(), nullptr, nullptr);
if (!AddInterface(mainInterface))
{
@ -553,7 +558,7 @@ void MainWindow::on_act_manage_triggered()
void MainWindow::on_act_changePwd_triggered()
{
Dialog_changePwd dlg(m_pdtToolDbuserMgr, this);
Dialog_changePwd dlg(m_pdtToolDbuserMgr, m_accountName, this);
dlg.exec();
}
@ -661,7 +666,7 @@ void MainWindow::on_act_refreshDevice_triggered()
HGPdtToolDbDevice pdtToolDbDevice = nullptr;
HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, m_inputSnDlg->GetSn().toStdString().c_str(), &pdtToolDbDevice);
Form_mainInterface *mainInterface = new Form_mainInterface(this, m_loginType, devHandle, m_pdtToolDbuserMgr, pdtToolDbDevice,
Form_mainInterface *mainInterface = new Form_mainInterface(this, m_loginType, m_accountName, devHandle, m_pdtToolDbuserMgr, pdtToolDbDevice,
m_inputSnDlg->GetSn(), m_inputSnDlg->GetDevType(), name[i].c_str(), getDevFwNum(devHandle));
if (!AddInterface(mainInterface))
{

3
app/HGProductionTool/mainwindow.h
View File

@ -21,7 +21,7 @@ class MainWindow : public QMainWindow
Q_OBJECT
public:
MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInType loginType, const QString &ftpHost, unsigned short ftpPort, QWidget *parent = nullptr);
MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInType loginType, const QString &accountName, const QString &ftpHost, unsigned short ftpPort, QWidget *parent = nullptr);
~MainWindow();
static QString getLogInfo(HGResult ret);
bool isExitApp();
@ -84,6 +84,7 @@ private:
HGLock m_lock;
int m_testingRef;
Dialog_logIn::LogInType m_loginType;
QString m_accountName;
class Dialog_InputSerialNum *m_inputSnDlg;
Form_BurnMode *m_formBurnMode;