横向纵向设置239调整

This commit is contained in:
13038267101 2023-03-20 10:01:41 +08:00
parent 323bd217d9
commit 42003bd323
2 changed files with 24 additions and 13 deletions

View File

@ -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;

View File

@ -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)
{ {