Compare commits
2 Commits
3b57fa8c56
...
42003bd323
Author | SHA1 | Date |
---|---|---|
13038267101 | 42003bd323 | |
13038267101 | 323bd217d9 |
|
@ -3623,7 +3623,7 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
|
||||||
{
|
{
|
||||||
return set_distortion_image(*((bool*)data));
|
return set_distortion_image(*((bool*)data));
|
||||||
}
|
}
|
||||||
else if(code == IO_CTRL_CODE_GET_DISTORTION_CHECK_VAL)
|
else if(code == IO_CTRL_CODE_GET_PC_DISTORTION_CHECK_VAL)
|
||||||
{
|
{
|
||||||
if (distortion_val.h > 0)
|
if (distortion_val.h > 0)
|
||||||
{
|
{
|
||||||
|
@ -3632,7 +3632,7 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
|
||||||
return SCANNER_ERR_OK;
|
return SCANNER_ERR_OK;
|
||||||
//return get_distortion_check_val(*((int*)data));
|
//return get_distortion_check_val(*((int*)data));
|
||||||
}
|
}
|
||||||
else if(code == IO_CTRL_CODE_SET_DISTORTION_CHECK_VAL)
|
else if(code == IO_CTRL_CODE_SET_DISTORTION_DEVS_CHECK_VAL)
|
||||||
{
|
{
|
||||||
return set_devs_distortion_check_val(*((float*)data));
|
return set_devs_distortion_check_val(*((float*)data));
|
||||||
}
|
}
|
||||||
|
|
|
@ -273,26 +273,26 @@ int hg_scanner_239::get_speed_mode(int& data)
|
||||||
int hg_scanner_239::set_devs_distortion_check_val(float data)
|
int hg_scanner_239::set_devs_distortion_check_val(float data)
|
||||||
{
|
{
|
||||||
int val = *(int*)&data;
|
int val = *(int*)&data;
|
||||||
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_SET_H_200_RATIO;
|
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
if (resolution_ <= 200)
|
if (resolution_ <= 200)
|
||||||
ratio = setting3399::SR_SET_H_200_RATIO;
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
else if (resolution_ > 200 && resolution_ <= 300)
|
else if (resolution_ > 200 && resolution_ <= 300)
|
||||||
ratio = setting3399::SR_SET_H_300_RATIO;
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
else if (resolution_ > 300 && resolution_ <= 600)
|
else if (resolution_ > 300 && resolution_ <= 600)
|
||||||
ratio = setting3399::SR_SET_H_600_RATIO;
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
|
|
||||||
return write_register(ratio, val);
|
return write_register(ratio, val);
|
||||||
}
|
}
|
||||||
int hg_scanner_239::get_devs_distortion_check_val(float& data)
|
int hg_scanner_239::get_devs_distortion_check_val(float& data)
|
||||||
{
|
{
|
||||||
int val = 0;
|
int val = 0;
|
||||||
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_SET_H_200_RATIO;
|
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
if (resolution_ <= 200)
|
if (resolution_ <= 200)
|
||||||
ratio = setting3399::SR_GET_H_200_RATIO;
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
else if (resolution_ > 200 && resolution_ <= 300)
|
else if (resolution_ > 200 && resolution_ <= 300)
|
||||||
ratio = setting3399::SR_GET_H_300_RATIO;
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
else if (resolution_ > 300 && resolution_ <= 600)
|
else if (resolution_ > 300 && resolution_ <= 600)
|
||||||
ratio = setting3399::SR_GET_H_600_RATIO;
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
|
|
||||||
int ret = read_register(ratio, &val);
|
int ret = read_register(ratio, &val);
|
||||||
data = *(float*)&val;
|
data = *(float*)&val;
|
||||||
|
@ -1035,7 +1035,7 @@ void hg_scanner_239::thread_correction(void)
|
||||||
if (info->Code == 4)
|
if (info->Code == 4)
|
||||||
{
|
{
|
||||||
status_ = SCANNER_ERR_DEVICE_AUTO_FAIL_OVER;
|
status_ = SCANNER_ERR_DEVICE_AUTO_FAIL_OVER;
|
||||||
notify_ui_working_status(buf, SANE_EVENT_STATUS, status_);
|
//notify_ui_working_status(buf, SANE_EVENT_STATUS, status_);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
//break;
|
//break;
|
||||||
|
|
|
@ -1301,19 +1301,30 @@ int hg_scanner_302::get_speed_mode(int& data)
|
||||||
}
|
}
|
||||||
int hg_scanner_302::set_devs_distortion_check_val(float data)
|
int hg_scanner_302::set_devs_distortion_check_val(float data)
|
||||||
{
|
{
|
||||||
setting3399::Scanner_Reg_Defs retio = setting3399::SR_SET_H_200_RATIO;
|
setting3399::Scanner_Reg_Defs retio = setting3399::SR_SET_V_200_RATIO;
|
||||||
if (resolution_ <= 200)
|
if (resolution_ <= 200)
|
||||||
retio = setting3399::SR_SET_H_200_RATIO;
|
retio = setting3399::SR_SET_V_200_RATIO;
|
||||||
else if (resolution_ > 200 && resolution_ <= 300)
|
else if (resolution_ > 200 && resolution_ <= 300)
|
||||||
retio = setting3399::SR_SET_H_300_RATIO;
|
retio = setting3399::SR_SET_V_200_RATIO;
|
||||||
else if (resolution_ > 300 && resolution_ <= 600)
|
else if (resolution_ > 300 && resolution_ <= 600)
|
||||||
retio = setting3399::SR_SET_H_600_RATIO;
|
retio = setting3399::SR_SET_V_200_RATIO;
|
||||||
|
|
||||||
return write_register(retio, *(int*)&save_dpi_color_check_val);
|
return write_register(retio, *(int*)&save_dpi_color_check_val);
|
||||||
}
|
}
|
||||||
int hg_scanner_302::get_devs_distortion_check_val(float& data)
|
int hg_scanner_302::get_devs_distortion_check_val(float& data)
|
||||||
{
|
{
|
||||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
int val = 0;
|
||||||
|
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
|
if (resolution_ <= 200)
|
||||||
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
|
else if (resolution_ > 200 && resolution_ <= 300)
|
||||||
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
|
else if (resolution_ > 300 && resolution_ <= 600)
|
||||||
|
ratio = setting3399::SR_SET_V_200_RATIO;
|
||||||
|
|
||||||
|
int ret = read_register(ratio, &val);
|
||||||
|
data = *(float*)&val;
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
int hg_scanner_302::set_auto_flat(int data)
|
int hg_scanner_302::set_auto_flat(int data)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue