调整登录界面,测试流程
This commit is contained in:
parent
57d21beb27
commit
f6776c4df8
|
@ -52,6 +52,7 @@ INCLUDEPATH += $$PWD/../../db/HGPdtToolDb/
|
||||||
INCLUDEPATH += $$PWD/../../code/base/
|
INCLUDEPATH += $$PWD/../../code/base/
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
|
../../../code_app/utility/HGString.cpp \
|
||||||
HGImgView.cpp \
|
HGImgView.cpp \
|
||||||
HGUIGlobal.cpp \
|
HGUIGlobal.cpp \
|
||||||
analysisjson.cpp \
|
analysisjson.cpp \
|
||||||
|
@ -69,6 +70,7 @@ SOURCES += \
|
||||||
ui_helper.cpp
|
ui_helper.cpp
|
||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
|
../../../code_app/utility/HGString.h \
|
||||||
HGImgView.h \
|
HGImgView.h \
|
||||||
HGUIGlobal.h \
|
HGUIGlobal.h \
|
||||||
analysisjson.h \
|
analysisjson.h \
|
||||||
|
|
Binary file not shown.
|
@ -215,32 +215,50 @@
|
||||||
<translation></translation>
|
<translation></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.ui" line="172"/>
|
<location filename="dialog_login.ui" line="227"/>
|
||||||
<source>account:</source>
|
<source>account:</source>
|
||||||
<translation>账户:</translation>
|
<translation>账户:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.ui" line="212"/>
|
<location filename="dialog_login.ui" line="267"/>
|
||||||
<source>password:</source>
|
<source>password:</source>
|
||||||
<translation>密码:</translation>
|
<translation>密码:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.ui" line="252"/>
|
<location filename="dialog_login.ui" line="307"/>
|
||||||
|
<source>dbHost:</source>
|
||||||
|
<translation>数据库地址:</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="dialog_login.ui" line="347"/>
|
||||||
|
<source>dbPort:</source>
|
||||||
|
<translation>数据库端口:</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="dialog_login.ui" line="387"/>
|
||||||
|
<source>ftpHost:</source>
|
||||||
|
<translation>FTP地址:</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="dialog_login.ui" line="427"/>
|
||||||
|
<source>ftpPort:</source>
|
||||||
|
<translation>FTP端口:</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
<source>host:</source>
|
<source>host:</source>
|
||||||
<translation>IP地址:</translation>
|
<translation type="vanished">IP地址:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.ui" line="292"/>
|
|
||||||
<source>port:</source>
|
<source>port:</source>
|
||||||
<translation>端口号:</translation>
|
<translation type="vanished">端口号:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.ui" line="332"/>
|
<location filename="dialog_login.ui" line="170"/>
|
||||||
<source>LOG IN</source>
|
<source>LOG IN</source>
|
||||||
<translation>登录</translation>
|
<translation>登录</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.ui" line="342"/>
|
<location filename="dialog_login.ui" line="180"/>
|
||||||
<source>EXIT</source>
|
<source>EXIT</source>
|
||||||
<translation>退出</translation>
|
<translation>退出</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -265,12 +283,12 @@
|
||||||
<translation>登录</translation>
|
<translation>登录</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.cpp" line="87"/>
|
<location filename="dialog_login.cpp" line="92"/>
|
||||||
<source>tips</source>
|
<source>tips</source>
|
||||||
<translation>提示</translation>
|
<translation>提示</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="dialog_login.cpp" line="87"/>
|
<location filename="dialog_login.cpp" line="92"/>
|
||||||
<source>Login failed: </source>
|
<source>Login failed: </source>
|
||||||
<translation>登录失败: </translation>
|
<translation>登录失败: </translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -427,6 +445,11 @@
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.ui" line="101"/>
|
<location filename="form_maininterface.ui" line="101"/>
|
||||||
|
<source>START</source>
|
||||||
|
<translation>开始测试</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="form_maininterface.ui" line="108"/>
|
||||||
<source>STOP</source>
|
<source>STOP</source>
|
||||||
<translation>结束测试</translation>
|
<translation>结束测试</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -436,62 +459,62 @@
|
||||||
<translation>下一步</translation>
|
<translation>下一步</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="75"/>
|
<location filename="form_maininterface.cpp" line="76"/>
|
||||||
<source>Device has connected</source>
|
<source>Device has connected</source>
|
||||||
<translation>设备已连接</translation>
|
<translation>设备已连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="77"/>
|
<location filename="form_maininterface.cpp" line="78"/>
|
||||||
<source>Device hasnot connected</source>
|
<source>Device hasnot connected</source>
|
||||||
<translation>设备未连接</translation>
|
<translation>设备未连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="78"/>
|
<location filename="form_maininterface.cpp" line="79"/>
|
||||||
<source>Device type:</source>
|
<source>Device type:</source>
|
||||||
<translation>设备型号:</translation>
|
<translation>设备型号:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="78"/>
|
<location filename="form_maininterface.cpp" line="79"/>
|
||||||
<source> SerialNum:</source>
|
<source> SerialNum:</source>
|
||||||
<translation> 序列号:</translation>
|
<translation> 序列号:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="78"/>
|
<location filename="form_maininterface.cpp" line="79"/>
|
||||||
<source> connect status:</source>
|
<source> connect status:</source>
|
||||||
<translation> 设备连接状态:</translation>
|
<translation> 设备连接状态:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="180"/>
|
<location filename="form_maininterface.cpp" line="181"/>
|
||||||
<source>ID</source>
|
<source>ID</source>
|
||||||
<translation>序号</translation>
|
<translation>序号</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="180"/>
|
<location filename="form_maininterface.cpp" line="181"/>
|
||||||
<source>Test items</source>
|
<source>Test items</source>
|
||||||
<translation>测试项</translation>
|
<translation>测试项</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="180"/>
|
<location filename="form_maininterface.cpp" line="181"/>
|
||||||
<source>status</source>
|
<source>status</source>
|
||||||
<translation>测试状态</translation>
|
<translation>测试状态</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="323"/>
|
<location filename="form_maininterface.cpp" line="324"/>
|
||||||
<source>not test</source>
|
<source>not test</source>
|
||||||
<translation>未测试</translation>
|
<translation>未测试</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="323"/>
|
<location filename="form_maininterface.cpp" line="324"/>
|
||||||
<source>not pass</source>
|
<source>not pass</source>
|
||||||
<translation>不通过</translation>
|
<translation>不通过</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="323"/>
|
<location filename="form_maininterface.cpp" line="324"/>
|
||||||
<source>not support</source>
|
<source>not support</source>
|
||||||
<translation>不支持</translation>
|
<translation>不支持</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="323"/>
|
<location filename="form_maininterface.cpp" line="324"/>
|
||||||
<source>pass</source>
|
<source>pass</source>
|
||||||
<translation>通过</translation>
|
<translation>通过</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -576,34 +599,34 @@
|
||||||
<translation>数据库错误</translation>
|
<translation>数据库错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="279"/>
|
<location filename="mainwindow.cpp" line="276"/>
|
||||||
<location filename="mainwindow.cpp" line="300"/>
|
<location filename="mainwindow.cpp" line="300"/>
|
||||||
<location filename="mainwindow.cpp" line="316"/>
|
<location filename="mainwindow.cpp" line="316"/>
|
||||||
<location filename="mainwindow.cpp" line="344"/>
|
<location filename="mainwindow.cpp" line="344"/>
|
||||||
<location filename="mainwindow.cpp" line="362"/>
|
<location filename="mainwindow.cpp" line="361"/>
|
||||||
<location filename="mainwindow.cpp" line="387"/>
|
<location filename="mainwindow.cpp" line="386"/>
|
||||||
<location filename="mainwindow.cpp" line="391"/>
|
<location filename="mainwindow.cpp" line="390"/>
|
||||||
<source>tips</source>
|
<source>tips</source>
|
||||||
<translation>提示</translation>
|
<translation>提示</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="280"/>
|
<location filename="mainwindow.cpp" line="277"/>
|
||||||
<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="282"/>
|
<location filename="mainwindow.cpp" line="279"/>
|
||||||
<source>yes</source>
|
<source>yes</source>
|
||||||
<translation>确定</translation>
|
<translation>确定</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="283"/>
|
<location filename="mainwindow.cpp" line="280"/>
|
||||||
<source>no</source>
|
<source>no</source>
|
||||||
<translation>取消</translation>
|
<translation>取消</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="300"/>
|
<location filename="mainwindow.cpp" line="300"/>
|
||||||
<location filename="mainwindow.cpp" line="362"/>
|
<location filename="mainwindow.cpp" line="361"/>
|
||||||
<source>cannot create more table</source>
|
<source>cannot create more table</source>
|
||||||
<translation>不能创建更多项目</translation>
|
<translation>不能创建更多项目</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -613,47 +636,47 @@
|
||||||
<translation>设备已断开连接</translation>
|
<translation>设备已断开连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="382"/>
|
<location filename="mainwindow.cpp" line="381"/>
|
||||||
<source>save</source>
|
<source>save</source>
|
||||||
<translation>保存</translation>
|
<translation>保存</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="382"/>
|
<location filename="mainwindow.cpp" line="381"/>
|
||||||
<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="387"/>
|
<location filename="mainwindow.cpp" line="386"/>
|
||||||
<source>export succeed</source>
|
<source>export succeed</source>
|
||||||
<translation>导出成功</translation>
|
<translation>导出成功</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="391"/>
|
<location filename="mainwindow.cpp" line="390"/>
|
||||||
<source>export failed</source>
|
<source>export failed</source>
|
||||||
<translation>导出失败</translation>
|
<translation>导出失败</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="413"/>
|
<location filename="mainwindow.cpp" line="412"/>
|
||||||
<source>Illegal user</source>
|
<source>Illegal user</source>
|
||||||
<translation>非法的用户</translation>
|
<translation>非法的用户</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="417"/>
|
<location filename="mainwindow.cpp" line="416"/>
|
||||||
<source>Wrong password</source>
|
<source>Wrong password</source>
|
||||||
<translation>密码错误</translation>
|
<translation>密码错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="421"/>
|
<location filename="mainwindow.cpp" line="420"/>
|
||||||
<source>Database error</source>
|
<source>Database error</source>
|
||||||
<translation>数据库错误</translation>
|
<translation>数据库错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="425"/>
|
<location filename="mainwindow.cpp" line="424"/>
|
||||||
<source>connect error</source>
|
<source>connect error</source>
|
||||||
<translation>连接错误</translation>
|
<translation>连接错误</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="mainwindow.cpp" line="429"/>
|
<location filename="mainwindow.cpp" line="428"/>
|
||||||
<source>Failed</source>
|
<source>Failed</source>
|
||||||
<translation>错误</translation>
|
<translation>错误</translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -2,6 +2,10 @@
|
||||||
#include "ui_dialog_login.h"
|
#include "ui_dialog_login.h"
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
#include "base/HGUtility.h"
|
||||||
|
#include "base/HGIni.h"
|
||||||
|
#include "HGUIGlobal.h"
|
||||||
|
#include "HGString.h"
|
||||||
|
|
||||||
Dialog_logIn::Dialog_logIn(QWidget *parent) :
|
Dialog_logIn::Dialog_logIn(QWidget *parent) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
|
@ -18,17 +22,24 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
|
||||||
|
|
||||||
ui->label_title->setText(tr("LogIn"));
|
ui->label_title->setText(tr("LogIn"));
|
||||||
|
|
||||||
ui->lineEdit_account->setText("root");
|
QString account("root");
|
||||||
ui->lineEdit_password->setText("123456");
|
ui->lineEdit_account->setText(getCfgValue("login", "account", account));
|
||||||
|
// ui->lineEdit_password->setText("123456");
|
||||||
ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
|
ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
|
||||||
ui->lineEdit_host->setText("192.168.1.70");
|
ui->lineEdit_dbHost->setText("192.168.1.70");
|
||||||
ui->lineEdit_port->setText("3306");
|
ui->lineEdit_dbPort->setText("3306");
|
||||||
|
ui->lineEdit_ftpHost->setText("192.168.1.70");
|
||||||
|
ui->lineEdit_ftpPort->setText("3306");
|
||||||
|
|
||||||
ui->label_host->setVisible(false);
|
ui->label_dbHost->setVisible(false);
|
||||||
ui->label_port->setVisible(false);
|
ui->label_dbPort->setVisible(false);
|
||||||
ui->lineEdit_host->setVisible(false);
|
ui->lineEdit_dbHost->setVisible(false);
|
||||||
ui->lineEdit_port->setVisible(false);
|
ui->lineEdit_dbPort->setVisible(false);
|
||||||
|
|
||||||
|
ui->label_ftpHost->setVisible(false);
|
||||||
|
ui->label_ftpPort->setVisible(false);
|
||||||
|
ui->lineEdit_ftpHost->setVisible(false);
|
||||||
|
ui->lineEdit_ftpPort->setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
Dialog_logIn::~Dialog_logIn()
|
Dialog_logIn::~Dialog_logIn()
|
||||||
|
@ -71,8 +82,9 @@ void Dialog_logIn::on_pbtn_login_clicked()
|
||||||
{
|
{
|
||||||
QString account = ui->lineEdit_account->text();
|
QString account = ui->lineEdit_account->text();
|
||||||
QString password = ui->lineEdit_password->text();
|
QString password = ui->lineEdit_password->text();
|
||||||
QString host = ui->lineEdit_host->text();
|
QString host = ui->lineEdit_dbHost->text();
|
||||||
QString port = ui->lineEdit_port->text();
|
QString port = ui->lineEdit_dbPort->text();
|
||||||
|
saveCfgValue("login", "account", account);
|
||||||
|
|
||||||
HGPdtToolDbUserMgr pdtToolDbuserMgr = nullptr;
|
HGPdtToolDbUserMgr pdtToolDbuserMgr = nullptr;
|
||||||
HGResult ret = HGPdtToolDb_CreateUserMgr(host.toStdString().c_str(), port.toInt(), account.toStdString().c_str(), password.toStdString().c_str(),
|
HGResult ret = HGPdtToolDb_CreateUserMgr(host.toStdString().c_str(), port.toInt(), account.toStdString().c_str(), password.toStdString().c_str(),
|
||||||
|
@ -101,10 +113,15 @@ void Dialog_logIn::on_pbtn_setting_clicked(bool checked)
|
||||||
ui->lineEdit_account->setVisible(!checked);
|
ui->lineEdit_account->setVisible(!checked);
|
||||||
ui->lineEdit_password->setVisible(!checked);
|
ui->lineEdit_password->setVisible(!checked);
|
||||||
|
|
||||||
ui->label_host->setVisible(checked);
|
ui->label_dbHost->setVisible(checked);
|
||||||
ui->label_port->setVisible(checked);
|
ui->label_dbPort->setVisible(checked);
|
||||||
ui->lineEdit_host->setVisible(checked);
|
ui->lineEdit_dbHost->setVisible(checked);
|
||||||
ui->lineEdit_port->setVisible(checked);
|
ui->lineEdit_dbPort->setVisible(checked);
|
||||||
|
|
||||||
|
ui->label_ftpHost->setVisible(checked);
|
||||||
|
ui->label_ftpPort->setVisible(checked);
|
||||||
|
ui->lineEdit_ftpHost->setVisible(checked);
|
||||||
|
ui->lineEdit_ftpPort->setVisible(checked);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Dialog_logIn::on_pbtn_minum_clicked()
|
void Dialog_logIn::on_pbtn_minum_clicked()
|
||||||
|
@ -116,3 +133,24 @@ void Dialog_logIn::on_pbtn_close_clicked()
|
||||||
{
|
{
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Dialog_logIn::saveCfgValue(const char *appName, const char *key, const QString &value)
|
||||||
|
{
|
||||||
|
HGChar cfgPath[512];
|
||||||
|
HGBase_GetConfigPath(cfgPath, 512);
|
||||||
|
HGBase_CreateDir(cfgPath);
|
||||||
|
strcat(cfgPath, "config.ini");
|
||||||
|
|
||||||
|
HGBase_SetProfileString(cfgPath, appName, key, getStdString(value).c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Dialog_logIn::getCfgValue(const char *appName, const char *key, const QString &def)
|
||||||
|
{
|
||||||
|
HGChar cfgPath[512];
|
||||||
|
HGBase_GetConfigPath(cfgPath, 512);
|
||||||
|
strcat(cfgPath, "config.ini");
|
||||||
|
|
||||||
|
HGChar value[512] = {0};
|
||||||
|
HGBase_GetProfileString(cfgPath, appName, key, getStdString(def).c_str(), value, 512);
|
||||||
|
return StdStringToUtf8(value).c_str();
|
||||||
|
}
|
||||||
|
|
|
@ -33,6 +33,9 @@ private slots:
|
||||||
|
|
||||||
void on_pbtn_close_clicked();
|
void on_pbtn_close_clicked();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void saveCfgValue(const char *appName, const char *key, const QString &value);
|
||||||
|
QString getCfgValue(const char *appName, const char *key, const QString &def);
|
||||||
private:
|
private:
|
||||||
Ui::Dialog_logIn *ui;
|
Ui::Dialog_logIn *ui;
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>434</width>
|
<width>389</width>
|
||||||
<height>245</height>
|
<height>268</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>441</width>
|
<width>391</width>
|
||||||
<height>30</height>
|
<height>30</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -141,16 +141,74 @@ QPushButton#pbtn_close::hover
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="">
|
<widget class="QWidget" name="layoutWidget">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>40</x>
|
<x>70</x>
|
||||||
<y>40</y>
|
<y>230</y>
|
||||||
<width>321</width>
|
<width>250</width>
|
||||||
<height>191</height>
|
<height>25</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="pbtn_login">
|
||||||
|
<property name="text">
|
||||||
|
<string>LOG IN</string>
|
||||||
|
</property>
|
||||||
|
<property name="default">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="pushButton_exit">
|
||||||
|
<property name="text">
|
||||||
|
<string>EXIT</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_3">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<widget class="QWidget" name="layoutWidget">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>50</x>
|
||||||
|
<y>50</y>
|
||||||
|
<width>289</width>
|
||||||
|
<height>164</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0">
|
||||||
|
<property name="sizeConstraint">
|
||||||
|
<enum>QLayout::SetNoConstraint</enum>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<item>
|
<item>
|
||||||
|
@ -247,14 +305,14 @@ QPushButton#pbtn_close::hover
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_host">
|
<widget class="QLabel" name="label_dbHost">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>host:</string>
|
<string>dbHost:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="lineEdit_host"/>
|
<widget class="QLineEdit" name="lineEdit_dbHost"/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_9">
|
<spacer name="horizontalSpacer_9">
|
||||||
|
@ -287,14 +345,14 @@ QPushButton#pbtn_close::hover
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_port">
|
<widget class="QLabel" name="label_dbPort">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>port:</string>
|
<string>dbPort:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="lineEdit_port"/>
|
<widget class="QLineEdit" name="lineEdit_dbPort"/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_11">
|
<spacer name="horizontalSpacer_11">
|
||||||
|
@ -312,9 +370,9 @@ QPushButton#pbtn_close::hover
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_2">
|
<spacer name="horizontalSpacer_12">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
|
@ -327,24 +385,57 @@ QPushButton#pbtn_close::hover
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="pbtn_login">
|
<widget class="QLabel" name="label_ftpHost">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>LOG IN</string>
|
<string>ftpHost:</string>
|
||||||
</property>
|
|
||||||
<property name="default">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="pushButton_exit">
|
<widget class="QLineEdit" name="lineEdit_ftpHost"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_13">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_14">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="label_ftpPort">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>EXIT</string>
|
<string>ftpPort:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_3">
|
<widget class="QLineEdit" name="lineEdit_ftpPort"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_15">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -55,11 +55,12 @@ static const RELA Rela[] = {
|
||||||
{HGPDTTOOLDB_TITLE_CLEAR_ROLLER_COUNT, HGPDTTOOLDB_ENTRYNAME_CLEAR_ROLLER_COUNT}
|
{HGPDTTOOLDB_TITLE_CLEAR_ROLLER_COUNT, HGPDTTOOLDB_ENTRYNAME_CLEAR_ROLLER_COUNT}
|
||||||
};
|
};
|
||||||
|
|
||||||
Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
|
Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, ui_helper *uiHelper, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
|
||||||
const QString &serialNum, const QString &devType, const QString &devName, const QString &devFwNum)
|
const QString &serialNum, const QString &devType, const QString &devName, const QString &devFwNum)
|
||||||
: QWidget(mainwnd)
|
: QWidget(mainwnd)
|
||||||
, ui(new Ui::Form_mainInterface)
|
, ui(new Ui::Form_mainInterface)
|
||||||
, m_mainwnd(mainwnd)
|
, m_mainwnd(mainwnd)
|
||||||
|
, m_uiHhelper(uiHelper)
|
||||||
, m_handle(handle)
|
, m_handle(handle)
|
||||||
, m_pdtToolDbuserMgr(pdtToolDbuserMgr)
|
, m_pdtToolDbuserMgr(pdtToolDbuserMgr)
|
||||||
, m_pdtToolDbDevice(pdtToolDbDevice)
|
, m_pdtToolDbDevice(pdtToolDbDevice)
|
||||||
|
@ -326,6 +327,7 @@ QString Form_mainInterface::getItemStatusStr(HGUInt status)
|
||||||
|
|
||||||
void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)
|
void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)
|
||||||
{
|
{
|
||||||
|
(void)previous;
|
||||||
int row = current->row();
|
int row = current->row();
|
||||||
int count = ui->tableWidget->rowCount();
|
int count = ui->tableWidget->rowCount();
|
||||||
ui->pbtn_preStep->setEnabled(row != 0);
|
ui->pbtn_preStep->setEnabled(row != 0);
|
||||||
|
@ -334,6 +336,9 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
|
||||||
QTableWidgetItem *item2 = ui->tableWidget->item(row, 1);
|
QTableWidgetItem *item2 = ui->tableWidget->item(row, 1);
|
||||||
QString title = item2->text();
|
QString title = item2->text();
|
||||||
|
|
||||||
|
bool man = m_map_title_name.value(title).is_man;
|
||||||
|
ui->pbtn_start->setEnabled(!man);
|
||||||
|
|
||||||
QString testName;
|
QString testName;
|
||||||
if (title == HGPDTTOOLDB_TITLE_DIAL_SWITCH)
|
if (title == HGPDTTOOLDB_TITLE_DIAL_SWITCH)
|
||||||
{
|
{
|
||||||
|
@ -347,11 +352,12 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
|
||||||
testName = m_map_title_name.value(title).name;
|
testName = m_map_title_name.value(title).name;
|
||||||
ui->stackedWidget->setCurrentWidget(m_view);
|
ui->stackedWidget->setCurrentWidget(m_view);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
ui_helper* helper;
|
|
||||||
hgscanner* hg = new hgscanner(m_handle);
|
void Form_mainInterface::on_pbtn_start_clicked()
|
||||||
helper = dynamic_cast<hgscanner*>(hg);
|
{
|
||||||
|
int row = ui->tableWidget->currentRow();
|
||||||
QString s("test-31");
|
QTableWidgetItem *item = ui->tableWidget->item(row, 1);
|
||||||
// func_test_go(s.toStdWString().c_str(), L"null", helper);
|
QString title = item->text();
|
||||||
|
func_test_go(title.toStdWString().c_str(), L"null", m_uiHhelper);
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "analysisjson.h"
|
#include "analysisjson.h"
|
||||||
#include "sane/sane_ex.h"
|
#include "sane/sane_ex.h"
|
||||||
#include "HGPdtToolDb.h"
|
#include "HGPdtToolDb.h"
|
||||||
|
#include "ui_helper.h"
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class Form_mainInterface;
|
class Form_mainInterface;
|
||||||
|
@ -19,7 +20,7 @@ class Form_mainInterface : public QWidget
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit Form_mainInterface(class MainWindow *mainwnd, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
|
explicit Form_mainInterface(class MainWindow *mainwnd, ui_helper *uiHelper, SANE_Handle handle, HGPdtToolDbUserMgr pdtToolDbuserMgr, HGPdtToolDbDevice pdtToolDbDevice,
|
||||||
const QString &serialNum, const QString &devType, const QString &devName, const QString &devFwNum);
|
const QString &serialNum, const QString &devType, const QString &devName, const QString &devFwNum);
|
||||||
~Form_mainInterface();
|
~Form_mainInterface();
|
||||||
|
|
||||||
|
@ -42,6 +43,8 @@ private slots:
|
||||||
|
|
||||||
void on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous);
|
void on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous);
|
||||||
|
|
||||||
|
void on_pbtn_start_clicked();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void initTableWidgetUi();
|
void initTableWidgetUi();
|
||||||
HGUInt getTestItem(const QString &title);
|
HGUInt getTestItem(const QString &title);
|
||||||
|
@ -57,6 +60,7 @@ private:
|
||||||
HGImgView *m_view;
|
HGImgView *m_view;
|
||||||
|
|
||||||
class MainWindow *m_mainwnd;
|
class MainWindow *m_mainwnd;
|
||||||
|
ui_helper *m_uiHhelper;
|
||||||
SANE_Handle m_handle;
|
SANE_Handle m_handle;
|
||||||
HGPdtToolDbUserMgr m_pdtToolDbuserMgr;
|
HGPdtToolDbUserMgr m_pdtToolDbuserMgr;
|
||||||
HGPdtToolDbDevice m_pdtToolDbDevice;
|
HGPdtToolDbDevice m_pdtToolDbDevice;
|
||||||
|
|
|
@ -95,6 +95,13 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="pbtn_start">
|
||||||
|
<property name="text">
|
||||||
|
<string>START</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="pbtn_stop">
|
<widget class="QPushButton" name="pbtn_stop">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "hgscanner.h"
|
#include "hgscanner.h"
|
||||||
|
#include <QMessageBox>
|
||||||
|
|
||||||
hgscanner::hgscanner(SANE_Handle h):devHandle_(h)
|
hgscanner::hgscanner(SANE_Handle h):devHandle_(h)
|
||||||
{
|
{
|
||||||
|
@ -16,6 +17,8 @@ parameter* hgscanner::get_user_input(data_from from, value_type type, const wcha
|
||||||
|
|
||||||
void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, size_t flag)
|
void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, size_t flag)
|
||||||
{
|
{
|
||||||
|
QString testName = QString::fromStdWString(name);
|
||||||
|
QString info = QString::fromStdWString((const wchar_t*)data);
|
||||||
if (ev == ui_helper::TEST_EVENT_TIPS)
|
if (ev == ui_helper::TEST_EVENT_TIPS)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, QWidget *parent)
|
||||||
|
|
||||||
connect(this, SIGNAL(sane_dev_arrive(QString)), this, SLOT(on_sane_dev_arrive(QString)), Qt::QueuedConnection);
|
connect(this, SIGNAL(sane_dev_arrive(QString)), this, SLOT(on_sane_dev_arrive(QString)), Qt::QueuedConnection);
|
||||||
connect(this, SIGNAL(sane_dev_remove(QString)), this, SLOT(on_sane_dev_remove(QString)), Qt::QueuedConnection);
|
connect(this, SIGNAL(sane_dev_remove(QString)), this, SLOT(on_sane_dev_remove(QString)), Qt::QueuedConnection);
|
||||||
connect(this, SIGNAL(user_event(int)), this, SLOT(on_user_event(int)), Qt::QueuedConnection);
|
|
||||||
|
|
||||||
m_top_splitter = new QSplitter(Qt::Horizontal);
|
m_top_splitter = new QSplitter(Qt::Horizontal);
|
||||||
m_bot_splitter = new QSplitter(Qt::Horizontal);
|
m_bot_splitter = new QSplitter(Qt::Horizontal);
|
||||||
|
@ -39,7 +38,6 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, QWidget *parent)
|
||||||
vLayout->setStretch(1, 0);
|
vLayout->setStretch(1, 0);
|
||||||
this->centralWidget()->setLayout(vLayout);
|
this->centralWidget()->setLayout(vLayout);
|
||||||
|
|
||||||
// todo 创建定时器
|
|
||||||
QTimer *timer = new QTimer(this);
|
QTimer *timer = new QTimer(this);
|
||||||
timer->start(1000);
|
timer->start(1000);
|
||||||
connect(timer, SIGNAL(timeout()), this, SLOT(on_update_userStatus()));
|
connect(timer, SIGNAL(timeout()), this, SLOT(on_update_userStatus()));
|
||||||
|
@ -189,8 +187,6 @@ bool MainWindow::RemoveInterface(Form_mainInterface *interface)
|
||||||
|
|
||||||
int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigned int *len, void *param)
|
int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigned int *len, void *param)
|
||||||
{
|
{
|
||||||
(void)hdev;
|
|
||||||
(void)len;
|
|
||||||
MainWindow* p = (MainWindow*)param;
|
MainWindow* p = (MainWindow*)param;
|
||||||
switch (code)
|
switch (code)
|
||||||
{
|
{
|
||||||
|
@ -208,11 +204,12 @@ int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigne
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (!hdev)
|
if (!hdev)
|
||||||
// {
|
{
|
||||||
// return -1;
|
return -1;
|
||||||
// }
|
}
|
||||||
// p->hg->cb_(hdev, code, data, len, NULL);
|
|
||||||
|
p->m_hg->cb_(hdev, code, data, len, p->m_uiHelper);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -293,7 +290,10 @@ void MainWindow::on_sane_dev_arrive(QString devName)
|
||||||
HGPdtToolDbDevice pdtToolDbDevice = nullptr;
|
HGPdtToolDbDevice pdtToolDbDevice = nullptr;
|
||||||
HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, dlg.GetSn().toStdString().c_str(), &pdtToolDbDevice);
|
HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, dlg.GetSn().toStdString().c_str(), &pdtToolDbDevice);
|
||||||
|
|
||||||
Form_mainInterface *mainInterface = new Form_mainInterface(this, devHandle, m_pdtToolDbuserMgr, pdtToolDbDevice,
|
m_hg = new hgscanner(devHandle);
|
||||||
|
m_uiHelper = dynamic_cast<ui_helper*>(m_hg);
|
||||||
|
|
||||||
|
Form_mainInterface *mainInterface = new Form_mainInterface(this, m_uiHelper, devHandle, m_pdtToolDbuserMgr, pdtToolDbDevice,
|
||||||
dlg.GetSn(), dlg.GetDevType(), devName, getDevFwNum(devHandle));
|
dlg.GetSn(), dlg.GetDevType(), devName, getDevFwNum(devHandle));
|
||||||
if (!AddInterface(mainInterface))
|
if (!AddInterface(mainInterface))
|
||||||
{
|
{
|
||||||
|
@ -345,7 +345,6 @@ void MainWindow::on_update_userStatus()
|
||||||
m_isLogOut = true;
|
m_isLogOut = true;
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::on_act_newDevice_triggered()
|
void MainWindow::on_act_newDevice_triggered()
|
||||||
|
@ -356,7 +355,7 @@ void MainWindow::on_act_newDevice_triggered()
|
||||||
HGPdtToolDbDevice pdtToolDbDevice = nullptr;
|
HGPdtToolDbDevice pdtToolDbDevice = nullptr;
|
||||||
HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, dlg.GetSn().toStdString().c_str(), &pdtToolDbDevice);
|
HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, dlg.GetSn().toStdString().c_str(), &pdtToolDbDevice);
|
||||||
|
|
||||||
Form_mainInterface *mainInterface = new Form_mainInterface(this, nullptr, m_pdtToolDbuserMgr, pdtToolDbDevice, dlg.GetSn(), dlg.GetDevType(), nullptr, nullptr);
|
Form_mainInterface *mainInterface = new Form_mainInterface(this, nullptr, nullptr, m_pdtToolDbuserMgr, pdtToolDbDevice, dlg.GetSn(), dlg.GetDevType(), nullptr, nullptr);
|
||||||
if (!AddInterface(mainInterface))
|
if (!AddInterface(mainInterface))
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, tr("tips"), tr("cannot create more table"));
|
QMessageBox::information(this, tr("tips"), tr("cannot create more table"));
|
||||||
|
|
|
@ -40,7 +40,6 @@ private:
|
||||||
signals:
|
signals:
|
||||||
void sane_dev_arrive(QString devName);
|
void sane_dev_arrive(QString devName);
|
||||||
void sane_dev_remove(QString devName);
|
void sane_dev_remove(QString devName);
|
||||||
void user_event(int event);
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void on_sane_dev_arrive(QString devName);
|
void on_sane_dev_arrive(QString devName);
|
||||||
|
@ -71,6 +70,7 @@ private:
|
||||||
private:
|
private:
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
HGPdtToolDbUserMgr m_pdtToolDbuserMgr;
|
HGPdtToolDbUserMgr m_pdtToolDbuserMgr;
|
||||||
hgscanner* hg;
|
hgscanner *m_hg;
|
||||||
|
ui_helper *m_uiHelper;
|
||||||
};
|
};
|
||||||
#endif // MAINWINDOW_H
|
#endif // MAINWINDOW_H
|
||||||
|
|
Loading…
Reference in New Issue