lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

微调

This commit is contained in:
yangjiaxuan 2022-12-30 10:43:17 +08:00
parent 7918c265e8
commit 424238085b
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/HGProductionTool/form_maininterface.cpp
View File

@ -12,6 +12,7 @@
#include "hgscanner.h" #include "hgscanner.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "dialog_excepdesc.h" #include "dialog_excepdesc.h"
#include "huagao/hgscanner_error.h"
typedef struct typedef struct
{ {
@ -507,11 +508,16 @@ void Form_mainInterface::on_pbtn_start_clicked()
QString title = item->text(); QString title = item->text();
QString name = m_map_title_name.value(title).name; QString name = m_map_title_name.value(title).name;
int ret = func_test_go(name.toStdWString().c_str(), L"null", m_hg); int ret = func_test_go(name.toStdWString().c_str(), L"null", m_hg);
if (ret == 0) if (SCANNER_ERR_OK == ret)
{ {
updateUiEnabled(false); updateUiEnabled(false);
m_isTesting = true; m_isTesting = true;
} }
else
{
updateUiEnabled(true);
m_isTesting = false;
}
} }
void Form_mainInterface::on_pbtn_showImg_clicked() void Form_mainInterface::on_pbtn_showImg_clicked()

25
app/HGProductionTool/hgscanner.cpp
View File

@ -43,10 +43,12 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
} }
else if (ev == TEST_EVENT_IO_FAIL) else if (ev == TEST_EVENT_IO_FAIL)
{ {
QString info = QString::fromStdWString((const wchar_t*)data); if (data != nullptr)
info = QObject::tr("failed: ") + info; {
QString info = QString::fromStdWString((const wchar_t*)data);
emit m_interface->testResult(info); info = QObject::tr("failed: ") + info;
emit m_interface->testResult(info);
}
emit m_interface->testFinish(); emit m_interface->testFinish();
} }
else if (ev == TEST_EVENT_MANUAL_CONFIRMATION) else if (ev == TEST_EVENT_MANUAL_CONFIRMATION)
@ -57,13 +59,16 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
} }
else if (ev == TEST_EVENT_RESULT) else if (ev == TEST_EVENT_RESULT)
{ {
QString info = QString::fromStdWString((const wchar_t*)data); if (data != nullptr)
if (flag) {
info = QObject::tr("success: ") + info; QString info = QString::fromStdWString((const wchar_t*)data);
else if (flag)
info = QObject::tr("failed: ") + info; info = QObject::tr("success: ") + info;
else
info = QObject::tr("failed: ") + info;
emit m_interface->testResult(info); emit m_interface->testResult(info);
}
emit m_interface->testFinish(); emit m_interface->testFinish();
} }
else if (ev == TEST_EVENT_DISTORTION) else if (ev == TEST_EVENT_DISTORTION)