Merge branch 'master' of http://192.168.100.140:8099/sane/code_production
This commit is contained in:
commit
177a9e9b4b
Binary file not shown.
|
@ -124,22 +124,22 @@
|
|||
<translation>否</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_userinput.ui" line="133"/>
|
||||
<location filename="dialog_userinput.ui" line="160"/>
|
||||
<source>OK</source>
|
||||
<translation>确定</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_userinput.ui" line="140"/>
|
||||
<location filename="dialog_userinput.ui" line="167"/>
|
||||
<source>Cancel</source>
|
||||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_userinput.cpp" line="73"/>
|
||||
<location filename="dialog_userinput.cpp" line="91"/>
|
||||
<source>tips</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_userinput.cpp" line="73"/>
|
||||
<location filename="dialog_userinput.cpp" line="91"/>
|
||||
<source>please input valid contents</source>
|
||||
<translation>请输入有效内容</translation>
|
||||
</message>
|
||||
|
@ -545,88 +545,88 @@
|
|||
<translation>下一步</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="85"/>
|
||||
<location filename="form_maininterface.cpp" line="87"/>
|
||||
<source>Device has connected</source>
|
||||
<translation>设备已连接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="87"/>
|
||||
<location filename="form_maininterface.cpp" line="89"/>
|
||||
<source>Device hasnot connected</source>
|
||||
<translation>设备未连接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="88"/>
|
||||
<location filename="form_maininterface.cpp" line="90"/>
|
||||
<source>Device type:</source>
|
||||
<translation>设备型号:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="88"/>
|
||||
<location filename="form_maininterface.cpp" line="90"/>
|
||||
<source> SerialNum:</source>
|
||||
<translation> 序列号:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="88"/>
|
||||
<location filename="form_maininterface.cpp" line="90"/>
|
||||
<source> connect status:</source>
|
||||
<translation> 设备连接状态:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="97"/>
|
||||
<location filename="form_maininterface.cpp" line="99"/>
|
||||
<source>load last image which uploaded last time</source>
|
||||
<translation>加载上一次上传的图片</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="154"/>
|
||||
<location filename="form_maininterface.cpp" line="500"/>
|
||||
<location filename="form_maininterface.cpp" line="161"/>
|
||||
<location filename="form_maininterface.cpp" line="539"/>
|
||||
<source>tips</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="187"/>
|
||||
<location filename="form_maininterface.cpp" line="179"/>
|
||||
<source>yes</source>
|
||||
<translation>确定</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="188"/>
|
||||
<location filename="form_maininterface.cpp" line="180"/>
|
||||
<source>no</source>
|
||||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="269"/>
|
||||
<location filename="form_maininterface.cpp" line="288"/>
|
||||
<source>ID</source>
|
||||
<translation>序号</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="269"/>
|
||||
<location filename="form_maininterface.cpp" line="288"/>
|
||||
<source>Test items</source>
|
||||
<translation>测试项</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="269"/>
|
||||
<location filename="form_maininterface.cpp" line="288"/>
|
||||
<source>status</source>
|
||||
<translation>测试状态</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="417"/>
|
||||
<location filename="form_maininterface.cpp" line="436"/>
|
||||
<source>not test</source>
|
||||
<translation>未测试</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="417"/>
|
||||
<location filename="form_maininterface.cpp" line="436"/>
|
||||
<source>not pass</source>
|
||||
<translation>不通过</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="417"/>
|
||||
<location filename="form_maininterface.cpp" line="436"/>
|
||||
<source>not support</source>
|
||||
<translation>不支持</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="417"/>
|
||||
<location filename="form_maininterface.cpp" line="436"/>
|
||||
<source>pass</source>
|
||||
<translation>通过</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="500"/>
|
||||
<location filename="form_maininterface.cpp" line="539"/>
|
||||
<source>no image</source>
|
||||
<translation>无图</translation>
|
||||
</message>
|
||||
|
@ -692,7 +692,7 @@
|
|||
<translation>上传配置文件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="376"/>
|
||||
<location filename="mainwindow.cpp" line="412"/>
|
||||
<source>Account login elsewhere</source>
|
||||
<translation>账户在其他地方登录</translation>
|
||||
</message>
|
||||
|
@ -701,94 +701,104 @@
|
|||
<translation type="vanished">网络连接断开</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="379"/>
|
||||
<location filename="mainwindow.cpp" line="415"/>
|
||||
<source>You have been forced offline by the administrator account</source>
|
||||
<translation>你已被管理员账户强制下线</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="382"/>
|
||||
<location filename="mainwindow.cpp" line="418"/>
|
||||
<source>Data base error</source>
|
||||
<translation>数据库错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="325"/>
|
||||
<location filename="mainwindow.cpp" line="346"/>
|
||||
<location filename="mainwindow.cpp" line="362"/>
|
||||
<location filename="mainwindow.cpp" line="390"/>
|
||||
<location filename="mainwindow.cpp" line="407"/>
|
||||
<location filename="mainwindow.cpp" line="432"/>
|
||||
<location filename="mainwindow.cpp" line="436"/>
|
||||
<location filename="mainwindow.cpp" line="266"/>
|
||||
<location filename="mainwindow.cpp" line="361"/>
|
||||
<location filename="mainwindow.cpp" line="382"/>
|
||||
<location filename="mainwindow.cpp" line="398"/>
|
||||
<location filename="mainwindow.cpp" line="428"/>
|
||||
<location filename="mainwindow.cpp" line="446"/>
|
||||
<location filename="mainwindow.cpp" line="471"/>
|
||||
<location filename="mainwindow.cpp" line="475"/>
|
||||
<location filename="mainwindow.cpp" line="484"/>
|
||||
<location filename="mainwindow.cpp" line="496"/>
|
||||
<source>tips</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="326"/>
|
||||
<location filename="mainwindow.cpp" line="266"/>
|
||||
<location filename="mainwindow.cpp" line="484"/>
|
||||
<location filename="mainwindow.cpp" line="496"/>
|
||||
<source>Is testing, do not close!</source>
|
||||
<translation>测试中,请勿关闭!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="362"/>
|
||||
<source>Are you sure to connect the new device</source>
|
||||
<translation>检测到设备连接,是否启动测试?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="328"/>
|
||||
<location filename="mainwindow.cpp" line="364"/>
|
||||
<source>yes</source>
|
||||
<translation>确定</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="329"/>
|
||||
<location filename="mainwindow.cpp" line="365"/>
|
||||
<source>no</source>
|
||||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="346"/>
|
||||
<location filename="mainwindow.cpp" line="407"/>
|
||||
<location filename="mainwindow.cpp" line="382"/>
|
||||
<location filename="mainwindow.cpp" line="446"/>
|
||||
<source>cannot create more table</source>
|
||||
<translation>不能创建更多项目</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="362"/>
|
||||
<location filename="mainwindow.cpp" line="398"/>
|
||||
<source>The device has disconnected</source>
|
||||
<translation>设备已断开连接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="427"/>
|
||||
<location filename="mainwindow.cpp" line="466"/>
|
||||
<source>save</source>
|
||||
<translation>保存</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="427"/>
|
||||
<location filename="mainwindow.cpp" line="466"/>
|
||||
<source>xls(*.xls)</source>
|
||||
<translation>xls表格(*.xls)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="432"/>
|
||||
<location filename="mainwindow.cpp" line="471"/>
|
||||
<source>export succeed</source>
|
||||
<translation>导出成功</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="436"/>
|
||||
<location filename="mainwindow.cpp" line="475"/>
|
||||
<source>export failed</source>
|
||||
<translation>导出失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="458"/>
|
||||
<location filename="mainwindow.cpp" line="508"/>
|
||||
<source>Illegal user</source>
|
||||
<translation>非法的用户</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="462"/>
|
||||
<location filename="mainwindow.cpp" line="512"/>
|
||||
<source>Wrong password</source>
|
||||
<translation>密码错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="466"/>
|
||||
<location filename="mainwindow.cpp" line="516"/>
|
||||
<source>Database error</source>
|
||||
<translation>数据库错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="470"/>
|
||||
<location filename="mainwindow.cpp" line="520"/>
|
||||
<source>connect error</source>
|
||||
<translation>连接错误</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="mainwindow.cpp" line="474"/>
|
||||
<location filename="mainwindow.cpp" line="524"/>
|
||||
<source>Failed</source>
|
||||
<translation>错误</translation>
|
||||
</message>
|
||||
|
@ -796,18 +806,19 @@
|
|||
<context>
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
<location filename="hgscanner.cpp" line="42"/>
|
||||
<location filename="hgscanner.cpp" line="62"/>
|
||||
<source>success: </source>
|
||||
<oldsource>success</oldsource>
|
||||
<translation>成功: </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hgscanner.cpp" line="44"/>
|
||||
<location filename="hgscanner.cpp" line="47"/>
|
||||
<location filename="hgscanner.cpp" line="64"/>
|
||||
<source>failed: </source>
|
||||
<translation>失败: </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hgscanner.cpp" line="50"/>
|
||||
<location filename="hgscanner.cpp" line="40"/>
|
||||
<source>Not find test item</source>
|
||||
<translation>没有找到该测试项</translation>
|
||||
</message>
|
||||
|
|
|
@ -23,17 +23,21 @@ Dialog_logIn::Dialog_logIn(QWidget *parent) :
|
|||
ui->pbtn_setting->setToolTip(tr("Set host and port"));
|
||||
ui->pbtn_minum->setToolTip(tr("Minimize"));
|
||||
ui->pbtn_close->setToolTip(tr("Close"));
|
||||
|
||||
ui->label_title->setText(tr("LogIn"));
|
||||
ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
|
||||
|
||||
QString account("root");
|
||||
QString dbHost("192.168.1.70");
|
||||
QString dbPort("3306");
|
||||
QString ftpHost("192.168.1.70");
|
||||
QString ftpPort("21");
|
||||
|
||||
ui->lineEdit_account->setText(getCfgValue("login", "account", account));
|
||||
// ui->lineEdit_password->setText("123456");
|
||||
ui->lineEdit_password->setEchoMode(QLineEdit::EchoMode::Password);
|
||||
ui->lineEdit_dbHost->setText("192.168.1.70");
|
||||
ui->lineEdit_dbPort->setText("3306");
|
||||
ui->lineEdit_ftpHost->setText("192.168.1.70");
|
||||
ui->lineEdit_ftpPort->setText("21");
|
||||
|
||||
ui->lineEdit_dbHost->setText(getCfgValue("login", "dbHost", dbHost));
|
||||
ui->lineEdit_dbPort->setText(getCfgValue("login", "dbPort", dbPort));
|
||||
ui->lineEdit_ftpHost->setText(getCfgValue("login", "ftpHost", ftpHost));
|
||||
ui->lineEdit_ftpPort->setText(getCfgValue("login", "ftpPort", ftpPort));
|
||||
|
||||
ui->label_dbHost->setVisible(false);
|
||||
ui->label_dbPort->setVisible(false);
|
||||
|
@ -96,12 +100,19 @@ void Dialog_logIn::on_pbtn_login_clicked()
|
|||
{
|
||||
QString account = ui->lineEdit_account->text();
|
||||
QString password = ui->lineEdit_password->text();
|
||||
QString host = ui->lineEdit_dbHost->text();
|
||||
QString port = ui->lineEdit_dbPort->text();
|
||||
QString dbHost = ui->lineEdit_dbHost->text();
|
||||
QString dbPort = ui->lineEdit_dbPort->text();
|
||||
QString ftpHost = ui->lineEdit_ftpHost->text();
|
||||
QString ftpPort = ui->lineEdit_ftpPort->text();
|
||||
|
||||
saveCfgValue("login", "account", account);
|
||||
saveCfgValue("login", "dbHost", dbHost);
|
||||
saveCfgValue("login", "dbPort", dbPort);
|
||||
saveCfgValue("login", "ftpHost", ftpHost);
|
||||
saveCfgValue("login", "ftpPort", ftpPort);
|
||||
|
||||
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(dbHost.toStdString().c_str(), dbPort.toInt(), account.toStdString().c_str(), password.toStdString().c_str(),
|
||||
&pdtToolDbuserMgr);
|
||||
if (NULL != pdtToolDbuserMgr)
|
||||
{
|
||||
|
|
|
@ -70,6 +70,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, SANE_Handle ha
|
|||
, m_devType(devType)
|
||||
, m_devName(devName)
|
||||
, m_devFwNum(devFwNum)
|
||||
, m_isTesting(false)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
|
@ -79,6 +80,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, SANE_Handle ha
|
|||
|
||||
connect(this, SIGNAL(testResult(QString)), this, SLOT(on_testResult(QString)), Qt::QueuedConnection);
|
||||
connect(this, SIGNAL(testResultImg(void*)), this, SLOT(on_testResultImg(void*)), Qt::QueuedConnection);
|
||||
connect(this, SIGNAL(testFinish()), this, SLOT(on_testFinish()), Qt::QueuedConnection);
|
||||
|
||||
QString str;
|
||||
if (m_handle)
|
||||
|
@ -121,6 +123,11 @@ Form_mainInterface::~Form_mainInterface()
|
|||
delete ui;
|
||||
}
|
||||
|
||||
bool Form_mainInterface::isTesting()
|
||||
{
|
||||
return m_isTesting;
|
||||
}
|
||||
|
||||
QString Form_mainInterface::getSn()
|
||||
{
|
||||
return m_serialNum;
|
||||
|
@ -178,6 +185,12 @@ void Form_mainInterface::on_testDistortion(QString name, void *data)
|
|||
}
|
||||
}
|
||||
|
||||
void Form_mainInterface::on_testFinish()
|
||||
{
|
||||
updateUiEnabled(true);
|
||||
m_isTesting = false;
|
||||
}
|
||||
|
||||
void Form_mainInterface::on_pbtn_preStep_clicked()
|
||||
{
|
||||
int row = ui->tableWidget->currentRow();
|
||||
|
@ -445,6 +458,20 @@ QString Form_mainInterface::getCacheFileName()
|
|||
return fileName;
|
||||
}
|
||||
|
||||
void Form_mainInterface::updateUiEnabled(bool enable)
|
||||
{
|
||||
ui->tableWidget->setEnabled(enable);
|
||||
ui->pbtn_preStep->setEnabled(enable);
|
||||
ui->pbtn_nextStep->setEnabled(enable);
|
||||
ui->pbtn_pass->setEnabled(enable);
|
||||
ui->pbtn_fail->setEnabled(enable);
|
||||
ui->pbtn_start->setEnabled(enable);
|
||||
ui->pbtn_showImg->setEnabled(enable);
|
||||
ui->pbtn_leftRotate->setEnabled(enable);
|
||||
ui->pbtn_rightRotate->setEnabled(enable);
|
||||
ui->pbtn_stop->setEnabled(enable);
|
||||
}
|
||||
|
||||
void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)
|
||||
{
|
||||
(void)previous;
|
||||
|
@ -480,6 +507,11 @@ void Form_mainInterface::on_pbtn_start_clicked()
|
|||
QString title = item->text();
|
||||
QString name = m_map_title_name.value(title).name;
|
||||
int ret = func_test_go(name.toStdWString().c_str(), L"null", m_hg);
|
||||
if (ret == 0)
|
||||
{
|
||||
updateUiEnabled(false);
|
||||
m_isTesting = true;
|
||||
}
|
||||
}
|
||||
|
||||
void Form_mainInterface::on_pbtn_showImg_clicked()
|
||||
|
|
|
@ -24,6 +24,7 @@ public:
|
|||
const QString &serialNum, const QString &devType, const QString &devName, const QString &devFwNum);
|
||||
~Form_mainInterface();
|
||||
|
||||
bool isTesting();
|
||||
QString getSn();
|
||||
QString getDevName();
|
||||
SANE_Handle getDevHandle();
|
||||
|
@ -36,11 +37,13 @@ signals:
|
|||
void testResult(QString text);
|
||||
void testResultImg(void* img);
|
||||
void testDistortion(QString title, void *data);
|
||||
void testFinish();
|
||||
|
||||
private slots:
|
||||
void on_testResult(QString text);
|
||||
void on_testResultImg(void* img);
|
||||
void on_testDistortion(QString title, void *data);
|
||||
void on_testFinish();
|
||||
|
||||
private slots:
|
||||
void on_pbtn_preStep_clicked();
|
||||
|
@ -71,6 +74,7 @@ private:
|
|||
QString getItemStatusStr(HGUInt status);
|
||||
QString getCachePath();
|
||||
QString getCacheFileName();
|
||||
void updateUiEnabled(bool enable);
|
||||
|
||||
private:
|
||||
Ui::Form_mainInterface *ui;
|
||||
|
@ -88,6 +92,7 @@ private:
|
|||
QString m_devType;
|
||||
QString m_devName;
|
||||
QString m_devFwNum;
|
||||
bool m_isTesting;
|
||||
|
||||
QMap<QString, AnalysisJson::json_node> m_map_title_name;
|
||||
};
|
||||
|
|
|
@ -34,22 +34,37 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
if (ev == TEST_EVENT_TIPS)
|
||||
{
|
||||
|
||||
}
|
||||
else if (ev == TEST_EVENT_RESULT)
|
||||
{
|
||||
QString ret;
|
||||
QString info = QString::fromStdWString((const wchar_t*)data);
|
||||
if (flag)
|
||||
ret = QObject::tr("success: ") + info;
|
||||
else
|
||||
ret = QObject::tr("failed: ") + info;
|
||||
|
||||
emit m_interface->testResult(ret);
|
||||
}
|
||||
else if (ev == TEST_EVENT_NOT_FIND_TEST)
|
||||
{
|
||||
QString info = QObject::tr("Not find test item");
|
||||
emit m_interface->testResult(info);
|
||||
emit m_interface->testFinish();
|
||||
}
|
||||
else if (ev == TEST_EVENT_IO_FAIL)
|
||||
{
|
||||
QString info = QString::fromStdWString((const wchar_t*)data);
|
||||
info = QObject::tr("failed: ") + info;
|
||||
|
||||
emit m_interface->testResult(info);
|
||||
emit m_interface->testFinish();
|
||||
}
|
||||
else if (ev == TEST_EVENT_MANUAL_CONFIRMATION)
|
||||
{
|
||||
QString info = QString::fromStdWString((const wchar_t*)data);
|
||||
emit m_interface->testResult(info);
|
||||
emit m_interface->testFinish();
|
||||
}
|
||||
else if (ev == TEST_EVENT_RESULT)
|
||||
{
|
||||
QString info = QString::fromStdWString((const wchar_t*)data);
|
||||
if (flag)
|
||||
info = QObject::tr("success: ") + info;
|
||||
else
|
||||
info = QObject::tr("failed: ") + info;
|
||||
|
||||
emit m_interface->testResult(info);
|
||||
emit m_interface->testFinish();
|
||||
}
|
||||
else if (ev == TEST_EVENT_DISTORTION)
|
||||
{
|
||||
|
|
|
@ -232,6 +232,42 @@ bool MainWindow::RemoveInterface(Form_mainInterface *interface)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool MainWindow::isTesting()
|
||||
{
|
||||
bool isTesting = false;
|
||||
for (int i = 0; i < m_top_splitter->count(); ++i)
|
||||
{
|
||||
Form_mainInterface *interface = (Form_mainInterface *)m_top_splitter->widget(i);
|
||||
if (interface->isTesting())
|
||||
{
|
||||
isTesting = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!isTesting)
|
||||
{
|
||||
for (int i = 0; i < m_bot_splitter->count(); ++i)
|
||||
{
|
||||
Form_mainInterface *interface = (Form_mainInterface *)m_bot_splitter->widget(i);
|
||||
if (interface->isTesting())
|
||||
{
|
||||
isTesting = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return isTesting;
|
||||
}
|
||||
|
||||
void MainWindow::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
if (isTesting())
|
||||
{
|
||||
QMessageBox::information(this, tr("tips"), tr("Is testing, do not close!"));
|
||||
event->ignore();
|
||||
}
|
||||
}
|
||||
|
||||
int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigned int *len, void *param)
|
||||
{
|
||||
MainWindow* p = (MainWindow*)param;
|
||||
|
@ -387,9 +423,12 @@ void MainWindow::on_update_userStatus()
|
|||
|
||||
if (!tips.isEmpty())
|
||||
{
|
||||
QMessageBox::information(this, (tr("tips")), tips);
|
||||
m_isLogOut = true;
|
||||
close();
|
||||
if (!isTesting())
|
||||
{
|
||||
QMessageBox::information(this, (tr("tips")), tips);
|
||||
m_isLogOut = true;
|
||||
close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -440,6 +479,11 @@ void MainWindow::on_act_export_triggered()
|
|||
|
||||
void MainWindow::on_act_logOut_triggered()
|
||||
{
|
||||
if (isTesting())
|
||||
{
|
||||
QMessageBox::information(this, tr("tips"), tr("Is testing, do not close!"));
|
||||
return;
|
||||
}
|
||||
m_isLogOut = true;
|
||||
close();
|
||||
}
|
||||
|
@ -447,6 +491,12 @@ void MainWindow::on_act_logOut_triggered()
|
|||
|
||||
void MainWindow::on_act_close_triggered()
|
||||
{
|
||||
if (isTesting())
|
||||
{
|
||||
QMessageBox::information(this, tr("tips"), tr("Is testing, do not close!"));
|
||||
return;
|
||||
}
|
||||
|
||||
close();
|
||||
}
|
||||
|
||||
|
|
|
@ -30,7 +30,10 @@ public:
|
|||
Form_mainInterface* FindInterface(SANE_Handle handle);
|
||||
bool AddInterface(Form_mainInterface *interface);
|
||||
bool RemoveInterface(Form_mainInterface *interface);
|
||||
|
||||
bool isTesting();
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent *event);
|
||||
private:
|
||||
static int sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned int* len, void* param);
|
||||
|
||||
|
|
|
@ -0,0 +1,84 @@
|
|||
// CDlgInput.cpp: 实现文件
|
||||
//
|
||||
|
||||
#include "pch.h"
|
||||
#include "scanner-check.h"
|
||||
#include "CDlgInput.h"
|
||||
#include "afxdialogex.h"
|
||||
|
||||
|
||||
// CDlgInput 对话框
|
||||
|
||||
IMPLEMENT_DYNAMIC(CDlgInput, CDialogEx)
|
||||
|
||||
CDlgInput::CDlgInput(CWnd* pParent /*=nullptr*/)
|
||||
: CDialogEx(IDD_INPUT, pParent), val_(L""), title_(L"\u4FEE\u6539")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CDlgInput::~CDlgInput()
|
||||
{
|
||||
}
|
||||
|
||||
void CDlgInput::DoDataExchange(CDataExchange* pDX)
|
||||
{
|
||||
CDialogEx::DoDataExchange(pDX);
|
||||
}
|
||||
|
||||
|
||||
BEGIN_MESSAGE_MAP(CDlgInput, CDialogEx)
|
||||
ON_BN_CLICKED(IDOK, &CDlgInput::OnBnClickedOk)
|
||||
ON_EN_CHANGE(IDC_EDIT1, &CDlgInput::OnEnChangeEdit1)
|
||||
END_MESSAGE_MAP()
|
||||
|
||||
|
||||
// CDlgInput 消息处理程序
|
||||
BOOL CDlgInput::OnInitDialog()
|
||||
{
|
||||
CDialogEx::OnInitDialog();
|
||||
|
||||
::SetWindowTextW(m_hWnd, title_.c_str());
|
||||
|
||||
size_t pos = val_.find(L"\\n");
|
||||
while (pos != std::wstring::npos)
|
||||
{
|
||||
val_.replace(pos, 2, L"\r\n");
|
||||
pos = val_.find(L"\\n");
|
||||
}
|
||||
while ((pos = val_.find(L"\\t")) != std::wstring::npos)
|
||||
val_.replace(pos, 2, L"\t");
|
||||
::SetDlgItemTextW(m_hWnd, IDC_EDIT1, val_.c_str());
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void CDlgInput::OnBnClickedOk()
|
||||
{
|
||||
// TODO: 在此添加控件通知处理程序代码
|
||||
wchar_t val[1024] = { 0 };
|
||||
|
||||
::GetDlgItemTextW(m_hWnd, IDC_EDIT1, val, _countof(val) - 1);
|
||||
val_ = val;
|
||||
|
||||
size_t pos = val_.find(L"\r\n");
|
||||
while (pos != std::wstring::npos)
|
||||
{
|
||||
val_.replace(pos, 2, L"\\n");
|
||||
pos = val_.find(L"\r\n");
|
||||
}
|
||||
while ((pos = val_.find(L"\t")) != std::wstring::npos)
|
||||
val_.replace(pos, 1, L"\\t");
|
||||
CDialogEx::OnOK();
|
||||
}
|
||||
|
||||
|
||||
void CDlgInput::OnEnChangeEdit1()
|
||||
{
|
||||
// TODO: 如果该控件是 RICHEDIT 控件,它将不
|
||||
// 发送此通知,除非重写 CDialogEx::OnInitDialog()
|
||||
// 函数并调用 CRichEditCtrl().SetEventMask(),
|
||||
// 同时将 ENM_CHANGE 标志“或”运算到掩码中。
|
||||
|
||||
// TODO: 在此添加控件通知处理程序代码
|
||||
}
|
|
@ -0,0 +1,35 @@
|
|||
#pragma once
|
||||
|
||||
|
||||
// CDlgInput 对话框
|
||||
#include <string>
|
||||
|
||||
class CDlgInput : public CDialogEx
|
||||
{
|
||||
DECLARE_DYNAMIC(CDlgInput)
|
||||
|
||||
public:
|
||||
CDlgInput(CWnd* pParent = nullptr); // 标准构造函数
|
||||
virtual ~CDlgInput();
|
||||
|
||||
std::wstring val_;
|
||||
std::wstring title_;
|
||||
|
||||
// 对话框数据
|
||||
#ifdef AFX_DESIGN_TIME
|
||||
enum { IDD = IDD_INPUT };
|
||||
#endif
|
||||
|
||||
protected:
|
||||
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
|
||||
virtual BOOL OnInitDialog();
|
||||
|
||||
DECLARE_MESSAGE_MAP()
|
||||
public:
|
||||
afx_msg void OnBnClickedOk();
|
||||
void set_title(const wchar_t* title)
|
||||
{
|
||||
title_ = title ? title : L"\u4FEE\u6539";
|
||||
}
|
||||
afx_msg void OnEnChangeEdit1();
|
||||
};
|
|
@ -1,4 +1,4 @@
|
|||
// CDlgItemMgr.cpp: 实现文件
|
||||
// CDlgItemMgr.cpp: 实现文件
|
||||
//
|
||||
|
||||
#include "pch.h"
|
||||
|
@ -78,7 +78,7 @@ END_MESSAGE_MAP()
|
|||
void CDlgItemMgr::OnBnClickedButtonAdd()
|
||||
{
|
||||
// TODO: 在此添加控件通知处理程序代码
|
||||
wchar_t text[128] = { 0 }, name[128] = { 0 }, desc[128] = { 0 };
|
||||
wchar_t text[1024] = { 0 }, name[1024] = { 0 }, desc[1024] = { 0 };
|
||||
bool online = is_checked(this, IDC_CHECK_ONLINE), fatal = is_checked(this, IDC_CHECK_FATAL);
|
||||
int ind = -1;
|
||||
|
||||
|
@ -91,7 +91,7 @@ void CDlgItemMgr::OnBnClickedButtonAdd()
|
|||
}
|
||||
for (int i = 0; i < list_.GetItemCount(); ++i)
|
||||
{
|
||||
wchar_t val[128] = { 0 };
|
||||
wchar_t val[1024] = { 0 };
|
||||
list_.GetItemText(i, 1, val, _countof(val) - 1);
|
||||
if (wcscmp(name, val) == 0)
|
||||
{
|
||||
|
@ -141,7 +141,7 @@ void CDlgItemMgr::OnNMDblclkList1(NMHDR* pNMHDR, LRESULT* pResult)
|
|||
{
|
||||
if (pos.x <= width[i])
|
||||
{
|
||||
wchar_t text[128] = { 0 };
|
||||
wchar_t text[1024] = { 0 };
|
||||
if (i < 3)
|
||||
{
|
||||
std::wstring tips(L"\u5220\u9664\u6D4B\u8BD5\u9879\uFF1A");
|
||||
|
@ -170,7 +170,7 @@ void CDlgItemMgr::OnNMDblclkList1(NMHDR* pNMHDR, LRESULT* pResult)
|
|||
else
|
||||
{
|
||||
CDlgInput input;
|
||||
wchar_t val[128] = { 0 };
|
||||
wchar_t val[1024] = { 0 };
|
||||
std::wstring def(L"");
|
||||
|
||||
list_.GetItemText(ind, 2, val, _countof(val) - 1);
|
||||
|
@ -215,22 +215,24 @@ std::wstring CDlgItemMgr::get_stored_config_file(void)
|
|||
}
|
||||
void CDlgItemMgr::get_item(int ind, page_config::ITEM* item)
|
||||
{
|
||||
wchar_t text[128] = { 0 };
|
||||
size_t len = 1024;
|
||||
wchar_t *text = (wchar_t*)malloc(len + 1);
|
||||
|
||||
list_.GetItemText(ind, 1, text, _countof(text) - 1);
|
||||
list_.GetItemText(ind, 1, text, len);
|
||||
item->name = text;
|
||||
list_.GetItemText(ind, 2, text, _countof(text) - 1);
|
||||
list_.GetItemText(ind, 2, text, len);
|
||||
item->title = text;
|
||||
list_.GetItemText(ind, 3, text, _countof(text) - 1);
|
||||
list_.GetItemText(ind, 3, text, len);
|
||||
item->man = wcscmp(text, L"false") == 0;
|
||||
list_.GetItemText(ind, 4, text, _countof(text) - 1);
|
||||
list_.GetItemText(ind, 4, text, len);
|
||||
item->fatal = wcscmp(text, L"true") == 0;
|
||||
list_.GetItemText(ind, 5, text, _countof(text) - 1);
|
||||
list_.GetItemText(ind, 5, text, len);
|
||||
item->desc = text;
|
||||
free(text);
|
||||
}
|
||||
void CDlgItemMgr::load_from_file(const wchar_t* file)
|
||||
{
|
||||
wchar_t path[MAX_PATH] = { 0 },
|
||||
wchar_t *path = (wchar_t*)malloc(MAX_PATH * 4),
|
||||
*sn = path,
|
||||
*n = sn + 40,
|
||||
*t = n + 40,
|
||||
|
@ -272,6 +274,7 @@ void CDlgItemMgr::load_from_file(const wchar_t* file)
|
|||
cont.erase(0, pos + 2);
|
||||
}
|
||||
::PostMessage(GetParent()->m_hWnd, WM_TEST_ITEM_CHANGED, 0, 0);
|
||||
free(path);
|
||||
}
|
||||
void CDlgItemMgr::load_stored_config(void)
|
||||
{
|
||||
|
@ -299,7 +302,7 @@ void CDlgItemMgr::item_changed(void)
|
|||
}
|
||||
bool CDlgItemMgr::get_name(const wchar_t* title, page_config::ITEM* item)
|
||||
{
|
||||
wchar_t text[128] = { 0 };
|
||||
wchar_t text[1024] = { 0 };
|
||||
|
||||
for (size_t i = 0; i < list_.GetItemCount(); ++i)
|
||||
{
|
||||
|
@ -316,7 +319,7 @@ bool CDlgItemMgr::get_name(const wchar_t* title, page_config::ITEM* item)
|
|||
}
|
||||
bool CDlgItemMgr::get_title(const wchar_t* name, page_config::ITEM* item)
|
||||
{
|
||||
wchar_t text[128] = { 0 };
|
||||
wchar_t text[1024] = { 0 };
|
||||
|
||||
for (size_t i = 0; i < list_.GetItemCount(); ++i)
|
||||
{
|
||||
|
@ -333,7 +336,7 @@ bool CDlgItemMgr::get_title(const wchar_t* name, page_config::ITEM* item)
|
|||
}
|
||||
void CDlgItemMgr::get_all_items(std::vector<page_config::ITEM>& items)
|
||||
{
|
||||
wchar_t text[128] = { 0 };
|
||||
wchar_t text[1024] = { 0 };
|
||||
|
||||
for (size_t i = 0; i < list_.GetItemCount(); ++i)
|
||||
{
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue