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:
13038267101 2022-12-29 11:22:22 +08:00
parent 014a2674dd
commit 1229deeae3
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
code/base/test_base.cpp
View File

@ -288,7 +288,7 @@ public:
unsigned int len = sizeof(SANE_Bool); unsigned int len = sizeof(SANE_Bool);
int num = 0; int num = 0;
void* get_data = NULL; void* get_data = NULL;
parameter * ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_INT, NAME,L"请歪斜放纸...设置阈值：1 - 5,值越小越容易检测"); parameter * ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_INT, NAME,L"请歪斜放纸...设置阈值：0 - 5,值越小越容易检测,0为关闭歪斜检测");
if (ptr) if (ptr)
{ {
get_data = ptr->get_data(); get_data = ptr->get_data();
@ -299,22 +299,20 @@ public:
} }
num = *((int*)get_data); num = *((int*)get_data);
} }
if (num == 0) else
num = 1;
int ret = helper_->io_control(IO_CTRL_CODE_SET_SKEW_CHECK, &type, &len);
if (ret != SCANNER_ERR_OK)
{ {
return ret; helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出歪斜检测流程", false);
return -1;
} }
type = num == 0 ? false:true;
ptr->release();
int ret = helper_->io_control(IO_CTRL_CODE_SET_SKEW_CHECK, &type, &len);
if (ret != SCANNER_ERR_OK)return ret;
ret = helper_->io_control(IO_CTRL_CODE_SET_SKEW_CHECK_VAL, &num, &len); ret = helper_->io_control(IO_CTRL_CODE_SET_SKEW_CHECK_VAL, &num, &len);
if (ret != SCANNER_ERR_OK) if (ret != SCANNER_ERR_OK)return ret;
{
return ret;
}
ret = helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL);
ret = helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL);
return ret; return ret;
} }
/* 分纸电机检测 */ /* 分纸电机检测 */
@ -355,17 +353,28 @@ public:
unsigned int len = sizeof(SANE_Bool); unsigned int len = sizeof(SANE_Bool);
void* get_data = NULL; void* get_data = NULL;
int ret = SCANNER_ERR_OK; int ret = SCANNER_ERR_OK;
parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_BOOL, NAME, L"请确认是否已放双张测试纸..."); parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_BOOL, NAME,
L"请选择是否开启超声波检查，并且请放置双张纸");
if (ptr) if (ptr)
{ {
get_data = ptr->get_data(); get_data = ptr->get_data();
if (!get_data || (*((bool*)get_data) == false)) if (!get_data)
{ {
helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出超声波模块检测流程", false); helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出超声波模块检测流程", false);
return -1; return -1;
} }
else
type = *((bool*)get_data);
} }
else
{
helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出超声波模块检测流程", false);
return -1;
}
ptr->release();
ret = helper_->io_control(IO_CTRL_CODE_SET_ULTRASONIC_MODULE, &type, &len); ret = helper_->io_control(IO_CTRL_CODE_SET_ULTRASONIC_MODULE, &type, &len);
if (ret != SCANNER_ERR_OK) if (ret != SCANNER_ERR_OK)
{ {
return ret; return ret;
@ -389,23 +398,8 @@ public:
return helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL); return helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL);
} }
/* 开盖传感器检查 */ /* 开盖传感器检查 */
int test_cover_sensor(void *data) //int端点返回 使用单张扫描测试 int test_cover_sensor(void *data) //端点返回 使用单张扫描测试
{ {
const wchar_t* NAME = (wchar_t*)data;
SANE_Bool type = true;
unsigned int len = sizeof(SANE_Bool);
void* get_data = NULL;
int ret = SCANNER_ERR_OK;
parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_BOOL, NAME, L"请确认是否已打开扫描仪盖...");
if (ptr)
{
get_data = ptr->get_data();
if (!get_data || (*((bool*)get_data) == false))
{
helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出开盖传感器检测流程", false);
return -1;
}
}
return helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL); return helper_->io_control(IO_CTRL_CODE_TEST_SINGLE, NULL, NULL);
} }
/* 扫描传感器检查 */ /* 扫描传感器检查 */
@ -461,6 +455,7 @@ public:
helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出--->设置速度模式...", type); helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_RESULT, (void*)L"已退出--->设置速度模式...", type);
return -1; return -1;
} }
ptr->release();
int ret = helper_->io_control(IO_CTRL_CODE_SET_SPEED_MODE, &speed_mode, &len); int ret = helper_->io_control(IO_CTRL_CODE_SET_SPEED_MODE, &speed_mode, &len);
if (ret != SCANNER_ERR_OK) if (ret != SCANNER_ERR_OK)
{ {
@ -510,6 +505,7 @@ public:
/* 重启设备 */ /* 重启设备 */
int test_reboot_device(void *data) int test_reboot_device(void *data)
{ {
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
/* 扫描图像质量确认 */ /* 扫描图像质量确认 */