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

兼容领亿……第三方APP，取图模式与之前设置的XferMech不同，图像数据放到取图的时候根据实际的模式进行准备；添加打开设备时的日志

This commit is contained in:
gb 2023-12-12 09:14:31 +08:00
parent b071d7d4b7
commit 515003e0e5
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sane/scanned_img.cpp
View File

@ -385,7 +385,7 @@ scanned_img::scanned_img(SANE_Handle dev, SANE_Parameters head, void* data, unsi
, twain_xfer xfer, SANE_FinalImgFormat* fmt) : head_(head), dpi_(dpi), header_size_(0) , twain_xfer xfer, SANE_FinalImgFormat* fmt) : head_(head), dpi_(dpi), header_size_(0)
, file_(tmp_file ? tmp_file : L""), dev_(dev), status_(IMG_STATUS_OK) , file_(tmp_file ? tmp_file : L""), dev_(dev), status_(IMG_STATUS_OK)
{ {
const bool prepare_data = true; const bool prepare_data = false; // Compatible with apps that have different actual image retrieval modes from the previously set modes, the data is re-organized at fetch - prepare_data_for_transfer
if (fmt) if (fmt)
fmt_ = *fmt; fmt_ = *fmt;

28
twain/twain/huagaods.cpp
View File

@ -972,7 +972,7 @@ Twpp::Result huagao_ds::deviceEventGet(const Twpp::Identity& origin, Twpp::Devic
Result huagao_ds::identityOpenDs(const Identity& id) Result huagao_ds::identityOpenDs(const Identity& id)
{ {
//singleton_ = CreateMutexA(NULL, FALSE, "LookitApp"); //singleton_ = CreateMutexA(NULL, FALSE, "LookitApp");
//if (GetLastError() == ERROR_ALREADY_EXISTS) { //婵″倹鐏夊鑼病鐎涙ê婀崥灞芥倳閻ㄥ嚜utex娴兼艾绶遍崚鎷岀箹娑擃亪鏁婄拠? //if (GetLastError() == ERROR_ALREADY_EXISTS) { //蟀ｵ窶ｳ蛟ｹ髏丞､基<EFBFBD>髑ｼ﨡ら羅髏取ｶ凖ｪ蟀€﨟亥ｴ･轣櫁冠蛟ｳ髢ｻ繖･蝴忖tex螽ｴ蜈ｼ濶ｾ扈ｶ驕榊ｴ夐執蟯€邂ｹ螽第塔莠ｪ髀∝ｩ<EFBFBD><EFBFBD>?
// CloseHandle(singleton_); // CloseHandle(singleton_);
// singleton_ = NULL; // singleton_ = NULL;
// showmsg("閹绘劗銇?, 202); // showmsg("閹绘劗銇?, 202);
@ -983,8 +983,9 @@ Result huagao_ds::identityOpenDs(const Identity& id)
load_sane_util::initialize(me_); load_sane_util::initialize(me_);
if (!load_sane_util::is_ok()) if (!load_sane_util::is_ok())
{ {
CloseHandle(singleton_); //CloseHandle(singleton_);
singleton_ = NULL; //singleton_ = NULL;
load_sane_util::to_log(1, L"huagao_ds::identityOpenDs: %s\r\n", "load_sane_util::initialize failed");
return bummer(); return bummer();
} }
@ -996,9 +997,10 @@ Result huagao_ds::identityOpenDs(const Identity& id)
if (result.returnCode() != ReturnCode::Success) if (result.returnCode() != ReturnCode::Success)
{ {
CloseHandle(singleton_); //CloseHandle(singleton_);
singleton_ = NULL; //singleton_ = NULL;
load_sane_util::uninitialize(); load_sane_util::uninitialize();
load_sane_util::to_log(1, L"huagao_ds::identityOpenDs: selectIdentity failed: %d\r\n", (int)result.status());
return result; return result;
} }
@ -1043,7 +1045,7 @@ Result huagao_ds::identityOpenDs(const Identity& id)
name = wcsrchr(pe, L'\\'); name = wcsrchr(pe, L'\\');
if (name++ == NULL) if (name++ == NULL)
name = pe; name = pe;
if (wcsicmp(name, L"\u597D\u5206\u6570\u9605\u5377\u626B\u63CF\u7AEF.exe") == 0) // 爱云校PE：好分数阅卷扫描端.exe if (wcsicmp(name, L"\u597D\u5206\u6570\u9605\u5377\u626B\u63CF\u7AEF.exe") == 0) // 辷ｱ莠第<EFBFBD>｡PE<EFBFBD>壼･ｽ蛻<EFBFBD>焚髦<EFBFBD>差謇ｫ謠冗ｫ?exe
double_check_mode_ = DOUBLE_CHECK_ULTRASONIC; double_check_mode_ = DOUBLE_CHECK_ULTRASONIC;
else else
double_check_mode_ = DOUBLE_CHECK_TWAIN; double_check_mode_ = DOUBLE_CHECK_TWAIN;
@ -1104,7 +1106,7 @@ Result huagao_ds::pendingXfersGet(const Identity&, PendingXfers& data)
// 显示设置界面时，不能阻塞在EndXfer，否则最后一张图片传输后显示不出来，故在此做阻塞调用 // 显示设置界面时，不能阻塞在EndXfer，否则最后一张图片传输后显示不出来，故在此做阻塞调用
int cnt = get_scanned_image_count(-1); int cnt = get_scanned_image_count(-1);
// FIX-2023-05-29: 是否保持设置界面显示，由APP决定，此处不再由是否显示UI来决定，保持一个扫描流程正常结束 // FIX-2023-05-29: 譏ｯ蜷ｦ菫晄戟隶ｾ鄂ｮ逡碁擇譏ｾ遉ｺ<EFBFBD>檎罰APP蜀ｳ螳夲ｼ梧ｭ､螟<EFBFBD>ｸ榊<EFBFBD>逕ｱ譏ｯ蜷ｦ譏ｾ遉ｺUI譚･蜀ｳ螳夲ｼ御ｿ晄戟荳€荳ｪ謇ｫ謠乗ｵ∫ｨ区ｭ｣蟶ｸ扈捺<EFBFBD>?
//int cnt = show_setting_ ? 1 : get_scanned_image_count(-1); //int cnt = show_setting_ ? 1 : get_scanned_image_count(-1);
data.setCount(cnt); data.setCount(cnt);
@ -1286,9 +1288,9 @@ Result huagao_ds::imageInfoGet(const Identity&, ImageInfo& data)
//if (!scanner_->wait_image()) //if (!scanner_->wait_image())
//{ //{
//// notifyCloseOk(); //// notifyCloseOk();
// return success(); // 婵傝棄鍨庨弫浼存付鐟曚浇绻戦崶鐐村灇閸? // return success(); // 蟀ｵ蛯晄｣<EFBFBD>昏蠎ｨ蠑ｫ豬ｼ蟄倅ｻ倬澄譖壽ｵ<EFBFBD>ｻｻ謌ｦ蟠ｶ髏先搗轣<EFBFBD><EFBFBD>?
//} //}
if (get_scanned_image_count(-1) > 0) // 閺勫墽銇氱拋鍓х枂閻ｅ矂娼伴弮璁圭礉娑撳秷鍏橀梼璇差敚閸︹€dXfer閿涘苯鎯侀崚娆愭付閸氬簼绔村鐘叉禈閻楀洣绱舵潏鎾虫倵閺勫墽銇氭稉宥呭毉閺夈儻绱濋弫鍛躬濮濄倕浠涢梼璇差敚鐠嬪啰鏁? if (get_scanned_image_count(-1) > 0) // 髢ｺ蜍ｫ蠅ｽ驫<EFBFBD>ｰｱ諡矩酷ﾑ<EFBFBD>桙髢ｻ<EFBFBD><EFBFBD>氓螽ｼ莨ｴ蠑ｮ迺∝惆遉牙ｨ第諜遘ｷ骰乗ｩ€譴ｼ迺<EFBFBD>ｷｮ謨夐椋<EFBFBD>ｹ竄ｬ遧ｴdXfer髢ｿ豸倩怯骼ｯ萓€蟠壼ｨ<EFBFBD>┓莉倬椋豌ｬ邁ｼ扈疲搗訒｣髏伜初遖磯冥讌€豢｣扈ｱ闊ｵ貎城疾陌ｫ蛟ｵ髢ｺ蜍ｫ蠅ｽ驫<EFBFBD>ｰｭ遞牙ｮ･蜻ｭ豈蛾娘螟亥┰扈ｱ豼句ｼｫ骰幟<EFBFBD>霄ｬ豼ｮ豼<EFBFBD>€墓ｵ<EFBFBD>豸｢譴ｼ迺<EFBFBD>ｷｮ謨夐摺螫ｪ蝠ｰ髀?
{ {
ok = scanner_->get_first_image_header(&head, NULL, &res); ok = scanner_->get_first_image_header(&head, NULL, &res);
if (ok) if (ok)
@ -1905,7 +1907,7 @@ void huagao_ds::init_support_caps(void)
return success(); return success();
} }
// data.type // data.type
if (!data.operator bool()) //閸忛攱婀佹搴ㄦ珦閹?(閸滃本鐨? Twain sample app ,data.m_cont is null,but DotNet閿涘牆鎷板鏃撶礆 data.m_cont not is null . if (!data.operator bool()) //髢ｸ蠢帶罰蟀€菴ｹ逸ｰ謳ｴ繖ｦ迴ｦ髢ｹ?(髢ｸ貊<EFBDB8>悽髏ｨ? Twain sample app ,data.m_cont is null,but DotNet髢ｿ豸倡掩骼ｷ譚ｿ鄧晞純謦ｶ遉?data.m_cont not is null .
{ {
data = Capability::createEnumeration<CapType::Indicators>({ FALSE,TRUE }, m_bIndicator ? 1 : 0, 1); data = Capability::createEnumeration<CapType::Indicators>({ FALSE,TRUE }, m_bIndicator ? 1 : 0, 1);
} }
@ -2742,7 +2744,7 @@ void huagao_ds::init_support_caps(void)
float sf = trans_range((float)step, (float)l, (float)u, range_l, range_h, true), float sf = trans_range((float)step, (float)l, (float)u, range_l, range_h, true),
nf = trans_range((float)now, (float)l, (float)u, range_l, range_h), nf = trans_range((float)now, (float)l, (float)u, range_l, range_h),
initf = trans_range((float)init, (float)l, (float)u, range_l, range_h); initf = trans_range((float)init, (float)l, (float)u, range_l, range_h);
sf = 333.30f; // 全通……部分第三方需要固定该值 :( - 2023-10-25 sf = 333.30f; // 蜈ｨ騾壺€ｦ窶ｦ驛ｨ蛻<EFBFBD>ｬｬ荳画婿髴€隕∝崋螳夊ｯ･蛟?:( - 2023-10-25
switch (msg) { switch (msg) {
case Msg::Get: case Msg::Get:
//sf = 333.333f; //sf = 333.333f;
@ -2791,7 +2793,7 @@ void huagao_ds::init_support_caps(void)
float sf = trans_range((float)step, (float)l, (float)u, range_l, range_h, true), float sf = trans_range((float)step, (float)l, (float)u, range_l, range_h, true),
nf = trans_range((float)now, (float)l, (float)u, range_l, range_h), nf = trans_range((float)now, (float)l, (float)u, range_l, range_h),
initf = trans_range((float)init, (float)l, (float)u, range_l, range_h); initf = trans_range((float)init, (float)l, (float)u, range_l, range_h);
sf = 333.30f; // 全通……部分第三方需要固定该值 :( - 2023-10-25 sf = 333.30f; // 蜈ｨ騾壺€ｦ窶ｦ驛ｨ蛻<EFBFBD>ｬｬ荳画婿髴€隕∝崋螳夊ｯ･蛟?:( - 2023-10-25
switch (msg) { switch (msg) {
case Msg::Get: case Msg::Get:
// sf = 333.333f; // sf = 333.333f;
@ -3887,7 +3889,7 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc)
break; break;
case SANE_EVENT_UI_CLOSE_CANCEL: case SANE_EVENT_UI_CLOSE_CANCEL:
//scanner_->stop(); //scanner_->stop();
//notifyCloseCancel(); // 娣囶喖顦查悙鐟板毊鏉╂稑瀹冲?閸欐牗绉?閹稿鎸抽敍瀛禝娑撳秷鍏樺锝呯埗缂佹挻娼惃鍑歎G - added on 2023-02-14 //notifyCloseCancel(); // 螽｣蝗ｶ蝟夜｡ｦ譟･謔咎澄譚ｿ豈企初笊らｨ醍€ｹ蜀ｲ都?髢ｸ谺千於扈<E696BC>?髢ｹ遞ｿ逸ｵ骼ｸ謚ｽ謨咲€帷ｦ晏ｨ第諜遘ｷ骰乗ｨｺ鄧｢髞晏賊蝓礼ｼゆｽｹ謖ｻ螽ｼ薰ｦ諠<EFBDA6>国豁雑 - added on 2023-02-14
//break; //break;
case SANE_EVENT_UI_CLOSE_NORMAL: case SANE_EVENT_UI_CLOSE_NORMAL:
case SANE_EVENT_SCAN_FINISHED: case SANE_EVENT_SCAN_FINISHED: