调整命名

This commit is contained in:
13038267101 2022-11-14 09:16:55 +08:00
parent b488486dd1
commit 6c7252b51d
2 changed files with 42 additions and 42 deletions

View File

@ -347,20 +347,20 @@ void hg_scanner::init_setting_func_map(void)
setting_map_[SANE_STD_OPT_NAME_IS_PHOTO_MODE] = &hg_scanner::setting_keep_watermark; setting_map_[SANE_STD_OPT_NAME_IS_PHOTO_MODE] = &hg_scanner::setting_keep_watermark;
setting_map_[SANE_STD_OPT_NAME_BINARY_THRESHOLD] = &hg_scanner::setting_black_white_threshold; setting_map_[SANE_STD_OPT_NAME_BINARY_THRESHOLD] = &hg_scanner::setting_black_white_threshold;
setting_map_[SANE_STD_OPT_NAME_REVERSE_01] = &hg_scanner::setting_white_pixel_0; setting_map_[SANE_STD_OPT_NAME_REVERSE_01] = &hg_scanner::setting_white_pixel_0;
setting_map_[SANE_STD_OPT_NAME_FEED_STRENGTH] = &hg_scanner::setting_setfeedmode; setting_map_[SANE_STD_OPT_NAME_FEED_STRENGTH] = &hg_scanner::setting_feedmode;
setting_map_[SANE_STD_OPT_NAME_TIME_TO_SLEEP] = &hg_scanner::setting_setsleeptime; setting_map_[SANE_STD_OPT_NAME_TIME_TO_SLEEP] = &hg_scanner::setting_sleeptime;
setting_map_[SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH] = &hg_scanner::setting_set_auto_pick_paper; setting_map_[SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH] = &hg_scanner::setting_auto_pick_paper;
setting_map_[SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE] = &hg_scanner::setting_set_auto_pick_paper_threshold; setting_map_[SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE] = &hg_scanner::setting_auto_pick_paper_threshold;
setting_map_[SANE_STD_OPT_NAME_WAIT_TO_SCAN] = &hg_scanner::setting_set_auto_paper_scan; setting_map_[SANE_STD_OPT_NAME_WAIT_TO_SCAN] = &hg_scanner::setting_auto_paper_scan;
setting_map_[SANE_STD_OPT_NAME_RID_HOLE_L] = &hg_scanner::setting_set_isremove_left_hole; setting_map_[SANE_STD_OPT_NAME_RID_HOLE_L] = &hg_scanner::setting_isremove_left_hole;
setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_L] = &hg_scanner::setting_set_isremove_left_hole_threshold; setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_L] = &hg_scanner::setting_isremove_left_hole_threshold;
setting_map_[SANE_STD_OPT_NAME_RID_HOLE_R] = &hg_scanner::setting_set_isremove_right_hole; setting_map_[SANE_STD_OPT_NAME_RID_HOLE_R] = &hg_scanner::setting_isremove_right_hole;
setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_R] = &hg_scanner::setting_set_isremove_right_hole_threshold; setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_R] = &hg_scanner::setting_isremove_right_hole_threshold;
setting_map_[SANE_STD_OPT_NAME_RID_HOLE_T] = &hg_scanner::setting_set_isremove_top_hole; setting_map_[SANE_STD_OPT_NAME_RID_HOLE_T] = &hg_scanner::setting_isremove_top_hole;
setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_T] = &hg_scanner::setting_set_isremove_top_hole_threshold; setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_T] = &hg_scanner::setting_isremove_top_hole_threshold;
setting_map_[SANE_STD_OPT_NAME_RID_HOLE_B] = &hg_scanner::setting_set_isremove_low_hole; setting_map_[SANE_STD_OPT_NAME_RID_HOLE_B] = &hg_scanner::setting_isremove_low_hole;
setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_B] = &hg_scanner::setting_set_isremove_low_hole_threshold; setting_map_[SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_B] = &hg_scanner::setting_isremove_low_hole_threshold;
setting_map_[SANE_STD_OPT_NAME_FOLD_TYPE] = &hg_scanner::setting_set_fold_type; setting_map_[SANE_STD_OPT_NAME_FOLD_TYPE] = &hg_scanner::setting_fold_type;
} }
std::string hg_scanner::setting_name_from(const char* n_or_id) std::string hg_scanner::setting_name_from(const char* n_or_id)
{ {
@ -2056,7 +2056,7 @@ int hg_scanner::setting_white_pixel_0(void* data)
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_setfeedmode(void* data) int hg_scanner::setting_feedmode(void* data)
{ {
std::string str((char *)data); std::string str((char *)data);
int val = match_best_paper_strength(str,NULL); int val = match_best_paper_strength(str,NULL);
@ -2072,7 +2072,7 @@ int hg_scanner::setting_setfeedmode(void* data)
, (char*)data, hg_scanner_err_name(ret)); , (char*)data, hg_scanner_err_name(ret));
return ret; return ret;
} }
int hg_scanner::setting_setsleeptime(void* data) int hg_scanner::setting_sleeptime(void* data)
{ {
std::string str((char *)data); std::string str((char *)data);
int val = match_best_sleep_time(str,0); int val = match_best_sleep_time(str,0);
@ -2117,7 +2117,7 @@ int hg_scanner::setting_setsleeptime(void* data)
, (char*)data, hg_scanner_err_name(ret)); , (char*)data, hg_scanner_err_name(ret));
return ret; return ret;
} }
int hg_scanner::setting_set_auto_pick_paper(void* data) int hg_scanner::setting_auto_pick_paper(void* data)
{ {
int ret = SCANNER_ERR_OK; int ret = SCANNER_ERR_OK;
bool isautopic = *((bool *)data); bool isautopic = *((bool *)data);
@ -2125,7 +2125,7 @@ int hg_scanner::setting_set_auto_pick_paper(void* data)
return ret; return ret;
} }
int hg_scanner:: setting_set_auto_pick_paper_threshold(void* data) int hg_scanner:: setting_auto_pick_paper_threshold(void* data)
{ {
int ret = SCANNER_ERR_OK; int ret = SCANNER_ERR_OK;
double threshold = *((double*)data); double threshold = *((double*)data);
@ -2133,7 +2133,7 @@ int hg_scanner:: setting_set_auto_pick_paper_threshold(void* data)
return ret; return ret;
} }
int hg_scanner:: setting_set_auto_paper_scan(void* data) int hg_scanner:: setting_auto_paper_scan(void* data)
{ {
is_auto_paper_scan = *((bool *)data); is_auto_paper_scan = *((bool *)data);
if (!is_auto_paper_scan) if (!is_auto_paper_scan)
@ -2142,48 +2142,48 @@ int hg_scanner:: setting_set_auto_paper_scan(void* data)
} }
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_left_hole(void* data) int hg_scanner::setting_isremove_left_hole(void* data)
{ {
isremove_left_hole = *((bool*)data); isremove_left_hole = *((bool*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_right_hole(void* data) int hg_scanner::setting_isremove_right_hole(void* data)
{ {
isremove_right_hole = *((bool*)data); isremove_right_hole = *((bool*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_top_hole(void* data) int hg_scanner::setting_isremove_top_hole(void* data)
{ {
isremove_top_hole = *((bool*)data); isremove_top_hole = *((bool*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_low_hole(void* data) int hg_scanner::setting_isremove_low_hole(void* data)
{ {
isremove_low_hole = *((bool*)data); isremove_low_hole = *((bool*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_left_hole_threshold(void* data) int hg_scanner::setting_isremove_left_hole_threshold(void* data)
{ {
isremove_left_hole_threshold = *((double*)data); isremove_left_hole_threshold = *((double*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_right_hole_threshold(void* data) int hg_scanner::setting_isremove_right_hole_threshold(void* data)
{ {
isremove_right_hole_threshold = *((double*)data); isremove_right_hole_threshold = *((double*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_top_hole_threshold(void* data) int hg_scanner::setting_isremove_top_hole_threshold(void* data)
{ {
isremove_top_hole_threshold = *((double*)data); isremove_top_hole_threshold = *((double*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_isremove_low_hole_threshold(void* data) int hg_scanner::setting_isremove_low_hole_threshold(void* data)
{ {
isremove_low_hole_threshold = *((double*)data); isremove_low_hole_threshold = *((double*)data);
return SCANNER_ERR_OK; return SCANNER_ERR_OK;
} }
int hg_scanner::setting_set_fold_type(void* data) int hg_scanner::setting_fold_type(void* data)
{ {
string str((char*)data); string str((char*)data);
bool exact = NULL; bool exact = NULL;

View File

@ -165,20 +165,20 @@ protected:
int setting_keep_watermark(void* data); int setting_keep_watermark(void* data);
int setting_black_white_threshold(void* data); int setting_black_white_threshold(void* data);
int setting_white_pixel_0(void* data); int setting_white_pixel_0(void* data);
int setting_setfeedmode(void* data); int setting_feedmode(void* data);
int setting_setsleeptime(void* data); int setting_sleeptime(void* data);
int setting_set_auto_pick_paper(void* data); int setting_auto_pick_paper(void* data);
int setting_set_auto_pick_paper_threshold(void* data); int setting_auto_pick_paper_threshold(void* data);
int setting_set_auto_paper_scan(void* data); int setting_auto_paper_scan(void* data);
int setting_set_isremove_left_hole(void* data); int setting_isremove_left_hole(void* data);
int setting_set_isremove_right_hole(void* data); int setting_isremove_right_hole(void* data);
int setting_set_isremove_top_hole(void* data); int setting_isremove_top_hole(void* data);
int setting_set_isremove_low_hole(void* data); int setting_isremove_low_hole(void* data);
int setting_set_isremove_left_hole_threshold(void* data); int setting_isremove_left_hole_threshold(void* data);
int setting_set_isremove_right_hole_threshold(void* data); int setting_isremove_right_hole_threshold(void* data);
int setting_set_isremove_top_hole_threshold(void* data); int setting_isremove_top_hole_threshold(void* data);
int setting_set_isremove_low_hole_threshold(void* data); int setting_isremove_low_hole_threshold(void* data);
int setting_set_fold_type(void* data); int setting_fold_type(void* data);
virtual int on_color_mode_changed(int& color_mode); // COLOR_MODE_xxx virtual int on_color_mode_changed(int& color_mode); // COLOR_MODE_xxx
virtual int on_paper_changed(int& paper); // PAPER_xxx virtual int on_paper_changed(int& paper); // PAPER_xxx