Merge branch 'master' of http://cd.holdtecs.net:8099/sane/code_production
This commit is contained in:
commit
af28152f17
|
@ -423,21 +423,23 @@ public:
|
||||||
void* get_data = NULL;
|
void* get_data = NULL;
|
||||||
/*parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_RANGE,
|
/*parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_RANGE,
|
||||||
NAME, L"请设置速度模式,值越大速度越快");*/
|
NAME, L"请设置速度模式,值越大速度越快");*/
|
||||||
helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_TIPS, (void*)L"请设置速度模式,值越大速度越快", true);
|
// helper_->test_callback((wchar_t*)data, ui_helper::TEST_EVENT_TIPS, (void*)L"请设置速度模式,值越大速度越快", true);
|
||||||
const wchar_t *range=L"";
|
const wchar_t *range=L"";
|
||||||
const wchar_t G139[6] = { 70,80,90,110};
|
const wchar_t G139[6] = { 70,80,90,110};
|
||||||
const wchar_t G239[6] = { 100,110,120,130};
|
const wchar_t G239[6] = { 100,110,120,130};
|
||||||
const wchar_t G300[6] = { 40,50,60,70 };
|
const wchar_t G300[6] = { 40,50,60,70 };
|
||||||
const wchar_t G400[6] = { 40,50,60,70,80};
|
const wchar_t G400[6] = { 40,50,60,70,80};
|
||||||
|
wchar_t info[128] = L"请设置速度模式,值越大速度越快.";
|
||||||
|
;
|
||||||
if (fw_ == 1 )
|
if (fw_ == 1 )
|
||||||
range = G139;
|
wcscat(info, G139);
|
||||||
else if(fw_ == 2)
|
else if(fw_ == 2)
|
||||||
range = G239;
|
wcscat(info, G239);
|
||||||
else if (fw_ == 3)
|
else if (fw_ == 3)
|
||||||
range = G300;
|
wcscat(info, G300);
|
||||||
else if (fw_ == 4)
|
else if (fw_ == 4)
|
||||||
range = G400;
|
wcscat(info, G400);
|
||||||
|
range = info;
|
||||||
parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_RANGE,
|
parameter* ptr = helper_->get_user_input(ui_helper::DATA_FROM_USER, ui_helper::VAL_TYPE_RANGE,
|
||||||
NAME, range);
|
NAME, range);
|
||||||
|
|
||||||
|
@ -446,11 +448,16 @@ public:
|
||||||
get_data = ptr->get_data();
|
get_data = ptr->get_data();
|
||||||
if (!get_data)
|
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;
|
||||||
}
|
}
|
||||||
num = *((int*)get_data);
|
num = *((int*)get_data);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
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);
|
||||||
return SCANNER_ERR_OK;
|
return SCANNER_ERR_OK;
|
||||||
|
|
Loading…
Reference in New Issue