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-12 11:02:45 +08:00
parent 4d1286bf73
commit db589e65f0
10 changed files with 250 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/HGProductionTool/HGProductionTool.pro
View File

@ -87,6 +87,7 @@ SOURCES += \
dialog_login.cpp \ dialog_login.cpp \
dialog_rootfuntion.cpp \ dialog_rootfuntion.cpp \
dialog_setburnsn.cpp \ dialog_setburnsn.cpp \
dialog_setlogpath.cpp \
dialog_uploadcfgfile.cpp \ dialog_uploadcfgfile.cpp \
dialog_userinput.cpp \ dialog_userinput.cpp \
dialog_registeraccount.cpp \ dialog_registeraccount.cpp \
@ -112,6 +113,7 @@ HEADERS += \
dialog_login.h \ dialog_login.h \
dialog_rootfuntion.h \ dialog_rootfuntion.h \
dialog_setburnsn.h \ dialog_setburnsn.h \
dialog_setlogpath.h \
dialog_uploadcfgfile.h \ dialog_uploadcfgfile.h \
dialog_userinput.h \ dialog_userinput.h \
dialog_registeraccount.h \ dialog_registeraccount.h \
@ -131,6 +133,7 @@ FORMS += \
dialog_login.ui \ dialog_login.ui \
dialog_rootfuntion.ui \ dialog_rootfuntion.ui \
dialog_setburnsn.ui \ dialog_setburnsn.ui \
dialog_setlogpath.ui \
dialog_uploadcfgfile.ui \ dialog_uploadcfgfile.ui \
dialog_userinput.ui \ dialog_userinput.ui \
dialog_registeraccount.ui \ dialog_registeraccount.ui \

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

297
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -77,17 +77,17 @@
<translation type="vanished">设备类型：</translation> <translation type="vanished">设备类型：</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.ui" line="225"/> <location filename="dialog_inputserialnum.ui" line="145"/>
<source>Scanner：</source> <source>Scanner：</source>
<translation>设备名：</translation> <translation>设备名：</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.ui" line="142"/> <location filename="dialog_inputserialnum.ui" line="193"/>
<source>serialNum:</source> <source>serialNum:</source>
<translation>序列号：</translation> <translation>序列号：</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.ui" line="165"/> <location filename="dialog_inputserialnum.ui" line="212"/>
<source>Set Sn</source> <source>Set Sn</source>
<translation>设置序列号</translation> <translation>设置序列号</translation>
</message> </message>
@ -107,10 +107,15 @@
<translation>进入测试</translation> <translation>进入测试</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.ui" line="238"/> <location filename="dialog_inputserialnum.ui" line="158"/>
<source>Reboot</source> <source>Reboot</source>
<translation>重启</translation> <translation>重启</translation>
</message> </message>
<message>
<location filename="dialog_inputserialnum.ui" line="231"/>
<source>Select Log Path</source>
<translation>选择日志路径</translation>
</message>
<message> <message>
<source>OK</source> <source>OK</source>
<translation type="vanished">确定</translation> <translation type="vanished">确定</translation>
@ -120,35 +125,35 @@
<translation type="vanished">取消</translation> <translation type="vanished">取消</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="419"/> <location filename="dialog_inputserialnum.cpp" line="430"/>
<location filename="dialog_inputserialnum.cpp" line="426"/> <location filename="dialog_inputserialnum.cpp" line="437"/>
<location filename="dialog_inputserialnum.cpp" line="435"/> <location filename="dialog_inputserialnum.cpp" line="446"/>
<location filename="dialog_inputserialnum.cpp" line="442"/> <location filename="dialog_inputserialnum.cpp" line="453"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="376"/> <location filename="dialog_inputserialnum.cpp" line="387"/>
<source>Speed mode</source> <source>Speed mode</source>
<translation>速度模式</translation> <translation>速度模式</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="343"/> <location filename="dialog_inputserialnum.cpp" line="354"/>
<source>Failed!</source> <source>Failed!</source>
<translation>失败!</translation> <translation>失败!</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="350"/> <location filename="dialog_inputserialnum.cpp" line="361"/>
<source>Succeed!</source> <source>Succeed!</source>
<translation>成功!</translation> <translation>成功!</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="386"/> <location filename="dialog_inputserialnum.cpp" line="397"/>
<source>Sleep time</source> <source>Sleep time</source>
<translation>休眠时间</translation> <translation>休眠时间</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="395"/> <location filename="dialog_inputserialnum.cpp" line="406"/>
<source>Vid and Pid</source> <source>Vid and Pid</source>
<translation>Vid和Pid</translation> <translation>Vid和Pid</translation>
</message> </message>
@ -161,93 +166,93 @@
<translation type="vanished">检测到配置%1不一致，已重新配置，请再次检查</translation> <translation type="vanished">检测到配置%1不一致，已重新配置，请再次检查</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="405"/> <location filename="dialog_inputserialnum.cpp" line="416"/>
<source>Consistent configuration</source> <source>Consistent configuration</source>
<translation>配置一致！</translation> <translation>配置一致！</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="419"/> <location filename="dialog_inputserialnum.cpp" line="430"/>
<source>device is lost</source> <source>device is lost</source>
<translation>设备已丢失</translation> <translation>设备已丢失</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="426"/> <location filename="dialog_inputserialnum.cpp" line="437"/>
<source>Serial num is empty</source> <source>Serial num is empty</source>
<translation>序列号为空</translation> <translation>序列号为空</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="435"/> <location filename="dialog_inputserialnum.cpp" line="446"/>
<source>sn is illegal</source> <source>sn is illegal</source>
<translation>序列号不合法</translation> <translation>序列号不合法</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="442"/> <location filename="dialog_inputserialnum.cpp" line="453"/>
<source>The device is testing</source> <source>The device is testing</source>
<translation>该设备正在进行测试</translation> <translation>该设备正在进行测试</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="345"/> <location filename="dialog_inputserialnum.cpp" line="355"/>
<source>set sn failed</source> <source>set sn failed</source>
<translation>设置序列号失败</translation> <translation>设置序列号失败</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="39"/> <location filename="dialog_inputserialnum.cpp" line="48"/>
<source>Device name: %1</source> <source>Device name: %1</source>
<translation>设备名： %1</translation> <translation>设备名： %1</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="241"/> <location filename="dialog_inputserialnum.cpp" line="250"/>
<source>Target Configration:</source> <source>Target Configration:</source>
<oldsource>Target Configration: <oldsource>Target Configration:
</oldsource> </oldsource>
<translation>目标配置:</translation> <translation>目标配置:</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="107"/> <location filename="dialog_inputserialnum.cpp" line="116"/>
<location filename="dialog_inputserialnum.cpp" line="242"/> <location filename="dialog_inputserialnum.cpp" line="251"/>
<location filename="dialog_inputserialnum.cpp" line="269"/> <location filename="dialog_inputserialnum.cpp" line="278"/>
<location filename="dialog_inputserialnum.cpp" line="469"/> <location filename="dialog_inputserialnum.cpp" line="480"/>
<source>Speep mode: %1PPM</source> <source>Speep mode: %1PPM</source>
<oldsource>Speep mode: %1PPM <oldsource>Speep mode: %1PPM
</oldsource> </oldsource>
<translation>速度模式: %1PPM</translation> <translation>速度模式: %1PPM</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="107"/> <location filename="dialog_inputserialnum.cpp" line="116"/>
<location filename="dialog_inputserialnum.cpp" line="124"/> <location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="148"/> <location filename="dialog_inputserialnum.cpp" line="157"/>
<source>Set</source> <source>Set</source>
<translation>设置</translation> <translation>设置</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="124"/> <location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="243"/> <location filename="dialog_inputserialnum.cpp" line="252"/>
<location filename="dialog_inputserialnum.cpp" line="270"/> <location filename="dialog_inputserialnum.cpp" line="279"/>
<location filename="dialog_inputserialnum.cpp" line="470"/> <location filename="dialog_inputserialnum.cpp" line="481"/>
<source>Sleep time: %1minute</source> <source>Sleep time: %1minute</source>
<oldsource>Sleep time: %1minute <oldsource>Sleep time: %1minute
</oldsource> </oldsource>
<translation>休眠时间: %1分钟</translation> <translation>休眠时间: %1分钟</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="148"/> <location filename="dialog_inputserialnum.cpp" line="157"/>
<location filename="dialog_inputserialnum.cpp" line="244"/> <location filename="dialog_inputserialnum.cpp" line="253"/>
<location filename="dialog_inputserialnum.cpp" line="271"/> <location filename="dialog_inputserialnum.cpp" line="280"/>
<location filename="dialog_inputserialnum.cpp" line="471"/> <location filename="dialog_inputserialnum.cpp" line="482"/>
<source>Vid: %1 Pid: %2</source> <source>Vid: %1 Pid: %2</source>
<oldsource>Vid: %1 Pid: %2 <oldsource>Vid: %1 Pid: %2
</oldsource> </oldsource>
<translation>Vid: %1 Pid: %2</translation> <translation>Vid: %1 Pid: %2</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="268"/> <location filename="dialog_inputserialnum.cpp" line="277"/>
<source>Current Configration of device:</source> <source>Current Configration of device:</source>
<translation>当前设备配置:</translation> <translation>当前设备配置:</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="339"/>
<location filename="dialog_inputserialnum.cpp" line="343"/>
<location filename="dialog_inputserialnum.cpp" line="350"/> <location filename="dialog_inputserialnum.cpp" line="350"/>
<location filename="dialog_inputserialnum.cpp" line="354"/>
<location filename="dialog_inputserialnum.cpp" line="361"/>
<source>Set serial number: %1 </source> <source>Set serial number: %1 </source>
<translation>设置序列号: %1 </translation> <translation>设置序列号: %1 </translation>
</message> </message>
@ -260,23 +265,23 @@
<translation type="vanished">测试结果：成功！</translation> <translation type="vanished">测试结果：成功！</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="380"/> <location filename="dialog_inputserialnum.cpp" line="391"/>
<location filename="dialog_inputserialnum.cpp" line="389"/> <location filename="dialog_inputserialnum.cpp" line="400"/>
<source>Inconsistent configuration %1detected, please reconfigure, and check again</source> <source>Inconsistent configuration %1detected, please reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重新配置后再次检查</translation> <translation>检测到配置 %1不一致，请重新配置后再次检查</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="398"/> <location filename="dialog_inputserialnum.cpp" line="409"/>
<source>Inconsistent configuration %1detected, please reboot and reconfigure, and check again</source> <source>Inconsistent configuration %1detected, please reboot and reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重启后再次检查</translation> <translation>检测到配置 %1不一致，请重启后再次检查</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="473"/> <location filename="dialog_inputserialnum.cpp" line="484"/>
<source>Set configuration to device </source> <source>Set configuration to device </source>
<translation>将目标配置设置到设备 </translation> <translation>将目标配置设置到设备 </translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="474"/> <location filename="dialog_inputserialnum.cpp" line="485"/>
<source>Test content: </source> <source>Test content: </source>
<translation>测试内容： </translation> <translation>测试内容： </translation>
</message> </message>
@ -285,21 +290,21 @@
<translation type="vanished">成功，请检查配置</translation> <translation type="vanished">成功，请检查配置</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="124"/> <location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="243"/> <location filename="dialog_inputserialnum.cpp" line="252"/>
<location filename="dialog_inputserialnum.cpp" line="270"/> <location filename="dialog_inputserialnum.cpp" line="279"/>
<location filename="dialog_inputserialnum.cpp" line="470"/> <location filename="dialog_inputserialnum.cpp" line="481"/>
<source>Sleep time: Not sleeping</source> <source>Sleep time: Not sleeping</source>
<translation>休眠时间: 不休眠</translation> <translation>休眠时间: 不休眠</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="339"/> <location filename="dialog_inputserialnum.cpp" line="350"/>
<location filename="dialog_inputserialnum.cpp" line="473"/> <location filename="dialog_inputserialnum.cpp" line="484"/>
<source>Tester: %1, Test item: %2</source> <source>Tester: %1, Test item: %2</source>
<translation>测试员: %1, 测试项: %2</translation> <translation>测试员: %1, 测试项: %2</translation>
</message> </message>
<message> <message>
<location filename="dialog_inputserialnum.cpp" line="352"/> <location filename="dialog_inputserialnum.cpp" line="362"/>
<source>set sn succeed</source> <source>set sn succeed</source>
<translation>设置序列号成功</translation> <translation>设置序列号成功</translation>
</message> </message>
@ -389,6 +394,55 @@
<translation>序列号为空</translation> <translation>序列号为空</translation>
</message> </message>
</context> </context>
<context>
<name>Dialog_SetLogPath</name>
<message>
<location filename="dialog_setlogpath.ui" line="14"/>
<source>Dialog</source>
<translation>选择日志保存路径</translation>
</message>
<message>
<location filename="dialog_setlogpath.ui" line="26"/>
<source>Log path:</source>
<translation>日志路径：</translation>
</message>
<message>
<location filename="dialog_setlogpath.ui" line="49"/>
<source>Ok</source>
<translation>确定</translation>
</message>
<message>
<location filename="dialog_setlogpath.ui" line="62"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
<location filename="dialog_setlogpath.ui" line="75"/>
<source>Select path</source>
<translation>选择路径</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="30"/>
<location filename="dialog_setlogpath.cpp" line="38"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="30"/>
<source>Directory can not be empty</source>
<translation>文件不能为空</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="38"/>
<source>Create logPath failed</source>
<translation>创建文件失败</translation>
</message>
<message>
<location filename="dialog_setlogpath.cpp" line="54"/>
<source>Browse directory</source>
<translation>打开文件</translation>
</message>
</context>
<context> <context>
<name>Dialog_UserInput</name> <name>Dialog_UserInput</name>
<message> <message>
@ -682,35 +736,35 @@
<translation>登录</translation> <translation>登录</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="165"/> <location filename="dialog_login.cpp" line="166"/>
<location filename="dialog_login.cpp" line="171"/> <location filename="dialog_login.cpp" line="172"/>
<location filename="dialog_login.cpp" line="177"/> <location filename="dialog_login.cpp" line="178"/>
<location filename="dialog_login.cpp" line="183"/> <location filename="dialog_login.cpp" line="184"/>
<source>Prompt</source> <source>Prompt</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="165"/> <location filename="dialog_login.cpp" line="166"/>
<source>Account dose not exist</source> <source>Account dose not exist</source>
<translation>账户不存在</translation> <translation>账户不存在</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="171"/> <location filename="dialog_login.cpp" line="172"/>
<source>Password can not be empty</source> <source>Password can not be empty</source>
<translation>密码不能为空</translation> <translation>密码不能为空</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="177"/> <location filename="dialog_login.cpp" line="178"/>
<source>Password error</source> <source>Password error</source>
<translation>密码错误</translation> <translation>密码错误</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="183"/> <location filename="dialog_login.cpp" line="184"/>
<source>Please select a profile first</source> <source>Please select a profile first</source>
<translation>请先选择配置文件</translation> <translation>请先选择配置文件</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.cpp" line="261"/> <location filename="dialog_login.cpp" line="263"/>
<source>Select profile</source> <source>Select profile</source>
<translation>选择配置文件</translation> <translation>选择配置文件</translation>
</message> </message>
@ -1184,12 +1238,12 @@
<translation type="vanished">设备未连接</translation> <translation type="vanished">设备未连接</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="66"/> <location filename="form_maininterface.cpp" line="67"/>
<source>Device type:</source> <source>Device type:</source>
<translation>设备类型：</translation> <translation>设备类型：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="66"/> <location filename="form_maininterface.cpp" line="67"/>
<source> SerialNum:</source> <source> SerialNum:</source>
<translation> 序列号：</translation> <translation> 序列号：</translation>
</message> </message>
@ -1206,7 +1260,7 @@
<translation type="vanished"> 休眠时间： </translation> <translation type="vanished"> 休眠时间： </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="84"/> <location filename="form_maininterface.cpp" line="85"/>
<source>load last image which uploaded last time</source> <source>load last image which uploaded last time</source>
<translation>加载上一次上传的图片</translation> <translation>加载上一次上传的图片</translation>
</message> </message>
@ -1215,14 +1269,14 @@
<translation type="vanished">设备已断开</translation> <translation type="vanished">设备已断开</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="163"/> <location filename="form_maininterface.cpp" line="164"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="206"/> <location filename="form_maininterface.cpp" line="207"/>
<location filename="form_maininterface.cpp" line="216"/> <location filename="form_maininterface.cpp" line="217"/>
<location filename="form_maininterface.cpp" line="226"/> <location filename="form_maininterface.cpp" line="227"/>
<source>destortion value: </source> <source>destortion value: </source>
<translation>畸变修正值： </translation> <translation>畸变修正值： </translation>
</message> </message>
@ -1235,68 +1289,68 @@
<translation type="vanished">取消</translation> <translation type="vanished">取消</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="68"/> <location filename="form_maininterface.cpp" line="69"/>
<source> speed mode:</source> <source> speed mode:</source>
<translation> 目标配置： 速度模式：</translation> <translation> 目标配置： 速度模式：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="69"/> <location filename="form_maininterface.cpp" line="70"/>
<source> sleep time:</source> <source> sleep time:</source>
<translation> 休眠时间：</translation> <translation> 休眠时间：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="160"/> <location filename="form_maininterface.cpp" line="161"/>
<source>,but correct information is abnormal</source> <source>,but correct information is abnormal</source>
<translation>，但是校正有异常</translation> <translation>，但是校正有异常</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="265"/> <location filename="form_maininterface.cpp" line="266"/>
<source>please verify the configuration of the device:</source> <source>please verify the configuration of the device:</source>
<translation>请验证设备配置：</translation> <translation>请验证设备配置：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="266"/> <location filename="form_maininterface.cpp" line="267"/>
<source>vid:%1 <source>vid:%1
</source> </source>
<translation>vid:%1 <translation>vid:%1
</translation> </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="267"/> <location filename="form_maininterface.cpp" line="268"/>
<source>pid:%1 <source>pid:%1
</source> </source>
<translation>pid:%1 <translation>pid:%1
</translation> </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="268"/> <location filename="form_maininterface.cpp" line="269"/>
<source>sleep time:%1minute <source>sleep time:%1minute
</source> </source>
<translation>休眠时间：%1分钟 <translation>休眠时间：%1分钟
</translation> </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="268"/> <location filename="form_maininterface.cpp" line="269"/>
<source>sleep time:%1 <source>sleep time:%1
</source> </source>
<translation>休眠时间：%1 <translation>休眠时间：%1
</translation> </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="268"/> <location filename="form_maininterface.cpp" line="269"/>
<location filename="form_maininterface.cpp" line="598"/> <location filename="form_maininterface.cpp" line="599"/>
<source>Not sleeping</source> <source>Not sleeping</source>
<translation>不休眠</translation> <translation>不休眠</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="269"/> <location filename="form_maininterface.cpp" line="270"/>
<source>speed mode:%1PPM <source>speed mode:%1PPM
</source> </source>
<translation>速度模式：%1PPM <translation>速度模式：%1PPM
</translation> </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="273"/> <location filename="form_maininterface.cpp" line="274"/>
<source>device model:%1</source> <source>device model:%1</source>
<translation>设备型号：%1</translation> <translation>设备型号：%1</translation>
</message> </message>
@ -1311,46 +1365,46 @@
<translation type="vanished">设备序列号: %1, 测试项: %2, 测试结果: 通过!</translation> <translation type="vanished">设备序列号: %1, 测试项: %2, 测试结果: 通过!</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="763"/> <location filename="form_maininterface.cpp" line="766"/>
<location filename="form_maininterface.cpp" line="834"/> <location filename="form_maininterface.cpp" line="837"/>
<source>device history scan count:</source> <source>device history scan count:</source>
<translation>设备历史扫描张数：</translation> <translation>设备历史扫描张数：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="657"/> <location filename="form_maininterface.cpp" line="658"/>
<location filename="form_maininterface.cpp" line="661"/> <location filename="form_maininterface.cpp" line="662"/>
<location filename="form_maininterface.cpp" line="665"/> <location filename="form_maininterface.cpp" line="666"/>
<location filename="form_maininterface.cpp" line="669"/> <location filename="form_maininterface.cpp" line="670"/>
<source>Prompt</source> <source>Prompt</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="348"/> <location filename="form_maininterface.cpp" line="349"/>
<source>Tester: %1, Test item: %2, Test result: Failed! Reason: %3</source> <source>Tester: %1, Test item: %2, Test result: Failed! Reason: %3</source>
<translation>测试员: %1, 测试项: %2, 测试结果: 不通过! 原因: %3</translation> <translation>测试员: %1, 测试项: %2, 测试结果: 不通过! 原因: %3</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="373"/> <location filename="form_maininterface.cpp" line="374"/>
<source>Tester: %1, Test item: %2, Test result: Pass!</source> <source>Tester: %1, Test item: %2, Test result: Pass!</source>
<translation>测试员: %1, 测试项: %2, 测试结果: 通过!</translation> <translation>测试员: %1, 测试项: %2, 测试结果: 通过!</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="657"/> <location filename="form_maininterface.cpp" line="658"/>
<source>No paper</source> <source>No paper</source>
<translation>无纸</translation> <translation>无纸</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="661"/> <location filename="form_maininterface.cpp" line="662"/>
<source>Device is sleeping</source> <source>Device is sleeping</source>
<translation>设备处于休眠模式</translation> <translation>设备处于休眠模式</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="665"/> <location filename="form_maininterface.cpp" line="666"/>
<source>Counting mode</source> <source>Counting mode</source>
<translation>设备处于计数模式</translation> <translation>设备处于计数模式</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="669"/> <location filename="form_maininterface.cpp" line="670"/>
<source>Other error</source> <source>Other error</source>
<translation>其他错误</translation> <translation>其他错误</translation>
</message> </message>
@ -1359,39 +1413,39 @@
<translation type="vanished">设备序列号：%1</translation> <translation type="vanished">设备序列号：%1</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="416"/> <location filename="form_maininterface.cpp" line="417"/>
<source>ID</source> <source>ID</source>
<translation>序号</translation> <translation>序号</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="416"/> <location filename="form_maininterface.cpp" line="417"/>
<source>Test items</source> <source>Test items</source>
<translation>测试项</translation> <translation>测试项</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="416"/> <location filename="form_maininterface.cpp" line="417"/>
<source>status</source> <source>status</source>
<translation>测试状态</translation> <translation>测试状态</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="492"/> <location filename="form_maininterface.cpp" line="493"/>
<source>not test</source> <source>not test</source>
<translation>未测试</translation> <translation>未测试</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="338"/> <location filename="form_maininterface.cpp" line="339"/>
<location filename="form_maininterface.cpp" line="492"/> <location filename="form_maininterface.cpp" line="493"/>
<source>not pass</source> <source>not pass</source>
<translation>不通过</translation> <translation>不通过</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="492"/> <location filename="form_maininterface.cpp" line="493"/>
<source>not support</source> <source>not support</source>
<translation>不支持</translation> <translation>不支持</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="368"/> <location filename="form_maininterface.cpp" line="369"/>
<location filename="form_maininterface.cpp" line="492"/> <location filename="form_maininterface.cpp" line="493"/>
<source>pass</source> <source>pass</source>
<translation>通过</translation> <translation>通过</translation>
</message> </message>
@ -1417,31 +1471,31 @@
<translation type="vanished">Pid：</translation> <translation type="vanished">Pid：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="757"/> <location filename="form_maininterface.cpp" line="760"/>
<location filename="form_maininterface.cpp" line="828"/> <location filename="form_maininterface.cpp" line="831"/>
<source>device roller count:</source> <source>device roller count:</source>
<translation>设备滚轴张数：</translation> <translation>设备滚轴张数：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="201"/> <location filename="form_maininterface.cpp" line="202"/>
<location filename="form_maininterface.cpp" line="558"/> <location filename="form_maininterface.cpp" line="559"/>
<source>image pixel: </source> <source>image pixel: </source>
<translation>标准圆:宽 * 高: </translation> <translation>标准圆:宽 * 高: </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="66"/> <location filename="form_maininterface.cpp" line="67"/>
<source>FirmwareNum:</source> <source>FirmwareNum:</source>
<translation>固件号：</translation> <translation>固件号：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="270"/> <location filename="form_maininterface.cpp" line="271"/>
<source>device serial number:%1 <source>device serial number:%1
</source> </source>
<translation>设备序列号：%1 <translation>设备序列号：%1
</translation> </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="271"/> <location filename="form_maininterface.cpp" line="272"/>
<source>device firmware number:%1 <source>device firmware number:%1
</source> </source>
<oldsource>device firmware number:%1</oldsource> <oldsource>device firmware number:%1</oldsource>
@ -1449,17 +1503,17 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="600"/> <location filename="form_maininterface.cpp" line="601"/>
<source> minute</source> <source> minute</source>
<translation> 分钟</translation> <translation> 分钟</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="71"/> <location filename="form_maininterface.cpp" line="72"/>
<source> VID:</source> <source> VID:</source>
<translation> VID：</translation> <translation> VID：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="71"/> <location filename="form_maininterface.cpp" line="72"/>
<source> PID:</source> <source> PID:</source>
<translation> PID：</translation> <translation> PID：</translation>
</message> </message>
@ -1519,25 +1573,40 @@
<translation>登出</translation> <translation>登出</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="80"/> <location filename="mainwindow.ui" line="78"/>
<source>Ctrl+Q</source>
<translation></translation>
</message>
<message>
<location filename="mainwindow.ui" line="83"/>
<source>act_close</source> <source>act_close</source>
<translation>退出</translation> <translation>退出</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="85"/> <location filename="mainwindow.ui" line="88"/>
<source>act_upload</source> <source>act_upload</source>
<translation>上传配置文件</translation> <translation>上传配置文件</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="90"/> <location filename="mainwindow.ui" line="93"/>
<source>act_refreshDevice</source> <source>act_refreshDevice</source>
<translation>刷新设备列表</translation> <translation>刷新设备列表</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="95"/> <location filename="mainwindow.ui" line="98"/>
<source>act_openLog</source> <source>act_openLog</source>
<translation>查看日志</translation> <translation>查看日志</translation>
</message> </message>
<message>
<location filename="mainwindow.ui" line="101"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
<location filename="mainwindow.ui" line="106"/>
<source>act_setLogPath</source>
<translation></translation>
</message>
<message> <message>
<source>Account login elsewhere</source> <source>Account login elsewhere</source>
<translation type="vanished">账户在其他地方登录</translation> <translation type="vanished">账户在其他地方登录</translation>

27
app/HGProductionTool/dialog_inputserialnum.cpp
View File

@ -1,7 +1,10 @@
#include "dialog_inputserialnum.h" #include "dialog_inputserialnum.h"
#include "ui_dialog_inputserialnum.h" #include "ui_dialog_inputserialnum.h"
#include "base/HGBase.h" #include "base/HGBase.h"
#include "HGString.h"
#include "HGUIGlobal.h" #include "HGUIGlobal.h"
#include "app_cfg.h"
#include "dialog_setlogpath.h"
Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_logIn::LogInType logInType, const QString &devName, const QString &profileName, Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_logIn::LogInType logInType, const QString &devName, const QString &profileName,
const QString &accountName, SANE_Handle handle, const QString &serialNum, const QString &devType) : const QString &accountName, SANE_Handle handle, const QString &serialNum, const QString &devType) :
@ -34,6 +37,12 @@ Dialog_InputSerialNum::Dialog_InputSerialNum(class MainWindow *mainWnd, Dialog_l
ui->pbtn_setConfig->setEnabled(false); ui->pbtn_setConfig->setEnabled(false);
} }
ui->pbtn_slectLogPath->setVisible(false);
if (m_accountName == "admin")
{
ui->pbtn_slectLogPath->setVisible(true);
}
ui->pbtn_enterTest->setEnabled(false); ui->pbtn_enterTest->setEnabled(false);
ui->label_scanner->setText(tr("Device name: %1").arg(m_devName)); ui->label_scanner->setText(tr("Device name: %1").arg(m_devName));
@ -275,14 +284,16 @@ void Dialog_InputSerialNum::updateCurDeviceCfg()
QString Dialog_InputSerialNum::getLogPath() QString Dialog_InputSerialNum::getLogPath()
{ {
HGChar cachePath[512]; HGChar logPath[512];
HGBase_GetDocumentsPath(cachePath, 512); HGBase_GetDocumentsPath(logPath, 512);
HGChar procName[512]; HGChar procName[512];
HGBase_GetProcessName(procName, 512); HGBase_GetProcessName(procName, 512);
strcat(cachePath, procName); strcat(logPath, procName);
strcat(cachePath, "/Test_Log/"); strcat(logPath, "/Test_Log/");
strcat(logPath, m_devType.toStdString().c_str());
strcat(logPath, "/");
return getStdFileName(cachePath); return getCfgValue("save", "logPath", getStdFileName(StdStringToUtf8(logPath).c_str()));
} }
void Dialog_InputSerialNum::writeTestLog(QString logContent) void Dialog_InputSerialNum::writeTestLog(QString logContent)
@ -483,3 +494,9 @@ void Dialog_InputSerialNum::on_pbtn_reboot_clicked()
{ {
rebootDevice(); rebootDevice();
} }
void Dialog_InputSerialNum::on_pbtn_slectLogPath_clicked()
{
Dialog_SetLogPath dlg(m_devType, this);
dlg.exec();
}

2
app/HGProductionTool/dialog_inputserialnum.h
View File

@ -70,6 +70,8 @@ private slots:
void on_pbtn_reboot_clicked(); void on_pbtn_reboot_clicked();
void on_pbtn_slectLogPath_clicked();
private: private:
Ui::Dialog_InputSerialNum *ui; Ui::Dialog_InputSerialNum *ui;

19
app/HGProductionTool/dialog_inputserialnum.ui
View File

@ -212,6 +212,25 @@
<string>Set Sn</string> <string>Set Sn</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="pbtn_slectLogPath">
<property name="geometry">
<rect>
<x>560</x>
<y>50</y>
<width>181</width>
<height>31</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>131</width>
<height>31</height>
</size>
</property>
<property name="text">
<string>Select Log Path</string>
</property>
</widget>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

1
app/HGProductionTool/dialog_login.cpp
View File

@ -27,6 +27,7 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
ft2.setPointSize(8); ft2.setPointSize(8);
ui->lineEdit_password->setFont(ft2); ui->lineEdit_password->setFont(ft2);
ui->pbtn_login->setDefault(true);
ui->pbtn_setting->setVisible(false); ui->pbtn_setting->setVisible(false);
ui->radioButton_pressureTest->setVisible(false); ui->radioButton_pressureTest->setVisible(false);

13
app/HGProductionTool/form_maininterface.cpp
View File

@ -10,6 +10,7 @@
#include "HGString.h" #include "HGString.h"
#include "form_texttips.h" #include "form_texttips.h"
#include "test_base.h" #include "test_base.h"
#include "app_cfg.h"
#include "hgscanner.h" #include "hgscanner.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "dialog_excepdesc.h" #include "dialog_excepdesc.h"
@ -672,14 +673,16 @@ void Form_mainInterface::getLogInfo(int ret)
QString Form_mainInterface::getLogPath() QString Form_mainInterface::getLogPath()
{ {
HGChar cachePath[512]; HGChar logPath[512];
HGBase_GetDocumentsPath(cachePath, 512); HGBase_GetDocumentsPath(logPath, 512);
HGChar procName[512]; HGChar procName[512];
HGBase_GetProcessName(procName, 512); HGBase_GetProcessName(procName, 512);
strcat(cachePath, procName); strcat(logPath, procName);
strcat(cachePath, "/Test_Log/"); strcat(logPath, "/Test_Log/");
strcat(logPath, m_devType.toStdString().c_str());
strcat(logPath, "/");
return getStdFileName(cachePath); return getCfgValue("save", "logPath", getStdFileName(StdStringToUtf8(logPath).c_str()));
} }
void Form_mainInterface::writeTestLog(QString logContent) void Form_mainInterface::writeTestLog(QString logContent)

11
app/HGProductionTool/mainwindow.cpp
View File

@ -4,6 +4,7 @@
#include <QTimer> #include <QTimer>
#include "base/HGBase.h" #include "base/HGBase.h"
#include "HGUIGlobal.h" #include "HGUIGlobal.h"
#include "app_cfg.h"
#include "dialog_login.h" #include "dialog_login.h"
#include "dialog_changepwd.h" #include "dialog_changepwd.h"
#include "dialog_accountmanage.h" #include "dialog_accountmanage.h"
@ -34,10 +35,10 @@ MainWindow::MainWindow(Dialog_logIn::LogInType loginType, const QString &profile
ui->act_manage->setVisible(false); ui->act_manage->setVisible(false);
ui->act_export->setVisible(false); ui->act_export->setVisible(false);
ui->act_upload->setVisible(false); ui->act_upload->setVisible(false);
// ui->act_openLog->setVisible(false); ui->act_openLog->setVisible(false);
// if (m_accountName == "admin") if (m_accountName == "admin")
// ui->act_openLog->setVisible(true); ui->act_openLog->setVisible(true);
ui->act_refreshDevice->setShortcut(QKeySequence("F5")); ui->act_refreshDevice->setShortcut(QKeySequence("F5"));
@ -699,7 +700,9 @@ void MainWindow::on_act_openLog_triggered()
strcat(logPath, procName); strcat(logPath, procName);
strcat(logPath, "/Test_Log/"); strcat(logPath, "/Test_Log/");
QString fileName = logPath + m_accountName + ".log"; QString defaultFileName = logPath + m_accountName + ".log";
QString fileName = getCfgValue("save", "logPath", defaultFileName);
QFileInfo fileInfo(getStdFileName(fileName)); QFileInfo fileInfo(getStdFileName(fileName));
auto pathDir = fileInfo.path(); auto pathDir = fileInfo.path();
QString strFilePath = "file:///" + pathDir; QString strFilePath = "file:///" + pathDir;

5
app/HGProductionTool/mainwindow.ui
View File

@ -101,6 +101,11 @@
<string>Ctrl+L</string> <string>Ctrl+L</string>
</property> </property>
</action> </action>
<action name="act_setLogPath">
<property name="text">
<string>act_setLogPath</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>