新增跳过空白页
This commit is contained in:
parent
b909460071
commit
570b84e807
|
@ -161,7 +161,7 @@ hg_scanner::hg_scanner(ScannerSerial serial, const char* dev_name, usb_io* io, i
|
||||||
, is_auto_paper_scan_exit_time(60), is_read_int(true), is_auto_feedmode_(false)
|
, is_auto_paper_scan_exit_time(60), is_read_int(true), is_auto_feedmode_(false)
|
||||||
, firmware_sup_wait_paper_(false),firmware_sup_pick_strength_(false),firmware_sup_log_export_(false),firmware_sup_color_corr_(false),firmware_sup_wake_device_(false)
|
, firmware_sup_wait_paper_(false),firmware_sup_pick_strength_(false),firmware_sup_log_export_(false),firmware_sup_color_corr_(false),firmware_sup_wake_device_(false)
|
||||||
, firmware_sup_double_img(false),firmware_sup_devs_lock_(false),firmware_sup_dpi_300(false),firmware_sup_dpi_600(false),firmware_sup_auto_speed_(false),firmware_sup_morr_(false)
|
, firmware_sup_double_img(false),firmware_sup_devs_lock_(false),firmware_sup_dpi_300(false),firmware_sup_dpi_600(false),firmware_sup_auto_speed_(false),firmware_sup_morr_(false)
|
||||||
, firmware_sup_color_fill_(false),firmware_sup_history_cnt(false), have_max_size(false)
|
, firmware_sup_color_fill_(false),firmware_sup_history_cnt(false), have_max_size(false), is_discardblank(false)
|
||||||
{
|
{
|
||||||
#if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64)
|
#if !defined(_WIN32) && !defined(_WIN64) &&defined(x86_64)
|
||||||
isx86_Advan_ = false;
|
isx86_Advan_ = false;
|
||||||
|
@ -660,6 +660,11 @@ void hg_scanner::init_setting_func_map(void)
|
||||||
setting_map_[SANE_STD_OPT_NAME_FOLD_TYPE] = &hg_scanner::setting_fold_type;
|
setting_map_[SANE_STD_OPT_NAME_FOLD_TYPE] = &hg_scanner::setting_fold_type;
|
||||||
setting_map_[SANE_STD_OPT_NAME_COLOR_CORRECTION] = &hg_scanner::setting_color_correction;
|
setting_map_[SANE_STD_OPT_NAME_COLOR_CORRECTION] = &hg_scanner::setting_color_correction;
|
||||||
setting_map_[SANE_STD_OPT_NAME_WAIT_SCAN_EXIT] = &hg_scanner::setting_auto_paper_scan_exit_time;
|
setting_map_[SANE_STD_OPT_NAME_WAIT_SCAN_EXIT] = &hg_scanner::setting_auto_paper_scan_exit_time;
|
||||||
|
setting_map_[SANE_STD_OPT_NAME_DISCARDBLANK] = &hg_scanner::setting_set_discardblank;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
setting_map_[SANE_STD_OPT_NAME_DEVICE_VID] = &hg_scanner::setting_get_dev_vid;
|
setting_map_[SANE_STD_OPT_NAME_DEVICE_VID] = &hg_scanner::setting_get_dev_vid;
|
||||||
setting_map_[SANE_STD_OPT_NAME_DEVICE_PID] = &hg_scanner::setting_get_dev_pid;
|
setting_map_[SANE_STD_OPT_NAME_DEVICE_PID] = &hg_scanner::setting_get_dev_pid;
|
||||||
|
@ -2770,6 +2775,11 @@ int hg_scanner::setting_get_initial_boot_time(void* data, long* len)
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
int hg_scanner::setting_set_discardblank(void* data, long* len)
|
||||||
|
{
|
||||||
|
is_discardblank = *(bool*)data;
|
||||||
|
return SCANNER_ERR_OK;
|
||||||
|
}
|
||||||
int hg_scanner::on_color_mode_changed(int& color_mode)
|
int hg_scanner::on_color_mode_changed(int& color_mode)
|
||||||
{
|
{
|
||||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||||
|
|
|
@ -240,7 +240,7 @@ protected:
|
||||||
int setting_set_language(void* data, long* len);
|
int setting_set_language(void* data, long* len);
|
||||||
int setting_get_motor_ver(void* data, long* len);
|
int setting_get_motor_ver(void* data, long* len);
|
||||||
int setting_get_initial_boot_time(void* data, long* len);
|
int setting_get_initial_boot_time(void* data, long* len);
|
||||||
|
int setting_set_discardblank(void* data, long* len);
|
||||||
|
|
||||||
virtual void on_device_reconnected(void);
|
virtual void on_device_reconnected(void);
|
||||||
virtual int on_scanner_closing(bool force);
|
virtual int on_scanner_closing(bool force);
|
||||||
|
@ -341,7 +341,8 @@ protected:
|
||||||
bool is_auto_falt; //是否进行平场校正
|
bool is_auto_falt; //是否进行平场校正
|
||||||
bool color_correction_; //是否色彩校正
|
bool color_correction_; //是否色彩校正
|
||||||
int is_auto_paper_scan_exit_time; //待纸扫描退出时间
|
int is_auto_paper_scan_exit_time; //待纸扫描退出时间
|
||||||
bool is_auto_feedmode_; //是否启用自动分纸强度
|
bool is_auto_feedmode_; //是否启用自动分纸强度
|
||||||
|
bool is_discardblank; //是否启动跳过空白页
|
||||||
|
|
||||||
SANE_DISTORTION_VAL distortion_val; //畸变修正结构体保存
|
SANE_DISTORTION_VAL distortion_val; //畸变修正结构体保存
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -341,6 +341,8 @@ namespace local_utility
|
||||||
TRY_MATCH(COLOR_CORRECTION);
|
TRY_MATCH(COLOR_CORRECTION);
|
||||||
TRY_MATCH(LANGUAGE);
|
TRY_MATCH(LANGUAGE);
|
||||||
TRY_MATCH(INITIAL_BOOT_TIME);
|
TRY_MATCH(INITIAL_BOOT_TIME);
|
||||||
|
TRY_MATCH(DISCARDBLANK);
|
||||||
|
|
||||||
//TRY_MATCH(HISTORY_COUNT);
|
//TRY_MATCH(HISTORY_COUNT);
|
||||||
//TRY_MATCH(DRIVER_VERSION);
|
//TRY_MATCH(DRIVER_VERSION);
|
||||||
//TRY_MATCH(MANUFACTURER);
|
//TRY_MATCH(MANUFACTURER);
|
||||||
|
|
Loading…
Reference in New Issue