From eaf4243787ff8bd7aa7f555f36e458d154694e47 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 11 Oct 2023 17:44:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=8F=8C=E5=BC=A0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.h | 2 +- hgdriver/hgdev/hg_scanner_200.cpp | 4 ++++ hgdriver/hgdev/hg_scanner_200.h | 1 + hgdriver/hgdev/hg_scanner_300.cpp | 4 ++++ hgdriver/hgdev/hg_scanner_300.h | 1 + hgdriver/hgdev/hg_scanner_302.cpp | 4 ++++ hgdriver/hgdev/hg_scanner_302.h | 1 + 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/hgdriver/hgdev/hg_scanner.h b/hgdriver/hgdev/hg_scanner.h index a28be1f..e2f3275 100644 --- a/hgdriver/hgdev/hg_scanner.h +++ b/hgdriver/hgdev/hg_scanner.h @@ -260,7 +260,7 @@ protected: virtual int on_pick_paper_threshold(double threshold) = 0; //设置搓纸阈值 virtual int on_is_auto_paper(bool isautopaper) = 0; //待纸扫描 virtual int on_cis_get_image(bool type) = 0; - virtual int on_process_double_paper(bool type); + virtual int on_process_double_paper(bool type) = 0; //双张图像校验 protected: virtual int set_setting_value(const char* name, void* data, long* len); diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index 9041dbd..a837056 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -664,6 +664,10 @@ int hg_scanner_200::on_cis_get_image(bool isautopaper) dsp_config_.params_dsp.isCorrect = isautopaper == true ? 0 : 1; //0设置获取cis原图，1校正之后的图 return writedown_device_configuration(); } +int hg_scanner_200::on_process_double_paper(bool type) +{ + return SCANNER_ERR_DEVICE_NOT_SUPPORT; +} int hg_scanner_200::on_get_feedmode(int &feedmode) { return SCANNER_ERR_DEVICE_NOT_SUPPORT; diff --git a/hgdriver/hgdev/hg_scanner_200.h b/hgdriver/hgdev/hg_scanner_200.h index 7359d5f..5779b02 100644 --- a/hgdriver/hgdev/hg_scanner_200.h +++ b/hgdriver/hgdev/hg_scanner_200.h @@ -44,6 +44,7 @@ protected: virtual int on_pick_paper_threshold(double threshold) override; //设置搓纸阈值 virtual int on_is_auto_paper(bool isautopaper) override; //待纸扫描 virtual int on_cis_get_image(bool isautopaper) override; //获取cis原图 + virtual int on_process_double_paper(bool type) override; //双张图像校验 public: hg_scanner_200(const char* dev_name,int vid, usb_io* io); ~hg_scanner_200(); diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp index 9c2b756..5ad4876 100644 --- a/hgdriver/hgdev/hg_scanner_300.cpp +++ b/hgdriver/hgdev/hg_scanner_300.cpp @@ -1231,6 +1231,10 @@ int hg_scanner_300::on_cis_get_image(bool isautopaper) dsp_config.params_3288.isCorrect = isautopaper == true ? 0 : 1; return writedown_device_configuration(); } +int hg_scanner_300::on_process_double_paper(bool type) +{ + return SCANNER_ERR_DEVICE_NOT_SUPPORT; +} int hg_scanner_300::on_get_feedmode(int &feedmode) { return SCANNER_ERR_DEVICE_NOT_SUPPORT; diff --git a/hgdriver/hgdev/hg_scanner_300.h b/hgdriver/hgdev/hg_scanner_300.h index 66dd348..3c7b02e 100644 --- a/hgdriver/hgdev/hg_scanner_300.h +++ b/hgdriver/hgdev/hg_scanner_300.h @@ -44,6 +44,7 @@ protected: virtual int on_pick_paper_threshold(double threshold)override; virtual int on_is_auto_paper(bool isautopaper)override; //待纸扫描 virtual int on_cis_get_image(bool isautopaper) override; //cis 原图获取 + virtual int on_process_double_paper(bool type) override; //双张图像校验 public: hg_scanner_300(const char* dev_name,int pid, usb_io* io); diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp index 69c6912..3aeb19f 100644 --- a/hgdriver/hgdev/hg_scanner_302.cpp +++ b/hgdriver/hgdev/hg_scanner_302.cpp @@ -900,6 +900,10 @@ int hg_scanner_302::on_cis_get_image(bool isautopaper) dev_conf_.params_3399.pc_correct = isautopaper; return writedown_device_configuration(); } +int hg_scanner_302::on_process_double_paper(bool type) +{ + return SCANNER_ERR_DEVICE_NOT_SUPPORT; +} void hg_scanner_302::on_device_reconnected(void) { int ret = writedown_device_configuration(); diff --git a/hgdriver/hgdev/hg_scanner_302.h b/hgdriver/hgdev/hg_scanner_302.h index 53c0514..9cd5af8 100644 --- a/hgdriver/hgdev/hg_scanner_302.h +++ b/hgdriver/hgdev/hg_scanner_302.h @@ -75,6 +75,7 @@ protected: virtual int on_pick_paper_threshold(double threshold)override; virtual int on_is_auto_paper(bool isautopaper)override; //待纸扫描 virtual int on_cis_get_image(bool isautopaper) override; //cis 原图获取 + virtual int on_process_double_paper(bool type) override; //双张图像校验 public: