diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index 0946b22..d07b265 100644
Binary files a/app/HGProductionTool/ProductionTool_zh_CN.qm and b/app/HGProductionTool/ProductionTool_zh_CN.qm differ
diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index 3e699fd..ad44820 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -390,7 +390,7 @@
ImageTest
- 图像检测工位
+ 图像测试工位
@@ -635,13 +635,13 @@
-
+
tips
提示
-
+
Please check a devices at least
请至少勾选一台设备
@@ -787,7 +787,7 @@
-
+
tips
提示
@@ -807,7 +807,7 @@
speed mode:
- 速度模式：
+ 目标配置： 速度模式：
@@ -870,7 +870,7 @@
PID：
-
+
no image
无图
@@ -941,7 +941,7 @@
刷新设备列表
-
+
Account login elsewhere
账户在其他地方登录
@@ -950,56 +950,76 @@
网络连接断开
-
+
You have been forced offline by the administrator account
你已被管理员账户强制下线
-
+
Data base error
数据库错误
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
tips
提示
-
-
-
+
+ production tool-burn station
+ 华高生产工具-烧录工位
+
+
+
+ production tool-init test station
+ 华高生产工具-初检工位
+
+
+
+ production tool-image test station
+ 华高生产工具-图像测试工位
+
+
+
+ production tool-pressure test station
+ 华高生产工具-压力测试工位
+
+
+
+
+
Is testing, do not close!
测试中，请勿关闭！
-
+
Are you sure to connect the new device
检测到设备连接，是否启动测试？
-
+
yes
确定
-
+
no
取消
-
-
-
+
+
+
cannot create more table
不能创建更多项目
@@ -1008,52 +1028,52 @@
设备已断开连接
-
+
Open device failed
打开设备失败
-
+
save
保存
-
+
xls(*.xls)
xls表格(*.xls)
-
+
export succeed
导出成功
-
+
export failed
导出失败
-
+
Illegal user
非法的用户
-
+
Wrong password
密码错误
-
+
Database error
数据库错误
-
+
connect error
连接错误
-
+
Failed
错误
diff --git a/app/HGProductionTool/form_burnmode.cpp b/app/HGProductionTool/form_burnmode.cpp
index 05148c5..c549540 100644
--- a/app/HGProductionTool/form_burnmode.cpp
+++ b/app/HGProductionTool/form_burnmode.cpp
@@ -246,8 +246,9 @@ QString DeviceManager::getSn()
void DeviceManager::setBurnMode()
{
const wchar_t *p = L"1";
- func_test_go(HGPDTTOOLDB_NAME_REBOOT_DEVICE, p, m_hg);
m_mainwnd->addTestingRef();
+ func_test_go(HGPDTTOOLDB_NAME_REBOOT_DEVICE, p, m_hg);
+
}
void DeviceManager::setSn(QString sn)
@@ -257,8 +258,8 @@ void DeviceManager::setSn(QString sn)
std::wstring sn2 = sn.toStdWString();
p->cat = WRITE_CAT_SERIALNUM;
p->val = (void*)sn2.c_str();
- func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
m_mainwnd->addTestingRef();
+ func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
setGlobalCfg();
@@ -292,20 +293,20 @@ void DeviceManager::setGlobalCfg()
int vidpidValue = vidpid.Value;
lp->cat = WRITE_CAT_VID_PID;
lp->val = (void*)&vidpidValue;
- func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
m_mainwnd->addTestingRef();
+ func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
int speedMode = jsonGlobal.speed_mode ;
lp->cat = WRITE_CAT_SPEED;
lp->val = (void*)&speedMode;
- func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
m_mainwnd->addTestingRef();
+ func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
int sleepTime = jsonGlobal.sleep_time;
lp->cat = WRITE_CAT_SLEEP;
lp->val = (void*)&sleepTime;
- func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
m_mainwnd->addTestingRef();
+ func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
delete lp;
}
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index 94c2545..126b6b2 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -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);
ui->label_sleepTime->setText(tr(" sleep time:") + getSleepTime(sleepTime));
- setVidPid();
+ getVidPid();
ui->label_imgInfo->setVisible(false);
ui->label_destortionInfo->setVisible(false);
@@ -495,7 +495,7 @@ QString Form_mainInterface::getSleepTime(int sleepTime)
return QString::number(sleepTime / 60) + tr(" minute");
}
-void Form_mainInterface::setVidPid()
+void Form_mainInterface::getVidPid()
{
VIDPID vidpid;
int vidpid_val;
@@ -574,11 +574,13 @@ void Form_mainInterface::on_pbtn_start_clicked()
QString title = item->text();
QString name = m_map_title_name.value(title).name;
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);
- m_isTesting = true;
- m_mainwnd->addTestingRef();
+ func_test_go(name.toStdWString().c_str(), L"null", m_hg);
+ }
}
}
diff --git a/app/HGProductionTool/form_maininterface.h b/app/HGProductionTool/form_maininterface.h
index e7f02c1..30f8cf7 100644
--- a/app/HGProductionTool/form_maininterface.h
+++ b/app/HGProductionTool/form_maininterface.h
@@ -83,7 +83,7 @@ private:
void updateImgPixelInfo();
QString getSpeedMode(SANE_Int speedMode);
QString getSleepTime(int sleepTime);
- void setVidPid();
+ void getVidPid();
private:
union VIDPID
diff --git a/app/HGProductionTool/mainwindow.cpp b/app/HGProductionTool/mainwindow.cpp
index f098f31..7915e95 100644
--- a/app/HGProductionTool/mainwindow.cpp
+++ b/app/HGProductionTool/mainwindow.cpp
@@ -40,6 +40,8 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
if (m_loginType == Dialog_logIn::LogInType_Burn)
{
+ setWindowTitle(tr("production tool-burn station"));
+
ui->act_newDevice->setVisible(false);
ui->act_refreshDevice->setVisible(false);
@@ -83,9 +85,12 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
ui->act_upload->setVisible(false);
}
- HGChar userName[128] = {0};
- HGPdtToolDb_GetUserName(m_pdtToolDbuserMgr, userName, 128);
- setWindowTitle(userName);
+ if (m_loginType == Dialog_logIn::LogInType_InitTest)
+ setWindowTitle(tr("production tool-init test station"));
+ 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_init_ex(&v, sane_ex_callback, this);