lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整自定义裁切和部分尺寸检测 进行切换时导致 尺寸检测还能使用

This commit is contained in:
mo1027728827@qq.com 2022-06-09 16:49:32 +08:00
parent f4985cffc6
commit 7a776486ac
5 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hgdriver/hgdev/hg_scanner_200.cpp
View File

@ -1153,6 +1153,18 @@ else
else if ((image_prc_param_.bits.multi_out == MULTI_OUT_ALL ||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_GRAY||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_BW) && is_multiout)
{
ic.pixtype = 2;
}
//自定义裁切
if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
||image_prc_param_.bits.paper == PAPER_MAX_SIZE
||image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
||image_prc_param_.bits.paper == PAPER_TRIGEMINY
||image_prc_param_.bits.paper == PAPER_16K
||image_prc_param_.bits.paper == PAPER_8K
||image_prc_param_.bits.paper == PAPER_16K_LATERAL
)
{
ic.cropRect.enable = false;
}
img_conf_ = ic;

19
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -924,6 +924,18 @@ else
{
ic.pixtype = 2;
}
//自定义裁切
if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
||image_prc_param_.bits.paper == PAPER_MAX_SIZE
||image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
||image_prc_param_.bits.paper == PAPER_TRIGEMINY
||image_prc_param_.bits.paper == PAPER_16K
||image_prc_param_.bits.paper == PAPER_8K
||image_prc_param_.bits.paper == PAPER_16K_LATERAL
)
{
ic.cropRect.enable = false;
}
{
std::lock_guard<std::mutex> lock(io_lock_);
@ -1302,8 +1314,11 @@ int hg_scanner_239::on_paper_check_changed(bool& check)
}
if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
||image_prc_param_.bits.paper == PAPER_MAX_SIZE
||image_prc_param_.bits.paper ==PAPER_MAX_SIZE_CLIP
||image_prc_param_.bits.paper ==PAPER_TRIGEMINY
||image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
||image_prc_param_.bits.paper == PAPER_TRIGEMINY
||image_prc_param_.bits.paper == PAPER_16K
||image_prc_param_.bits.paper == PAPER_8K
||image_prc_param_.bits.paper == PAPER_16K_LATERAL
)
{
HGSCANCONF *d = &dev_conf_;

13
hgdriver/hgdev/hg_scanner_300.cpp
View File

@ -1072,7 +1072,18 @@ else
{
ic.pixtype = 2;
}
//自定义裁切
if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
||image_prc_param_.bits.paper == PAPER_MAX_SIZE
||image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
||image_prc_param_.bits.paper == PAPER_TRIGEMINY
||image_prc_param_.bits.paper == PAPER_16K
||image_prc_param_.bits.paper == PAPER_8K
||image_prc_param_.bits.paper == PAPER_16K_LATERAL
)
{
ic.cropRect.enable = false;
}
img_conf_ = ic;
int ret = agreement((TwSS)img_conf_.papertype,img_conf_.paperAlign);

12
hgdriver/hgdev/hg_scanner_400.cpp
View File

@ -1087,6 +1087,18 @@ void hg_scanner_400::writedown_image_configuration(void)
else if ((image_prc_param_.bits.multi_out == MULTI_OUT_ALL ||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_GRAY||image_prc_param_.bits.multi_out == MULTI_COLOR_AND_BW) && is_multiout)
{
ic.pixtype = 2;
}
//自定义裁切
if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
||image_prc_param_.bits.paper == PAPER_MAX_SIZE
||image_prc_param_.bits.paper == PAPER_MAX_SIZE_CLIP
||image_prc_param_.bits.paper == PAPER_TRIGEMINY
||image_prc_param_.bits.paper == PAPER_16K
||image_prc_param_.bits.paper == PAPER_8K
||image_prc_param_.bits.paper == PAPER_16K_LATERAL
)
{
ic.cropRect.enable = false;
}
img_conf_ = ic;

8
hgdriver/hgdev/scanner_manager.cpp
View File

@ -24,20 +24,20 @@ static struct
std::string rsc; // USB resource, version-addr. e.g. "USB2.0-1"
}
g_supporting_devices[] = {
//#ifdef OEM_LISICHENG
#ifdef OEM_LISICHENG
{0x31c9, 0x8420, SCANNER_NAME_LSC_G42S, "G426xF", ""}
, {0x31c9, 0x8520, SCANNER_NAME_LSC_G52S, "G52x0F", ""}
, {0x31c9, 0x8620, SCANNER_NAME_LSC_G62S, "G6290U", ""}
, {0x31c9, 0x8629, SCANNER_NAME_LSC_G62S, "G6290U", ""}
, {0x31c9, 0x8730, SCANNER_NAME_LSC_G73S, "G73x0U", ""}
, {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""},
//#endif
//#ifdef OEM_HANWANG
#endif
#ifdef OEM_HANWANG
{0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""}
, {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", ""}
, {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", ""}
, {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""},
//#endif
#endif
{0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""}
, {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", ""}
, {0x3072, 0x300, SCANNER_NAME_HG_G300, "GScanO400", ""}