300设备纸张尺寸屏蔽三联试卷
This commit is contained in:
parent
54598d4a54
commit
4c9dd9462b
|
@ -2080,7 +2080,13 @@ int hg_scanner::setting_resolution(void* data, long* len)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DYN_JSON_BETWEEN_PAPER_AND_DPI
|
#ifdef DYN_JSON_BETWEEN_PAPER_AND_DPI
|
||||||
int max_papers[] = { PAPER_MAX_SIZE, PAPER_MAX_SIZE_CLIP, PAPER_TRIGEMINY };
|
|
||||||
|
int max_papers[3] = { PAPER_MAX_SIZE ,PAPER_MAX_SIZE_CLIP , -1};
|
||||||
|
|
||||||
|
if (pid_ != 0x300 || pid_ != 0x302)
|
||||||
|
{
|
||||||
|
max_papers[2] = { PAPER_TRIGEMINY };
|
||||||
|
}
|
||||||
//std::string now(setting_jsn_.at(SANE_STD_OPT_NAME_PAPER).at("range").dump());
|
//std::string now(setting_jsn_.at(SANE_STD_OPT_NAME_PAPER).at("range").dump());
|
||||||
|
|
||||||
if (resolution_ >= 500)
|
if (resolution_ >= 500)
|
||||||
|
@ -2088,6 +2094,9 @@ int hg_scanner::setting_resolution(void* data, long* len)
|
||||||
// erase max papers ...
|
// erase max papers ...
|
||||||
for (auto& v : max_papers)
|
for (auto& v : max_papers)
|
||||||
{
|
{
|
||||||
|
if (v == -1)
|
||||||
|
continue;
|
||||||
|
|
||||||
std::string str(paper_string(v));
|
std::string str(paper_string(v));
|
||||||
int id = lang_get_string_id(str.c_str(), false);
|
int id = lang_get_string_id(str.c_str(), false);
|
||||||
if (id == -1)
|
if (id == -1)
|
||||||
|
@ -2112,6 +2121,9 @@ int hg_scanner::setting_resolution(void* data, long* len)
|
||||||
for (auto& v : max_papers)
|
for (auto& v : max_papers)
|
||||||
{
|
{
|
||||||
std::string str(paper_string(v));
|
std::string str(paper_string(v));
|
||||||
|
if (v == -1)
|
||||||
|
continue;
|
||||||
|
|
||||||
int id = lang_get_string_id(str.c_str(), false), val = 0;
|
int id = lang_get_string_id(str.c_str(), false), val = 0;
|
||||||
bool add = true;
|
bool add = true;
|
||||||
for (int i = 0; i < setting_jsn_.at(SANE_STD_OPT_NAME_PAPER).at("range").size(); ++i)
|
for (int i = 0; i < setting_jsn_.at(SANE_STD_OPT_NAME_PAPER).at("range").size(); ++i)
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue