From f196fea9b08aa8ba71a0f8fe5d2981c0244d0e36 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Thu, 7 Dec 2023 15:07:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0EnableDS/DisableDS/EndXfer?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- twain/twain/huagaods.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp index b21b570..700b418 100644 --- a/twain/twain/huagaods.cpp +++ b/twain/twain/huagaods.cpp @@ -975,7 +975,7 @@ Result huagao_ds::identityOpenDs(const Identity& id) //if (GetLastError() == ERROR_ALREADY_EXISTS) { //濡傛灉宸茬粡瀛樺湪鍚屽悕鐨凪utex浼氬緱鍒拌繖涓敊璇? // CloseHandle(singleton_); // singleton_ = NULL; - // showmsg("鎻愮ず", 202); + // showmsg("鎻愮?, 202); // // return { ReturnCode::Failure, ConditionCode::CapBadOperation }; //} @@ -1043,7 +1043,7 @@ Result huagao_ds::identityOpenDs(const Identity& id) name = wcsrchr(pe, L'\\'); if (name++ == NULL) 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) // 爱云校PE：好分数阅卷扫描?exe double_check_mode_ = DOUBLE_CHECK_ULTRASONIC; else double_check_mode_ = DOUBLE_CHECK_TWAIN; @@ -1104,7 +1104,7 @@ Result huagao_ds::pendingXfersGet(const Identity&, PendingXfers& data) // 显示设置界面时，不能阻塞在EndXfer，否则最后一张图片传输后显示不出来，故在此做阻塞调用 int cnt = get_scanned_image_count(-1); - // FIX-2023-05-29: 是否保持设置界面显示，由APP决定，此处不再由是否显示UI来决定，保持一个扫描流程正常结束 + // FIX-2023-05-29: 是否保持设置界面显示，由APP决定，此处不再由是否显示UI来决定，保持一个扫描流程正常结? //int cnt = show_setting_ ? 1 : get_scanned_image_count(-1); data.setCount(cnt); @@ -1113,6 +1113,7 @@ Result huagao_ds::pendingXfersGet(const Identity&, PendingXfers& data) Result huagao_ds::pendingXfersEnd(const Identity& id, PendingXfers& data) { // complete transferring of current image ... + load_sane_util::log_info(L"pendingXfersEnd ...\r\n", 1); pending_xfer_.clear(); if (scanner_.get()) { @@ -1183,6 +1184,7 @@ Result huagao_ds::setupMemXferGet(const Identity& id, SetupMemXfer& data) } Result huagao_ds::userInterfaceDisable(const Identity&, UserInterface& ui) { + load_sane_util::log_info(L"userInterfaceDisable ...\r\n", 1); if (scanner_.get()) { scanner_->stop(); @@ -1193,6 +1195,7 @@ Result huagao_ds::userInterfaceDisable(const Identity&, UserInterface& ui) } Result huagao_ds::userInterfaceEnable(const Identity&, UserInterface& ui) { + load_sane_util::log_info(L"userInterfaceEnable ...\r\n", 1); notfify_close_ = false; bUiOnly_ = false; show_setting_ = false; @@ -1283,9 +1286,9 @@ Result huagao_ds::imageInfoGet(const Identity&, ImageInfo& data) //if (!scanner_->wait_image()) //{ //// notifyCloseOk(); - // return success(); // 濂藉垎鏁伴渶瑕佽繑鍥炴垚鍔? + // return success(); // 濂藉垎鏁伴渶瑕佽繑鍥炴垚? //} - if (get_scanned_image_count(-1) > 0) // 鏄剧ず璁剧疆鐣岄潰鏃讹紝涓嶈兘闃诲鍦‥ndXfer锛屽惁鍒欐渶鍚庝竴寮犲浘鐗囦紶杈撳悗鏄剧ず涓嶅嚭鏉ワ紝鏁呭湪姝ゅ仛闃诲璋冪敤 + if (get_scanned_image_count(-1) > 0) // 鏄剧ず璁剧疆鐣岄潰鏃讹紝涓嶈兘闃诲鍦‥ndXfer锛屽惁鍒欐渶鍚庝竴寮犲浘鐗囦紶杈撳悗鏄剧ず涓嶅嚭鏉ワ紝鏁呭湪姝ゅ仛闃诲璋冪? { ok = scanner_->get_first_image_header(&head, NULL, &res); if (ok) @@ -1697,7 +1700,7 @@ Result huagao_ds::call(const Identity& origin, DataGroup dg, Dat dat, Msg msg, v //FileTools::write_log("D:\\1.txt", "call:datagroup-"+to_string((int)dg)+"dat-"+to_string(int(dat))+"msg-"+to_string(int(msg))); Result rt; - //trigger_ProcessEvent(dg, dat, msg); // some APPs may be not trigger (Control, Event, ProcessEvent), we help them :( ... // 浜戦槄鍗锋壂鎻忕涓嶇瓑鐘舵€佹敼鍙橈紝鐩存帴鍙栧浘锛屾澶勮缃竴娆＄姸鎬?2022-11-07 + //trigger_ProcessEvent(dg, dat, msg); // some APPs may be not trigger (Control, Event, ProcessEvent), we help them :( ... // 浜戦槄鍗锋壂鎻忕涓嶇瓑鐘舵€佹敼鍙橈紝鐩存帴鍙栧浘锛屾澶勮缃竴娆＄姸?2022-11-07 rt = Base::call(origin, dg, dat, msg, data); if (log_all_triple_ || ((int)rt.returnCode() && rt.returnCode() != ReturnCode::NotDsEvent && msg != Msg::ProcessEvent)) @@ -1902,7 +1905,7 @@ void huagao_ds::init_support_caps(void) return success(); } // 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()) //鍏锋湁椋庨櫓?(鍜屾? Twain sample app ,data.m_cont is null,but DotNet锛堝拰姘旓級 data.m_cont not is null . { data = Capability::createEnumeration({ FALSE,TRUE }, m_bIndicator ? 1 : 0, 1); } @@ -2739,7 +2742,7 @@ void huagao_ds::init_support_caps(void) 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), initf = trans_range((float)init, (float)l, (float)u, range_l, range_h); - sf = 333.30f; // 全通……部分第三方需要固定该值 :( - 2023-10-25 + sf = 333.30f; // 全通……部分第三方需要固定该?:( - 2023-10-25 switch (msg) { case Msg::Get: //sf = 333.333f; @@ -2788,7 +2791,7 @@ void huagao_ds::init_support_caps(void) 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), initf = trans_range((float)init, (float)l, (float)u, range_l, range_h); - sf = 333.30f; // 全通……部分第三方需要固定该值 :( - 2023-10-25 + sf = 333.30f; // 全通……部分第三方需要固定该?:( - 2023-10-25 switch (msg) { case Msg::Get: // sf = 333.333f; @@ -3871,7 +3874,7 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc) //} //if (!Twpp::success(rc)) //{ - // rc = notifyXferReady(); // 濂藉垎鏁伴渶瑕佸啀閫氱煡 FAINT :( - modified on 2022-10-20 + // rc = notifyXferReady(); // 濂藉垎鏁伴渶瑕佸啀閫氱?FAINT :( - modified on 2022-10-20 // if (!Twpp::success(rc)) // { // wchar_t msg[128] = { 0 }, unk[20] = { 0 }; @@ -3884,7 +3887,7 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc) break; case SANE_EVENT_UI_CLOSE_CANCEL: //scanner_->stop(); - //notifyCloseCancel(); // 淇鐐瑰嚮杩涘害妗?鍙栨秷"鎸夐挳锛孶I涓嶈兘姝ｅ父缁撴潫鐨凚UG - added on 2023-02-14 + //notifyCloseCancel(); // 淇鐐瑰嚮杩涘害妗?鍙栨?鎸夐挳锛孶I涓嶈兘姝ｅ父缁撴潫鐨凚UG - added on 2023-02-14 //break; case SANE_EVENT_UI_CLOSE_NORMAL: case SANE_EVENT_SCAN_FINISHED: