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 2023-01-06 17:56:33 +08:00
parent 6d3e4db06a 99182bcb8f
commit fc660c7a7e
6 changed files with 82 additions and 54 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.

98
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -390,7 +390,7 @@
<message> <message>
<location filename="dialog_login.ui" line="370"/> <location filename="dialog_login.ui" line="370"/>
<source>ImageTest</source> <source>ImageTest</source>
<translation>图像检测工位</translation> <translation>图像测试工位</translation>
</message> </message>
<message> <message>
<location filename="dialog_login.ui" line="383"/> <location filename="dialog_login.ui" line="383"/>
@ -635,13 +635,13 @@
</message> </message>
<message> <message>
<location filename="form_burnmode.cpp" line="155"/> <location filename="form_burnmode.cpp" line="155"/>
<location filename="form_burnmode.cpp" line="340"/> <location filename="form_burnmode.cpp" line="341"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="form_burnmode.cpp" line="155"/> <location filename="form_burnmode.cpp" line="155"/>
<location filename="form_burnmode.cpp" line="340"/> <location filename="form_burnmode.cpp" line="341"/>
<source>Please check a devices at least</source> <source>Please check a devices at least</source>
<translation>请至少勾选一台设备</translation> <translation>请至少勾选一台设备</translation>
</message> </message>
@ -787,7 +787,7 @@
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="162"/> <location filename="form_maininterface.cpp" line="162"/>
<location filename="form_maininterface.cpp" line="611"/> <location filename="form_maininterface.cpp" line="613"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
@ -807,7 +807,7 @@
<message> <message>
<location filename="form_maininterface.cpp" line="66"/> <location filename="form_maininterface.cpp" line="66"/>
<source> speed mode:</source> <source> speed mode:</source>
<translation> 速度模式：</translation> <translation> 目标配置： 速度模式：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="71"/> <location filename="form_maininterface.cpp" line="71"/>
@ -870,7 +870,7 @@
<translation> PID：</translation> <translation> PID：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="611"/> <location filename="form_maininterface.cpp" line="613"/>
<source>no image</source> <source>no image</source>
<translation>无图</translation> <translation>无图</translation>
</message> </message>
@ -941,7 +941,7 @@
<translation>刷新设备列表</translation> <translation>刷新设备列表</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="490"/> <location filename="mainwindow.cpp" line="495"/>
<source>Account login elsewhere</source> <source>Account login elsewhere</source>
<translation>账户在其他地方登录</translation> <translation>账户在其他地方登录</translation>
</message> </message>
@ -950,56 +950,76 @@
<translation type="vanished">网络连接断开</translation> <translation type="vanished">网络连接断开</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="493"/> <location filename="mainwindow.cpp" line="498"/>
<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="496"/> <location filename="mainwindow.cpp" line="501"/>
<source>Data base error</source> <source>Data base error</source>
<translation>数据库错误</translation> <translation>数据库错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="304"/> <location filename="mainwindow.cpp" line="309"/>
<location filename="mainwindow.cpp" line="414"/> <location filename="mainwindow.cpp" line="419"/>
<location filename="mainwindow.cpp" line="436"/> <location filename="mainwindow.cpp" line="441"/>
<location filename="mainwindow.cpp" line="450"/> <location filename="mainwindow.cpp" line="455"/>
<location filename="mainwindow.cpp" line="506"/> <location filename="mainwindow.cpp" line="511"/>
<location filename="mainwindow.cpp" line="525"/> <location filename="mainwindow.cpp" line="530"/>
<location filename="mainwindow.cpp" line="552"/> <location filename="mainwindow.cpp" line="557"/>
<location filename="mainwindow.cpp" line="556"/> <location filename="mainwindow.cpp" line="561"/>
<location filename="mainwindow.cpp" line="565"/> <location filename="mainwindow.cpp" line="570"/>
<location filename="mainwindow.cpp" line="577"/> <location filename="mainwindow.cpp" line="582"/>
<location filename="mainwindow.cpp" line="637"/> <location filename="mainwindow.cpp" line="642"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="304"/> <location filename="mainwindow.cpp" line="43"/>
<location filename="mainwindow.cpp" line="565"/> <source>production tool-burn station</source>
<location filename="mainwindow.cpp" line="577"/> <translation>华高生产工具-烧录工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="89"/>
<source>production tool-init test station</source>
<translation>华高生产工具-初检工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="91"/>
<source>production tool-image test station</source>
<translation>华高生产工具-图像测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="93"/>
<source>production tool-pressure test station</source>
<translation>华高生产工具-压力测试工位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="309"/>
<location filename="mainwindow.cpp" line="570"/>
<location filename="mainwindow.cpp" line="582"/>
<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="415"/> <location filename="mainwindow.cpp" line="420"/>
<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="417"/> <location filename="mainwindow.cpp" line="422"/>
<source>yes</source> <source>yes</source>
<translation>确定</translation> <translation>确定</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="418"/> <location filename="mainwindow.cpp" line="423"/>
<source>no</source> <source>no</source>
<translation>取消</translation> <translation>取消</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="436"/> <location filename="mainwindow.cpp" line="441"/>
<location filename="mainwindow.cpp" line="525"/> <location filename="mainwindow.cpp" line="530"/>
<location filename="mainwindow.cpp" line="637"/> <location filename="mainwindow.cpp" line="642"/>
<source>cannot create more table</source> <source>cannot create more table</source>
<translation>不能创建更多项目</translation> <translation>不能创建更多项目</translation>
</message> </message>
@ -1008,52 +1028,52 @@
<translation type="vanished">设备已断开连接</translation> <translation type="vanished">设备已断开连接</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="450"/> <location filename="mainwindow.cpp" line="455"/>
<source>Open device failed</source> <source>Open device failed</source>
<translation>打开设备失败</translation> <translation>打开设备失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="547"/> <location filename="mainwindow.cpp" line="552"/>
<source>save</source> <source>save</source>
<translation>保存</translation> <translation>保存</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="547"/> <location filename="mainwindow.cpp" line="552"/>
<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="552"/> <location filename="mainwindow.cpp" line="557"/>
<source>export succeed</source> <source>export succeed</source>
<translation>导出成功</translation> <translation>导出成功</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="556"/> <location filename="mainwindow.cpp" line="561"/>
<source>export failed</source> <source>export failed</source>
<translation>导出失败</translation> <translation>导出失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="589"/> <location filename="mainwindow.cpp" line="594"/>
<source>Illegal user</source> <source>Illegal user</source>
<translation>非法的用户</translation> <translation>非法的用户</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="593"/> <location filename="mainwindow.cpp" line="598"/>
<source>Wrong password</source> <source>Wrong password</source>
<translation>密码错误</translation> <translation>密码错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="597"/> <location filename="mainwindow.cpp" line="602"/>
<source>Database error</source> <source>Database error</source>
<translation>数据库错误</translation> <translation>数据库错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="601"/> <location filename="mainwindow.cpp" line="606"/>
<source>connect error</source> <source>connect error</source>
<translation>连接错误</translation> <translation>连接错误</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="605"/> <location filename="mainwindow.cpp" line="610"/>
<source>Failed</source> <source>Failed</source>
<translation>错误</translation> <translation>错误</translation>
</message> </message>

11
app/HGProductionTool/form_burnmode.cpp
View File

@ -246,8 +246,9 @@ QString DeviceManager::getSn()
void DeviceManager::setBurnMode() void DeviceManager::setBurnMode()
{ {
const wchar_t *p = L"1"; const wchar_t *p = L"1";
func_test_go(HGPDTTOOLDB_NAME_REBOOT_DEVICE, p, m_hg);
m_mainwnd->addTestingRef(); m_mainwnd->addTestingRef();
func_test_go(HGPDTTOOLDB_NAME_REBOOT_DEVICE, p, m_hg);
} }
void DeviceManager::setSn(QString sn) void DeviceManager::setSn(QString sn)
@ -257,8 +258,8 @@ void DeviceManager::setSn(QString sn)
std::wstring sn2 = sn.toStdWString(); std::wstring sn2 = sn.toStdWString();
p->cat = WRITE_CAT_SERIALNUM; p->cat = WRITE_CAT_SERIALNUM;
p->val = (void*)sn2.c_str(); p->val = (void*)sn2.c_str();
func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
m_mainwnd->addTestingRef(); m_mainwnd->addTestingRef();
func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
setGlobalCfg(); setGlobalCfg();
@ -292,20 +293,20 @@ void DeviceManager::setGlobalCfg()
int vidpidValue = vidpid.Value; int vidpidValue = vidpid.Value;
lp->cat = WRITE_CAT_VID_PID; lp->cat = WRITE_CAT_VID_PID;
lp->val = (void*)&vidpidValue; lp->val = (void*)&vidpidValue;
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
m_mainwnd->addTestingRef(); m_mainwnd->addTestingRef();
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
int speedMode = jsonGlobal.speed_mode ; int speedMode = jsonGlobal.speed_mode ;
lp->cat = WRITE_CAT_SPEED; lp->cat = WRITE_CAT_SPEED;
lp->val = (void*)&speedMode; lp->val = (void*)&speedMode;
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
m_mainwnd->addTestingRef(); m_mainwnd->addTestingRef();
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
int sleepTime = jsonGlobal.sleep_time; int sleepTime = jsonGlobal.sleep_time;
lp->cat = WRITE_CAT_SLEEP; lp->cat = WRITE_CAT_SLEEP;
lp->val = (void*)&sleepTime; lp->val = (void*)&sleepTime;
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
m_mainwnd->addTestingRef(); m_mainwnd->addTestingRef();
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
delete lp; delete lp;
} }

14
app/HGProductionTool/form_maininterface.cpp
View File

@ -70,7 +70,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
sane_io_control(m_handle, IO_CTRL_CODE_GET_POWER_LEVEL, &sleepTime, &len2); sane_io_control(m_handle, IO_CTRL_CODE_GET_POWER_LEVEL, &sleepTime, &len2);
ui->label_sleepTime->setText(tr(" sleep time:") + getSleepTime(sleepTime)); ui->label_sleepTime->setText(tr(" sleep time:") + getSleepTime(sleepTime));
setVidPid(); getVidPid();
ui->label_imgInfo->setVisible(false); ui->label_imgInfo->setVisible(false);
ui->label_destortionInfo->setVisible(false); ui->label_destortionInfo->setVisible(false);
@ -495,7 +495,7 @@ QString Form_mainInterface::getSleepTime(int sleepTime)
return QString::number(sleepTime / 60) + tr(" minute"); return QString::number(sleepTime / 60) + tr(" minute");
} }
void Form_mainInterface::setVidPid() void Form_mainInterface::getVidPid()
{ {
VIDPID vidpid; VIDPID vidpid;
int vidpid_val; int vidpid_val;
@ -574,11 +574,13 @@ void Form_mainInterface::on_pbtn_start_clicked()
QString title = item->text(); QString title = item->text();
QString name = m_map_title_name.value(title).name; QString name = m_map_title_name.value(title).name;
if (m_hg != nullptr) if (m_hg != nullptr)
func_test_go(name.toStdWString().c_str(), L"null", m_hg); {
updateUiEnabled(false);
m_isTesting = true;
m_mainwnd->addTestingRef();
updateUiEnabled(false); func_test_go(name.toStdWString().c_str(), L"null", m_hg);
m_isTesting = true; }
m_mainwnd->addTestingRef();
} }
} }

2
app/HGProductionTool/form_maininterface.h
View File

@ -83,7 +83,7 @@ private:
void updateImgPixelInfo(); void updateImgPixelInfo();
QString getSpeedMode(SANE_Int speedMode); QString getSpeedMode(SANE_Int speedMode);
QString getSleepTime(int sleepTime); QString getSleepTime(int sleepTime);
void setVidPid(); void getVidPid();
private: private:
union VIDPID union VIDPID

11
app/HGProductionTool/mainwindow.cpp
View File

@ -40,6 +40,8 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
if (m_loginType == Dialog_logIn::LogInType_Burn) if (m_loginType == Dialog_logIn::LogInType_Burn)
{ {
setWindowTitle(tr("production tool-burn station"));
ui->act_newDevice->setVisible(false); ui->act_newDevice->setVisible(false);
ui->act_refreshDevice->setVisible(false); ui->act_refreshDevice->setVisible(false);
@ -83,9 +85,12 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
ui->act_upload->setVisible(false); ui->act_upload->setVisible(false);
} }
HGChar userName[128] = {0}; if (m_loginType == Dialog_logIn::LogInType_InitTest)
HGPdtToolDb_GetUserName(m_pdtToolDbuserMgr, userName, 128); setWindowTitle(tr("production tool-init test station"));
setWindowTitle(userName); else if (m_loginType == Dialog_logIn::LogInType_ImageTest)
setWindowTitle(tr("production tool-image test station"));
if (m_loginType == Dialog_logIn::LogInType_PressureTest)
setWindowTitle(tr("production tool-pressure test station"));
SANE_Int v = 0; SANE_Int v = 0;
sane_init_ex(&v, sane_ex_callback, this); sane_init_ex(&v, sane_ex_callback, this);