lmh188
/
twain3.0
mirror of http://192.168.1.51:8099/lmh188/twain3.0
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整除红配置

This commit is contained in:
masayume 2022-11-18 13:56:31 +08:00
parent 64de1a9622
commit 1c14c43896
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
huagao/Device/GScanO1003399.cpp
View File

@ -283,7 +283,7 @@ void GScanO1003399::config_params(GScanCap& param)
// cfg.g200params.paper = SupPaperTyps_39.count(ps) > 0 ? SupPaperTyps_39[ps] : 0; // cfg.g200params.paper = SupPaperTyps_39.count(ps) > 0 ? SupPaperTyps_39[ps] : 0;
//} //}
if (param.filter != 3 || param.enhance_color != 0 || param.hsvcorrect||param.hsvFilter!=0||param.fadeback!=0) if (param.filter != 3 || param.enhance_color != 0 || param.hsvcorrect )//|| param.hsvFilter != 0 || param.fadeback != 0)
cfg.g200params.color = 1;//color cfg.g200params.color = 1;//color
else else
{ {

2
huagao/Device/ImageMatQueue.cpp
View File

@ -773,7 +773,7 @@ void ImageMatQueue::duplex_process(CacheInfo info)
if (scanParam.pixtype == 1 && mats[i].channels() == 3)//gray if (scanParam.pixtype == 1 && mats[i].channels() == 3)//gray
cv::cvtColor(mats[i], mats[i], COLOR_BGR2GRAY); cv::cvtColor(mats[i], mats[i], COLOR_BGR2GRAY);
#else #else
if (scanParam.pixtype == 1 && (scanParam.hsvcorrect || scanParam.fadeback))// && scanParam.hsvcorrect if (scanParam.pixtype == 1 && (scanParam.hsvcorrect || scanParam.fadeback || scanParam.hsvFilter))// && scanParam.hsvcorrect
if (mats[i].channels() == 3) if (mats[i].channels() == 3)
cvtColor(mats[i], mats[i], cv::COLOR_BGR2GRAY); cvtColor(mats[i], mats[i], cv::COLOR_BGR2GRAY);
#endif #endif

16
huagao/GscanJsonConfig.cpp
View File

@ -140,6 +140,7 @@ void GscanJsonConfig::SaveGscanCapConfig(const GScanCap & gcap, const std::strin
outJson["Config"].Add(FADEBACK, (bool)(gcap.fadeback), false); outJson["Config"].Add(FADEBACK, (bool)(gcap.fadeback), false);
outJson["Config"].Add(FADEBACKRANGE, (int)(gcap.fadeback_range)); outJson["Config"].Add(FADEBACKRANGE, (int)(gcap.fadeback_range));
outJson["Config"].Add(HSVCORRECT, (bool)(gcap.hsvcorrect),false); outJson["Config"].Add(HSVCORRECT, (bool)(gcap.hsvcorrect),false);
outJson["Config"].Add(ANSWERSHEETFILTER, (int)(gcap.hsvFilter));
outJson["Config"].Add(ULTRADETECT, (bool)(gcap.hardwarecaps.en_doublefeed), false); outJson["Config"].Add(ULTRADETECT, (bool)(gcap.hardwarecaps.en_doublefeed), false);
outJson["Config"].Add(BINDINGDETECT, (bool)(gcap.hardwarecaps.en_stapledetect), false); outJson["Config"].Add(BINDINGDETECT, (bool)(gcap.hardwarecaps.en_stapledetect), false);
@ -217,7 +218,8 @@ void GscanJsonConfig::WriteJsonArrayToFile(std::vector<GScanCap> cfgArray, const
root["Config"].AddEmptySubArray(EN_OUTHOLERATIOLEFT); root["Config"].AddEmptySubArray(EN_OUTHOLERATIOLEFT);
root["Config"].AddEmptySubArray(EN_OUTHOLERATIORIGHT); root["Config"].AddEmptySubArray(EN_OUTHOLERATIORIGHT);
root["Config"].AddEmptySubArray(HSVCORRECT); root["Config"].AddEmptySubArray(HSVCORRECT);
root["Config"].AddEmptySubArray(ANSWERSHEETFILTER);
/*< feeder settings*/ /*< feeder settings*/
root["Config"].AddEmptySubArray(ULTRADETECT); root["Config"].AddEmptySubArray(ULTRADETECT);
root["Config"].AddEmptySubArray(BINDINGDETECT); root["Config"].AddEmptySubArray(BINDINGDETECT);
@ -290,7 +292,8 @@ void GscanJsonConfig::WriteJsonArrayToFile(std::vector<GScanCap> cfgArray, const
root["Config"][FADEBACK].Add(i, (bool)cfgArray[i].fadeback); root["Config"][FADEBACK].Add(i, (bool)cfgArray[i].fadeback);
root["Config"][FADEBACKRANGE].Add((int)cfgArray[i].fadeback_range); root["Config"][FADEBACKRANGE].Add((int)cfgArray[i].fadeback_range);
root["Config"][HSVCORRECT].Add(i, (bool)cfgArray[i].hsvcorrect); root["Config"][HSVCORRECT].Add(i, (bool)cfgArray[i].hsvcorrect);
root["Config"][ANSWERSHEETFILTER].Add((int)cfgArray[i].hsvFilter);
root["Config"][ULTRADETECT].Add(i, (bool)cfgArray[i].hardwarecaps.en_doublefeed); root["Config"][ULTRADETECT].Add(i, (bool)cfgArray[i].hardwarecaps.en_doublefeed);
root["Config"][BINDINGDETECT].Add(i, (bool)cfgArray[i].hardwarecaps.en_stapledetect); root["Config"][BINDINGDETECT].Add(i, (bool)cfgArray[i].hardwarecaps.en_stapledetect);
root["Config"][AUTOPAPER].Add(i, (bool)cfgArray[i].hardwarecaps.is_autopaper); root["Config"][AUTOPAPER].Add(i, (bool)cfgArray[i].hardwarecaps.is_autopaper);
@ -508,6 +511,9 @@ std::vector<GScanCap> GscanJsonConfig::parseJsonFromString(const std::string str
root["Config"].Get(FADEBACKRANGE, itmFadeBackValue); root["Config"].Get(FADEBACKRANGE, itmFadeBackValue);
neb::CJsonObject itmHsvCorrect; neb::CJsonObject itmHsvCorrect;
root["Config"].Get(HSVCORRECT, itmHsvCorrect); root["Config"].Get(HSVCORRECT, itmHsvCorrect);
neb::CJsonObject itmHsvfilter;
root["Config"].Get(ANSWERSHEETFILTER, itmHsvfilter);
neb::CJsonObject itmUltDetect; neb::CJsonObject itmUltDetect;
root["Config"].Get(ULTRADETECT, itmUltDetect); root["Config"].Get(ULTRADETECT, itmUltDetect);
@ -658,6 +664,8 @@ std::vector<GScanCap> GscanJsonConfig::parseJsonFromString(const std::string str
cfp.fadeback_range = i_value; cfp.fadeback_range = i_value;
itmHsvCorrect.Get(i, b_value); itmHsvCorrect.Get(i, b_value);
cfp.hsvcorrect = b_value ? 1 : 0; cfp.hsvcorrect = b_value ? 1 : 0;
itmHsvfilter.Get(i, i_value);
cfp.hsvFilter = i_value;
itmUltDetect.Get(i, b_value); itmUltDetect.Get(i, b_value);
cfp.hardwarecaps.en_doublefeed = b_value ? 1 : 0; cfp.hardwarecaps.en_doublefeed = b_value ? 1 : 0;
@ -807,6 +815,10 @@ std::vector<GScanCap> GscanJsonConfig::parseJsonFromString(const std::string str
cfp.fadeback_range = index; cfp.fadeback_range = index;
root["Config"].Get(HSVCORRECT, bvalue); root["Config"].Get(HSVCORRECT, bvalue);
cfp.hsvcorrect = bvalue ? 1 : 0; cfp.hsvcorrect = bvalue ? 1 : 0;
root["Config"].Get(ANSWERSHEETFILTER, index);
cfp.hsvFilter = index;
root["Config"].Get(NOISE, index); root["Config"].Get(NOISE, index);
cfp.noise = index; cfp.noise = index;
root["Config"].Get(INDENT, index); root["Config"].Get(INDENT, index);