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

修复Range-step转换BUG

This commit is contained in:
gb 2022-09-24 12:33:47 +08:00
parent 1f52aea78c
commit 1e56c23fcb
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sane/s2t_api.h
View File

@ -383,6 +383,7 @@ namespace sane_opts
{ \ { \
sane_opts::get_opts<type> op(cur, init, NULL, NULL, low, up, step); \ sane_opts::get_opts<type> op(cur, init, NULL, NULL, low, up, step); \
object->get_value(ind, sane_opts::set_opt_value<type>, &op);\ object->get_value(ind, sane_opts::set_opt_value<type>, &op);\
if(step && fabs(*step) < .000001) *step = 1; \
} \ } \
} }
#define SET_SANE_OPT(ret, object, id_name, val) \ #define SET_SANE_OPT(ret, object, id_name, val) \

22
twain/twain/huagaods.cpp
View File

@ -577,13 +577,21 @@ int to_sane_enhance(Filter twain)
return FILTER_NONE; return FILTER_NONE;
} }
float trans_range(float val, float min_from, float max_from, float min_to, float max_to) float trans_range(float val, float min_from, float max_from, float min_to, float max_to, bool for_step = false)
{ {
// transfer val in range [min_from, max_from] to value in range [min_to, max_to] // transfer val in range [min_from, max_from] to value in range [min_to, max_to]
val -= min_from; if (for_step)
val /= max_from - min_from; {
val *= max_to - min_to; val /= max_from - min_from;
val += min_to; val *= max_to - min_to;
}
else
{
val -= min_from;
val /= max_from - min_from;
val *= max_to - min_to;
val += min_to;
}
return val; return val;
} }
@ -2064,7 +2072,7 @@ void huagao_ds::init_support_caps(void)
int init = 128, l = 1, u = 255, step = 1, now = 128; int init = 128, l = 1, u = 255, step = 1, now = 128;
int ret = SCANNER_ERR_OK; int ret = SCANNER_ERR_OK;
GET_SANE_OPT_RANGE(int, scanner_, bright, &now, &init, &l, &u, &step); GET_SANE_OPT_RANGE(int, scanner_, bright, &now, &init, &l, &u, &step);
float sf = trans_range((float)step, (float)l, (float)u, -1000.0f, 1000.0f), float sf = trans_range((float)step, (float)l, (float)u, -1000.0f, 1000.0f, true),
nf = trans_range((float)now, (float)l, (float)u, -1000.0f, 1000.0f), nf = trans_range((float)now, (float)l, (float)u, -1000.0f, 1000.0f),
initf = trans_range((float)init, (float)l, (float)u, -1000.0f, 1000.0f); initf = trans_range((float)init, (float)l, (float)u, -1000.0f, 1000.0f);
switch (msg) { switch (msg) {
@ -2098,7 +2106,7 @@ void huagao_ds::init_support_caps(void)
int init = 4, l = 1, u = 7, step = 1, now = 4; int init = 4, l = 1, u = 7, step = 1, now = 4;
int ret = SCANNER_ERR_OK; int ret = SCANNER_ERR_OK;
GET_SANE_OPT_RANGE(int, scanner_, contrast, &now, &init, &l, &u, &step); GET_SANE_OPT_RANGE(int, scanner_, contrast, &now, &init, &l, &u, &step);
float sf = trans_range((float)step, (float)l, (float)u, -1000.0f, 1000.0f), float sf = trans_range((float)step, (float)l, (float)u, -1000.0f, 1000.0f, true),
nf = trans_range((float)now, (float)l, (float)u, -1000.0f, 1000.0f), nf = trans_range((float)now, (float)l, (float)u, -1000.0f, 1000.0f),
initf = trans_range((float)init, (float)l, (float)u, -1000.0f, 1000.0f); initf = trans_range((float)init, (float)l, (float)u, -1000.0f, 1000.0f);
switch (msg) { switch (msg) {