This commit is contained in:
parent
7918c265e8
commit
424238085b
|
@ -12,6 +12,7 @@
|
|||
#include "hgscanner.h"
|
||||
#include "mainwindow.h"
|
||||
#include "dialog_excepdesc.h"
|
||||
#include "huagao/hgscanner_error.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
@ -507,11 +508,16 @@ 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)
|
||||
if (SCANNER_ERR_OK == ret)
|
||||
{
|
||||
updateUiEnabled(false);
|
||||
m_isTesting = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
updateUiEnabled(true);
|
||||
m_isTesting = false;
|
||||
}
|
||||
}
|
||||
|
||||
void Form_mainInterface::on_pbtn_showImg_clicked()
|
||||
|
|
|
@ -42,11 +42,13 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
emit m_interface->testFinish();
|
||||
}
|
||||
else if (ev == TEST_EVENT_IO_FAIL)
|
||||
{
|
||||
if (data != nullptr)
|
||||
{
|
||||
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)
|
||||
|
@ -56,6 +58,8 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
emit m_interface->testFinish();
|
||||
}
|
||||
else if (ev == TEST_EVENT_RESULT)
|
||||
{
|
||||
if (data != nullptr)
|
||||
{
|
||||
QString info = QString::fromStdWString((const wchar_t*)data);
|
||||
if (flag)
|
||||
|
@ -64,6 +68,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
info = QObject::tr("failed: ") + info;
|
||||
|
||||
emit m_interface->testResult(info);
|
||||
}
|
||||
emit m_interface->testFinish();
|
||||
}
|
||||
else if (ev == TEST_EVENT_DISTORTION)
|
||||
|
|
Loading…
Reference in New Issue