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:
gb 2023-06-20 13:34:09 +08:00
parent e6eaefb511
commit 6c4c7535ed
5 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hgdriver/hgdev/hg_scanner_200.cpp
View File

File diff suppressed because one or more lines are too long

12
hgdriver/hgdev/hg_scanner_239.cpp
View File

File diff suppressed because one or more lines are too long

12
hgdriver/hgdev/hg_scanner_300.cpp
View File

File diff suppressed because one or more lines are too long

12
hgdriver/hgdev/hg_scanner_302.cpp
View File

File diff suppressed because one or more lines are too long

13
hgsane/sane_hg_mdw.cpp
View File

@ -2093,13 +2093,12 @@ bool hg_sane_middleware::is_enable_and(scanner_handle hdev, const std::vector<MA
VLOG_MINI_1(LOG_LEVEL_WARNING, "option %s's current value is not found, other options depend it maybe in wrong status.\n", master[i].name.c_str());
continue;
}
enabled &= master[i].compare_val(it->val.c_str(), master[i].limit_l.c_str(), master[i].limit_r.c_str());
if (enabled) // whether parent is enabled
{
const SANE_Option_Descriptor* desc = hg_sane_middleware::instance()->find_stored_descriptor(hdev, master[i].name.c_str());
if (desc && (desc->cap & SANE_CAP_INACTIVE))
enabled = false;
}
else
enabled &= master[i].compare_val(it->val.c_str(), master[i].limit_l.c_str(), master[i].limit_r.c_str());
}
return enabled;
@ -2117,13 +2116,11 @@ bool hg_sane_middleware::is_enable_or(scanner_handle hdev, const std::vector<MAS
continue;
}
enabled |= master[i].compare_val(it->val.c_str(), master[i].limit_l.c_str(), master[i].limit_r.c_str());
if (enabled) // whether parent is enabled
{
const SANE_Option_Descriptor* desc = hg_sane_middleware::instance()->find_stored_descriptor(hdev, master[i].name.c_str());
if (desc && (desc->cap & SANE_CAP_INACTIVE))
enabled = false;
}
else
enabled |= master[i].compare_val(it->val.c_str(), master[i].limit_l.c_str(), master[i].limit_r.c_str());
}
return enabled;