增加单机模式
This commit is contained in:
parent
b41abffba4
commit
d0771ffed1
Binary file not shown.
|
@ -354,14 +354,28 @@
|
||||||
<translation>登录</translation>
|
<translation>登录</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.cpp" line="116"/>
|
<location filename="dialog_login.cpp" line="122"/>
|
||||||
<source>tips</source>
|
<source>tips</source>
|
||||||
<translation>提示</translation>
|
<translation>提示</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.cpp" line="116"/>
|
<location filename="dialog_login.cpp" line="122"/>
|
||||||
|
<source>Login failed, sure to enter offline mode?</source>
|
||||||
|
<translation>登录失败,是否进入单机测试模式?</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="dialog_login.cpp" line="123"/>
|
||||||
|
<source>yes</source>
|
||||||
|
<translation>确定</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="dialog_login.cpp" line="124"/>
|
||||||
|
<source>no</source>
|
||||||
|
<translation>取消</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
<source>Login failed: </source>
|
<source>Login failed: </source>
|
||||||
<translation>登录失败: </translation>
|
<translation type="vanished">登录失败: </translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
@ -455,36 +469,40 @@
|
||||||
<translation>上传</translation>
|
<translation>上传</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="29"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="30"/>
|
||||||
<source>Browse directory</source>
|
<source>Browse directory</source>
|
||||||
<translation>打开文件</translation>
|
<translation>打开文件</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="29"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="30"/>
|
||||||
<source>config(*json)</source>
|
<source>config(*json)</source>
|
||||||
<translation>配置文件(*json)</translation>
|
<translation>配置文件(*json)</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="41"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="42"/>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="50"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="61"/>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="55"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="66"/>
|
||||||
<source>tips</source>
|
<source>tips</source>
|
||||||
<translation>提示</translation>
|
<translation>提示</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="41"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="42"/>
|
||||||
<source>empty filename</source>
|
<source>empty filename</source>
|
||||||
<translation>文件为空</translation>
|
<translation>文件为空</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="50"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="61"/>
|
||||||
<source>upload succeed</source>
|
<source>upload succeed</source>
|
||||||
<translation>上传成功</translation>
|
<translation>上传成功</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_uploadcfgfile.cpp" line="55"/>
|
<location filename="dialog_uploadcfgfile.cpp" line="66"/>
|
||||||
|
<source>upload to service failed, already save to local host</source>
|
||||||
|
<translation>上传至服务器失败,已保存至本地</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
<source>upload failed: </source>
|
<source>upload failed: </source>
|
||||||
<translation>上传失败: </translation>
|
<translation type="vanished">上传失败: </translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
@ -550,95 +568,94 @@
|
||||||
<translation>下一步</translation>
|
<translation>下一步</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="89"/>
|
<location filename="form_maininterface.cpp" line="90"/>
|
||||||
<location filename="form_maininterface.cpp" line="158"/>
|
|
||||||
<source>Device has connected</source>
|
<source>Device has connected</source>
|
||||||
<translation>设备已连接</translation>
|
<translation>设备已连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="91"/>
|
<location filename="form_maininterface.cpp" line="92"/>
|
||||||
<source>Device hasnot connected</source>
|
<source>Device hasnot connected</source>
|
||||||
<translation>设备未连接</translation>
|
<translation>设备未连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="92"/>
|
<location filename="form_maininterface.cpp" line="93"/>
|
||||||
<source>Device type:</source>
|
<source>Device type:</source>
|
||||||
<translation>设备型号:</translation>
|
<translation>设备型号:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="92"/>
|
<location filename="form_maininterface.cpp" line="93"/>
|
||||||
<source> SerialNum:</source>
|
<source> SerialNum:</source>
|
||||||
<translation> 序列号:</translation>
|
<translation> 序列号:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="93"/>
|
<location filename="form_maininterface.cpp" line="94"/>
|
||||||
<location filename="form_maininterface.cpp" line="161"/>
|
<location filename="form_maininterface.cpp" line="158"/>
|
||||||
<source> connect status:</source>
|
<source> connect status:</source>
|
||||||
<translation> 设备连接状态:</translation>
|
<translation> 设备连接状态:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="102"/>
|
<location filename="form_maininterface.cpp" line="103"/>
|
||||||
<source>load last image which uploaded last time</source>
|
<source>load last image which uploaded last time</source>
|
||||||
<translation>加载上一次上传的图片</translation>
|
<translation>加载上一次上传的图片</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="160"/>
|
<location filename="form_maininterface.cpp" line="157"/>
|
||||||
<source>Device has disconnected</source>
|
<source>Device has disconnected</source>
|
||||||
<translation>设备已断开</translation>
|
<translation>设备已断开</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="175"/>
|
<location filename="form_maininterface.cpp" line="173"/>
|
||||||
<location filename="form_maininterface.cpp" line="589"/>
|
<location filename="form_maininterface.cpp" line="597"/>
|
||||||
<source>tips</source>
|
<source>tips</source>
|
||||||
<translation>提示</translation>
|
<translation>提示</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="197"/>
|
<location filename="form_maininterface.cpp" line="200"/>
|
||||||
<source>yes</source>
|
<source>yes</source>
|
||||||
<translation>确定</translation>
|
<translation>确定</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="198"/>
|
<location filename="form_maininterface.cpp" line="201"/>
|
||||||
<source>no</source>
|
<source>no</source>
|
||||||
<translation>取消</translation>
|
<translation>取消</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="311"/>
|
<location filename="form_maininterface.cpp" line="319"/>
|
||||||
<source>ID</source>
|
<source>ID</source>
|
||||||
<translation>序号</translation>
|
<translation>序号</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="311"/>
|
<location filename="form_maininterface.cpp" line="319"/>
|
||||||
<source>Test items</source>
|
<source>Test items</source>
|
||||||
<translation>测试项</translation>
|
<translation>测试项</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="311"/>
|
<location filename="form_maininterface.cpp" line="319"/>
|
||||||
<source>status</source>
|
<source>status</source>
|
||||||
<translation>测试状态</translation>
|
<translation>测试状态</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="461"/>
|
<location filename="form_maininterface.cpp" line="467"/>
|
||||||
<source>not test</source>
|
<source>not test</source>
|
||||||
<translation>未测试</translation>
|
<translation>未测试</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="461"/>
|
<location filename="form_maininterface.cpp" line="467"/>
|
||||||
<source>not pass</source>
|
<source>not pass</source>
|
||||||
<translation>不通过</translation>
|
<translation>不通过</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="461"/>
|
<location filename="form_maininterface.cpp" line="467"/>
|
||||||
<source>not support</source>
|
<source>not support</source>
|
||||||
<translation>不支持</translation>
|
<translation>不支持</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="461"/>
|
<location filename="form_maininterface.cpp" line="467"/>
|
||||||
<source>pass</source>
|
<source>pass</source>
|
||||||
<translation>通过</translation>
|
<translation>通过</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="589"/>
|
<location filename="form_maininterface.cpp" line="597"/>
|
||||||
<source>no image</source>
|
<source>no image</source>
|
||||||
<translation>无图</translation>
|
<translation>无图</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -704,7 +721,7 @@
|
||||||
<translation>上传配置文件</translation>
|
<translation>上传配置文件</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="431"/>
|
<location filename="mainwindow.cpp" line="427"/>
|
||||||
<source>Account login elsewhere</source>
|
<source>Account login elsewhere</source>
|
||||||
<translation>账户在其他地方登录</translation>
|
<translation>账户在其他地方登录</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -713,54 +730,54 @@
|
||||||
<translation type="vanished">网络连接断开</translation>
|
<translation type="vanished">网络连接断开</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="434"/>
|
<location filename="mainwindow.cpp" line="430"/>
|
||||||
<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="437"/>
|
<location filename="mainwindow.cpp" line="433"/>
|
||||||
<source>Data base error</source>
|
<source>Data base error</source>
|
||||||
<translation>数据库错误</translation>
|
<translation>数据库错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="272"/>
|
<location filename="mainwindow.cpp" line="272"/>
|
||||||
<location filename="mainwindow.cpp" line="374"/>
|
<location filename="mainwindow.cpp" line="367"/>
|
||||||
<location filename="mainwindow.cpp" line="396"/>
|
<location filename="mainwindow.cpp" line="389"/>
|
||||||
<location filename="mainwindow.cpp" line="407"/>
|
<location filename="mainwindow.cpp" line="400"/>
|
||||||
<location filename="mainwindow.cpp" line="447"/>
|
<location filename="mainwindow.cpp" line="443"/>
|
||||||
<location filename="mainwindow.cpp" line="465"/>
|
<location filename="mainwindow.cpp" line="461"/>
|
||||||
|
<location filename="mainwindow.cpp" line="486"/>
|
||||||
<location filename="mainwindow.cpp" line="490"/>
|
<location filename="mainwindow.cpp" line="490"/>
|
||||||
<location filename="mainwindow.cpp" line="494"/>
|
<location filename="mainwindow.cpp" line="499"/>
|
||||||
<location filename="mainwindow.cpp" line="503"/>
|
<location filename="mainwindow.cpp" line="511"/>
|
||||||
<location filename="mainwindow.cpp" line="515"/>
|
|
||||||
<source>tips</source>
|
<source>tips</source>
|
||||||
<translation>提示</translation>
|
<translation>提示</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="272"/>
|
<location filename="mainwindow.cpp" line="272"/>
|
||||||
<location filename="mainwindow.cpp" line="503"/>
|
<location filename="mainwindow.cpp" line="499"/>
|
||||||
<location filename="mainwindow.cpp" line="515"/>
|
<location filename="mainwindow.cpp" line="511"/>
|
||||||
<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="375"/>
|
<location filename="mainwindow.cpp" line="368"/>
|
||||||
<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="377"/>
|
<location filename="mainwindow.cpp" line="370"/>
|
||||||
<source>yes</source>
|
<source>yes</source>
|
||||||
<translation>确定</translation>
|
<translation>确定</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="378"/>
|
<location filename="mainwindow.cpp" line="371"/>
|
||||||
<source>no</source>
|
<source>no</source>
|
||||||
<translation>取消</translation>
|
<translation>取消</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="396"/>
|
<location filename="mainwindow.cpp" line="389"/>
|
||||||
<location filename="mainwindow.cpp" line="465"/>
|
<location filename="mainwindow.cpp" line="461"/>
|
||||||
<source>cannot create more table</source>
|
<source>cannot create more table</source>
|
||||||
<translation>不能创建更多项目</translation>
|
<translation>不能创建更多项目</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -769,52 +786,52 @@
|
||||||
<translation type="vanished">设备已断开连接</translation>
|
<translation type="vanished">设备已断开连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="407"/>
|
<location filename="mainwindow.cpp" line="400"/>
|
||||||
<source>Open device failed</source>
|
<source>Open device failed</source>
|
||||||
<translation>打开设备失败</translation>
|
<translation>打开设备失败</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="485"/>
|
<location filename="mainwindow.cpp" line="481"/>
|
||||||
<source>save</source>
|
<source>save</source>
|
||||||
<translation>保存</translation>
|
<translation>保存</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="485"/>
|
<location filename="mainwindow.cpp" line="481"/>
|
||||||
<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="490"/>
|
<location filename="mainwindow.cpp" line="486"/>
|
||||||
<source>export succeed</source>
|
<source>export succeed</source>
|
||||||
<translation>导出成功</translation>
|
<translation>导出成功</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="494"/>
|
<location filename="mainwindow.cpp" line="490"/>
|
||||||
<source>export failed</source>
|
<source>export failed</source>
|
||||||
<translation>导出失败</translation>
|
<translation>导出失败</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="527"/>
|
<location filename="mainwindow.cpp" line="523"/>
|
||||||
<source>Illegal user</source>
|
<source>Illegal user</source>
|
||||||
<translation>非法的用户</translation>
|
<translation>非法的用户</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="531"/>
|
<location filename="mainwindow.cpp" line="527"/>
|
||||||
<source>Wrong password</source>
|
<source>Wrong password</source>
|
||||||
<translation>密码错误</translation>
|
<translation>密码错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="535"/>
|
<location filename="mainwindow.cpp" line="531"/>
|
||||||
<source>Database error</source>
|
<source>Database error</source>
|
||||||
<translation>数据库错误</translation>
|
<translation>数据库错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="539"/>
|
<location filename="mainwindow.cpp" line="535"/>
|
||||||
<source>connect error</source>
|
<source>connect error</source>
|
||||||
<translation>连接错误</translation>
|
<translation>连接错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="543"/>
|
<location filename="mainwindow.cpp" line="539"/>
|
||||||
<source>Failed</source>
|
<source>Failed</source>
|
||||||
<translation>错误</translation>
|
<translation>错误</translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -110,7 +110,7 @@ void Dialog_logIn::on_pbtn_login_clicked()
|
||||||
saveCfgValue("login", "ftpPort", ftpPort);
|
saveCfgValue("login", "ftpPort", ftpPort);
|
||||||
|
|
||||||
HGPdtToolDbUserMgr pdtToolDbuserMgr = nullptr;
|
HGPdtToolDbUserMgr pdtToolDbuserMgr = nullptr;
|
||||||
HGResult ret = HGPdtToolDb_CreateUserMgr(dbHost.toStdString().c_str(), dbPort.toInt(), account.toStdString().c_str(), password.toStdString().c_str(),
|
HGPdtToolDb_CreateUserMgr(dbHost.toStdString().c_str(), dbPort.toInt(), account.toStdString().c_str(), password.toStdString().c_str(),
|
||||||
&pdtToolDbuserMgr);
|
&pdtToolDbuserMgr);
|
||||||
if (NULL != pdtToolDbuserMgr)
|
if (NULL != pdtToolDbuserMgr)
|
||||||
{
|
{
|
||||||
|
@ -119,8 +119,19 @@ void Dialog_logIn::on_pbtn_login_clicked()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, tr("tips"), tr("Login failed: ") + MainWindow::getLogInfo(ret));
|
QMessageBox msg(QMessageBox::Question, tr("tips"), tr("Login failed, sure to enter offline mode?"), QMessageBox::Yes | QMessageBox::No, this);
|
||||||
return;
|
msg.setButtonText(QMessageBox::Yes, tr("yes"));
|
||||||
|
msg.setButtonText(QMessageBox::No, tr("no"));
|
||||||
|
msg.exec();
|
||||||
|
if (msg.clickedButton() == msg.button(QMessageBox::Yes))
|
||||||
|
{
|
||||||
|
m_pdtToolDbuserMgr = nullptr;
|
||||||
|
accept();;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "HGUIGlobal.h"
|
#include "HGUIGlobal.h"
|
||||||
|
#include "base/HGBase.h"
|
||||||
|
|
||||||
Dialog_uploadCfgFile::Dialog_uploadCfgFile(HGPdtToolDbUserMgr pdtToolDbuserMgr, QWidget *parent) :
|
Dialog_uploadCfgFile::Dialog_uploadCfgFile(HGPdtToolDbUserMgr pdtToolDbuserMgr, QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
|
@ -44,6 +45,16 @@ void Dialog_uploadCfgFile::on_pbtn_upload_clicked()
|
||||||
|
|
||||||
QString tag = ui->comboBox_tag->currentText();
|
QString tag = ui->comboBox_tag->currentText();
|
||||||
QString filename = ui->lineEdit_filename->text();
|
QString filename = ui->lineEdit_filename->text();
|
||||||
|
|
||||||
|
HGChar cfgPath[512] = {0};
|
||||||
|
HGBase_GetConfigPath(cfgPath, 512);
|
||||||
|
HGBase_CreateDir(cfgPath);
|
||||||
|
strcat(cfgPath, tag.toStdString().c_str());
|
||||||
|
strcat(cfgPath, ".json");
|
||||||
|
|
||||||
|
QFile file(filename);
|
||||||
|
file.copy(filename, cfgPath);
|
||||||
|
|
||||||
HGResult ret = HGPdtToolDb_UploadFile(m_pdtToolDbuserMgr, tag.toStdString().c_str(), getStdString(filename).c_str());
|
HGResult ret = HGPdtToolDb_UploadFile(m_pdtToolDbuserMgr, tag.toStdString().c_str(), getStdString(filename).c_str());
|
||||||
if(ret == HGBASE_ERR_OK)
|
if(ret == HGBASE_ERR_OK)
|
||||||
{
|
{
|
||||||
|
@ -52,7 +63,7 @@ void Dialog_uploadCfgFile::on_pbtn_upload_clicked()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, tr("tips"), tr("upload failed: ") + MainWindow::getLogInfo(ret));
|
QMessageBox::information(this, tr("tips"), tr("upload to service failed, already save to local host"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -342,80 +342,78 @@ void Form_mainInterface::initTableWidgetUi()
|
||||||
strcat(cfgPath, m_devType.toStdString().c_str());
|
strcat(cfgPath, m_devType.toStdString().c_str());
|
||||||
strcat(cfgPath, ".json");
|
strcat(cfgPath, ".json");
|
||||||
|
|
||||||
HGResult ret = HGPdtToolDb_DownloadFile(m_pdtToolDbuserMgr, m_devType.toStdString().c_str(), cfgPath);
|
HGPdtToolDb_DownloadFile(m_pdtToolDbuserMgr, m_devType.toStdString().c_str(), cfgPath);
|
||||||
if(ret == HGBASE_ERR_OK)
|
|
||||||
|
AnalysisJson analysisJson(QString::fromStdString(cfgPath));
|
||||||
|
|
||||||
|
setGlobalCfg(analysisJson);
|
||||||
|
|
||||||
|
std::map<HGUInt, bool> dbEntryItems;
|
||||||
|
for (int i = HGPDTTOOLDB_ENTRYNAME_DIAL_SWITCH; i <= HGPDTTOOLDB_ENTRYNAME_SCANNING_SENSOR; ++i)
|
||||||
|
dbEntryItems[i] = false;
|
||||||
|
for (int i = HGPDTTOOLDB_ENTRYNAME_CONFIGURE_SPEED_MODE; i <= HGPDTTOOLDB_ENTRYNAME_MECH_PAPER_FEEDING_INCLINATION; ++i)
|
||||||
|
dbEntryItems[i] = false;
|
||||||
|
for (int i = HGPDTTOOLDB_ENTRYNAME_SINGLE_PAGE_TEST_1; i <= HGPDTTOOLDB_ENTRYNAME_CLEAR_ROLLER_COUNT; ++i)
|
||||||
|
dbEntryItems[i] = false;
|
||||||
|
|
||||||
|
std::vector<AnalysisJson::json_node> list_jsonNode = analysisJson.GetNode();
|
||||||
|
int count = list_jsonNode.size();
|
||||||
|
ui->tableWidget->setRowCount(count);
|
||||||
|
for(int i = 0; i < count; ++i)
|
||||||
{
|
{
|
||||||
AnalysisJson analysisJson(QString::fromStdString(cfgPath));
|
AnalysisJson::json_node node = list_jsonNode[i];
|
||||||
|
m_map_title_name.insert(node.title, node);
|
||||||
|
|
||||||
setGlobalCfg(analysisJson);
|
ui->tableWidget->setItem(i, 0, new QTableWidgetItem(QString::number(i+1)));
|
||||||
|
ui->tableWidget->item(i, 0)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
||||||
|
|
||||||
std::map<HGUInt, bool> dbEntryItems;
|
ui->tableWidget->setItem(i, 1, new QTableWidgetItem(node.title));
|
||||||
for (int i = HGPDTTOOLDB_ENTRYNAME_DIAL_SWITCH; i <= HGPDTTOOLDB_ENTRYNAME_SCANNING_SENSOR; ++i)
|
ui->tableWidget->item(i, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
||||||
dbEntryItems[i] = false;
|
|
||||||
for (int i = HGPDTTOOLDB_ENTRYNAME_CONFIGURE_SPEED_MODE; i <= HGPDTTOOLDB_ENTRYNAME_MECH_PAPER_FEEDING_INCLINATION; ++i)
|
|
||||||
dbEntryItems[i] = false;
|
|
||||||
for (int i = HGPDTTOOLDB_ENTRYNAME_SINGLE_PAGE_TEST_1; i <= HGPDTTOOLDB_ENTRYNAME_CLEAR_ROLLER_COUNT; ++i)
|
|
||||||
dbEntryItems[i] = false;
|
|
||||||
|
|
||||||
std::vector<AnalysisJson::json_node> list_jsonNode = analysisJson.GetNode();
|
HGUInt status = getTestItemStatus(node.title);
|
||||||
int count = list_jsonNode.size();
|
QString statusStr = getItemStatusStr(status);
|
||||||
ui->tableWidget->setRowCount(count);
|
ui->tableWidget->setItem(i, 2, new QTableWidgetItem(statusStr));
|
||||||
for(int i = 0; i < count; ++i)
|
ui->tableWidget->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
||||||
|
if (HGPDTTOOLDB_ENTRYSTATUS_NOTPASS == status)
|
||||||
{
|
{
|
||||||
AnalysisJson::json_node node = list_jsonNode[i];
|
ui->tableWidget->item(i, 2)->setBackgroundColor(QColor(255,0,0));
|
||||||
m_map_title_name.insert(node.title, node);
|
}
|
||||||
|
else if (HGPDTTOOLDB_ENTRYSTATUS_NOTSUPP == status)
|
||||||
ui->tableWidget->setItem(i, 0, new QTableWidgetItem(QString::number(i+1)));
|
{
|
||||||
ui->tableWidget->item(i, 0)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
ui->tableWidget->item(i, 2)->setBackgroundColor(QColor(255,255,0));
|
||||||
|
}
|
||||||
ui->tableWidget->setItem(i, 1, new QTableWidgetItem(node.title));
|
else if (HGPDTTOOLDB_ENTRYSTATUS_PASS == status)
|
||||||
ui->tableWidget->item(i, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
{
|
||||||
|
ui->tableWidget->item(i, 2)->setBackgroundColor(QColor(0,255,0));
|
||||||
HGUInt status = getTestItemStatus(node.title);
|
|
||||||
QString statusStr = getItemStatusStr(status);
|
|
||||||
ui->tableWidget->setItem(i, 2, new QTableWidgetItem(statusStr));
|
|
||||||
ui->tableWidget->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
|
|
||||||
if (HGPDTTOOLDB_ENTRYSTATUS_NOTPASS == status)
|
|
||||||
{
|
|
||||||
ui->tableWidget->item(i, 2)->setBackgroundColor(QColor(255,0,0));
|
|
||||||
}
|
|
||||||
else if (HGPDTTOOLDB_ENTRYSTATUS_NOTSUPP == status)
|
|
||||||
{
|
|
||||||
ui->tableWidget->item(i, 2)->setBackgroundColor(QColor(255,255,0));
|
|
||||||
}
|
|
||||||
else if (HGPDTTOOLDB_ENTRYSTATUS_PASS == status)
|
|
||||||
{
|
|
||||||
ui->tableWidget->item(i, 2)->setBackgroundColor(QColor(0,255,0));
|
|
||||||
}
|
|
||||||
|
|
||||||
HGUInt entry = getTestItem(node.title);
|
|
||||||
std::map<HGUInt, bool>::iterator iter;
|
|
||||||
for (iter = dbEntryItems.begin(); iter != dbEntryItems.end(); ++iter)
|
|
||||||
{
|
|
||||||
if (entry == iter->first)
|
|
||||||
{
|
|
||||||
iter->second = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
HGChar desc[512] = {0};
|
|
||||||
HGPdtToolDb_GetDeviceEntryExcepDesc(m_pdtToolDbDevice, getTestItem(node.title), desc, 512);
|
|
||||||
QTableWidgetItem *item = ui->tableWidget->item(i, 2);
|
|
||||||
item->setToolTip(desc);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HGUInt entry = getTestItem(node.title);
|
||||||
std::map<HGUInt, bool>::iterator iter;
|
std::map<HGUInt, bool>::iterator iter;
|
||||||
for (iter = dbEntryItems.begin(); iter != dbEntryItems.end(); ++iter)
|
for (iter = dbEntryItems.begin(); iter != dbEntryItems.end(); ++iter)
|
||||||
{
|
{
|
||||||
if (!iter->second)
|
if (entry == iter->first)
|
||||||
{
|
{
|
||||||
HGPdtToolDb_SetDeviceEntryStatus(m_pdtToolDbDevice, iter->first, HGPDTTOOLDB_ENTRYSTATUS_NOTSUPP);
|
iter->second = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->tableWidget->selectRow(0);
|
HGChar desc[512] = {0};
|
||||||
|
HGPdtToolDb_GetDeviceEntryExcepDesc(m_pdtToolDbDevice, getTestItem(node.title), desc, 512);
|
||||||
|
QTableWidgetItem *item = ui->tableWidget->item(i, 2);
|
||||||
|
item->setToolTip(desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::map<HGUInt, bool>::iterator iter;
|
||||||
|
for (iter = dbEntryItems.begin(); iter != dbEntryItems.end(); ++iter)
|
||||||
|
{
|
||||||
|
if (!iter->second)
|
||||||
|
{
|
||||||
|
HGPdtToolDb_SetDeviceEntryStatus(m_pdtToolDbDevice, iter->first, HGPDTTOOLDB_ENTRYSTATUS_NOTSUPP);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ui->tableWidget->selectRow(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
HGUInt Form_mainInterface::getTestItem(const QString &title)
|
HGUInt Form_mainInterface::getTestItem(const QString &title)
|
||||||
|
|
|
@ -61,7 +61,7 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, const QString &ftpHo
|
||||||
ui->act_upload->setVisible(false);
|
ui->act_upload->setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
HGChar userName[128];
|
HGChar userName[128] = {0};
|
||||||
HGPdtToolDb_GetUserName(m_pdtToolDbuserMgr, userName, 128);
|
HGPdtToolDb_GetUserName(m_pdtToolDbuserMgr, userName, 128);
|
||||||
setWindowTitle(userName);
|
setWindowTitle(userName);
|
||||||
|
|
||||||
|
@ -418,7 +418,7 @@ void MainWindow::on_sane_dev_remove(QString devName)
|
||||||
void MainWindow::on_update_userStatus()
|
void MainWindow::on_update_userStatus()
|
||||||
{
|
{
|
||||||
QString tips;
|
QString tips;
|
||||||
HGUInt userStatus;
|
HGUInt userStatus = 0;
|
||||||
HGPdtToolDb_GetUserStatus(m_pdtToolDbuserMgr, &userStatus);
|
HGPdtToolDb_GetUserStatus(m_pdtToolDbuserMgr, &userStatus);
|
||||||
|
|
||||||
switch (userStatus)
|
switch (userStatus)
|
||||||
|
|
Loading…
Reference in New Issue