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 21:17:20 +08:00
parent 02ab609564
commit 47c27e7faf
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
code/base/test_base.cpp
View File

@ -140,7 +140,8 @@ public:
{ {
if ( wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_CIS_ORIGINAL_IMAGE) == 0 if ( wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_CIS_ORIGINAL_IMAGE) == 0
||wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_IMAGE_QUALITY) == 0 ||wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_IMAGE_QUALITY) == 0
||wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_DISTORTION) == 0) ||wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_DISTORTION) == 0
|| wcscmp(set_test_name_.c_str(), HGPDTTOOLDB_NAME_SCANNING_SENSOR) == 0)
{ {
h->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_HAVE_IMAGE, data, true); h->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_HAVE_IMAGE, data, true);
} }
@ -369,7 +370,7 @@ public:
/* 主机风扇功能检测 */ /* 主机风扇功能检测 */
int test_host_fan(void *data) int test_host_fan(void *data)
{ {
return SCANNER_ERR_OK; return helper_->io_control(IO_CTRL_CODE_GET_IMAGE, NULL, NULL);
} }
/* 超声波模块检验 */ /* 超声波模块检验 */
int test_ultrasonic_module(void *data) int test_ultrasonic_module(void *data)
@ -431,7 +432,7 @@ public:
/* 扫描传感器检查 */ /* 扫描传感器检查 */
int test_scanning_sensor(void *data) int test_scanning_sensor(void *data)
{ {
return SCANNER_ERR_OK; return helper_->io_control(IO_CTRL_CODE_GET_IMAGE, NULL, NULL);
} }
/* 配置速度模式 */ /* 配置速度模式 */
int test_configure_speed_mode(void *data) int test_configure_speed_mode(void *data)
@ -466,9 +467,13 @@ public:
speed_mode = *((int*)get_data); speed_mode = *((int*)get_data);
if (fw_ == 3 || fw_ == 4 && speed_mode >= 40 && speed_mode <= 80) if (fw_ == 3 || fw_ == 4 && speed_mode >= 40 && speed_mode <= 80)
{ {
for (size_t i = 1; i < sizeof(G400) / sizeof(G400[0]); i++)//3288ÉèÖÃËÙ¶ÈģʽΪ1 2 3 4 5 for (size_t i = 0; i < sizeof(G400) / sizeof(G400[0]); i++)//3288ÉèÖÃËÙ¶ÈģʽΪ1 2 3 4 5
{ {
speed_mode = G400[i] == speed_mode ? i : 1; if (G400[i] == speed_mode)
{
speed_mode = i + 1;
break;
}
} }
} }
} }
@ -492,8 +497,11 @@ public:
{ {
for (size_t i = 0; i < sizeof(G400) / sizeof(G400[0]); i++)//3288设置速度模式为1 2 3 4 5 for (size_t i = 0; i < sizeof(G400) / sizeof(G400[0]); i++)//3288设置速度模式为1 2 3 4 5
{ {
if (num == i) if ((num -1)== i)
{
save_num = G400[i]; save_num = G400[i];
break;
}
} }
} }
else else
@ -565,16 +573,7 @@ public:
/* 扫描图像质量确认 */ /* 扫描图像质量确认 */
int test_image_quality(void *data) int test_image_quality(void *data)
{ {
const wchar_t* NAME = set_test_name_.c_str(); return helper_->io_control(IO_CTRL_CODE_GET_IMAGE, NULL, NULL);
SANE_Bool type = false;
unsigned int len = sizeof(SANE_Bool);
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_GET_IMAGE, NULL, NULL);
return ret;
} }
/* 色卡纸成像质量评估 */ /* 色卡纸成像质量评估 */
int test_colorcard_imageing_quality(void *data) int test_colorcard_imageing_quality(void *data)