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

fix bug-467: 配置项初始状态，增加对父项禁用状态的判断

This commit is contained in:
gb 2023-06-19 09:44:43 +08:00
parent 640c0c0617
commit 57104089e2
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hgsane/sane_hg_mdw.cpp
View File

@ -1231,7 +1231,7 @@ SANE_Option_Descriptor* hg_sane_middleware::from_json(scanner_handle h, const st
// master = "";
// m->get_value_as_string("cur", master, integer);
// local_utility::trans_language_if_was_word_id(val);
so.enable_now = so.is_enable(so.master, (*it)->cur_vals);
so.enable_now = so.is_enable(h, so.master, (*it)->cur_vals);
if (!so.enable_now)
ret->cap |= SANE_CAP_INACTIVE;
//}
@ -2107,7 +2107,7 @@ bool hg_sane_middleware::compare_val_not_between(const char* cur_val, const char
return !hg_sane_middleware::compare_val_between(cur_val, limit_l, limit_r);
}
bool hg_sane_middleware::is_enable_and(const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals)
bool hg_sane_middleware::is_enable_and(scanner_handle hdev, const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals)
{
// NOTE: logical operator '&&' should get all master's value to check, here we only consider ONE master !!!!
bool enabled = true;
@ -2121,11 +2121,17 @@ bool hg_sane_middleware::is_enable_and(const std::vector<MASTEROP>& master, std:
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;
}
}
return enabled;
}
bool hg_sane_middleware::is_enable_or(const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals)
bool hg_sane_middleware::is_enable_or(scanner_handle hdev, const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals)
{
bool enabled = false;
@ -2139,6 +2145,12 @@ bool hg_sane_middleware::is_enable_or(const std::vector<MASTEROP>& master, std::
}
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;
}
}
return enabled;
@ -2334,7 +2346,7 @@ int hg_sane_middleware::something_after_do(LPDEVINST dev, const char* master_nam
bool enable = changed_options[i].enable;
int bytes = 0;
// if (enable)
enable = dev->slaves[slave].is_enable(dev->slaves[slave].master, dev->cur_vals);
enable = dev->slaves[slave].is_enable(dev->dev, dev->slaves[slave].master, dev->cur_vals);
if (enable == dev->slaves[slave].enable_now)
continue;

6
hgsane/sane_hg_mdw.h
View File

@ -59,7 +59,7 @@ typedef struct _slave_option
std::string name;
bool enable_now;
std::vector<MASTEROP> master;
bool (*is_enable)(const std::vector<MASTEROP>& master
bool (*is_enable)(scanner_handle hdev, const std::vector<MASTEROP>& master
, std::vector<CURVAL>& curvals/*参数全部字符串化*/); // logic 'and', 'or' opertions
}SLAVEOP;
typedef struct _opt_status
@ -168,8 +168,8 @@ class hg_sane_middleware
static bool compare_val_between(const char* cur_val, const char* limit_l, const char* limit_r);
static bool compare_val_not_between(const char* cur_val, const char* limit_l, const char* limit_r);
static bool is_enable_and(const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals);
static bool is_enable_or(const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals);
static bool is_enable_and(scanner_handle hdev, const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals);
static bool is_enable_or(scanner_handle hdev, const std::vector<MASTEROP>& master, std::vector<CURVAL>& curvals);
//std::vector<SLAVEOP> slave_options_;
//std::vector<std::string> master_options_;