From 7b654b101d1413ba9643304bbf7cdce49371cba2 Mon Sep 17 00:00:00 2001 From: lovelyyoung <1002639516@qq.com> Date: Fri, 3 Apr 2020 09:31:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=89=88=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- huagao/CTwainUI.cpp | 5 +++++ huagao/huagaods.cpp | 12 +++++++++--- huagao/huagaotwds.rc | Bin 35004 -> 35004 bytes huagao/stdafx.h | Bin 4744 -> 4740 bytes 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/huagao/CTwainUI.cpp b/huagao/CTwainUI.cpp index b4005702..9196b1ae 100644 --- a/huagao/CTwainUI.cpp +++ b/huagao/CTwainUI.cpp @@ -425,6 +425,11 @@ void CTwainUI::UpDateScanParam(PCONFIGPARAMS configItem, bool updateDs) settings->fillhole.is_fillhole = configItem->EnOutHole; settings->fillhole.fillholeratio = configItem->OutHoleRatio; settings->multi_output_red = configItem->EnMultiOutPutR; +#ifdef REAL300DPI + settings->resolution_native = settings->resolution_dst > 240.0f ? 300.0f : 200.0f; +#else // REAL300DPI + settings->resolution_native = 200.0f; +#endif UpdateUi(); } diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp index 83b32b2f..4e5c2b4a 100644 --- a/huagao/huagaods.cpp +++ b/huagao/huagaods.cpp @@ -60,11 +60,11 @@ using namespace std::placeholders; TWPP_ENTRY_MFC(HuagaoDs) static constexpr const Identity srcIdent( - Version(3, 3, Language::English, Country::CzechRepublic, "v3.3.1.3"), + Version(3, 3, Language::English, Country::CzechRepublic, "v3.3.1.6"), DataGroup::Image, "宁波华高信息科技有限公司", "G200 Series", - "HUAGOSCAN Twain" + "HUAGOSCAN TWAIN" #if defined(_MSC_VER) "" #elif defined(__GNUC__) @@ -1484,6 +1484,7 @@ Result HuagaoDs::userInterfaceEnable(const Identity&, UserInterface& ui){ if (!ui.showUi()){ // this is an exception when we want to set state explicitly, notifyXferReady can be called only in enabled state // with hidden UI, the usual workflow DsState::Enabled -> notifyXferReady() -> DsState::XferReady is a single step + updataGscanCap(); setState(DsState::Enabled); if(startScan() == success()){ m_pendingXfers = 1; @@ -1807,8 +1808,13 @@ void HuagaoDs::updataGscanCap() PaperStatus ps = paperStatusMap[cfs.PaperSize]; m_scanparam->papertype = ps.Paper;//A3 m_scanparam->paperAlign =(PaperAlign)ps.Orentate; - m_scanparam->resolution_native =200.0f ; m_scanparam->resolution_dst = resolutions[cfs.Resolution]; +#ifdef REAL300DPI + m_scanparam->resolution_native = m_scanparam->resolution_dst > 240.0f ? 300.0f : 200.0f; +#else // REAL300DPI + m_scanparam->resolution_native = 200.0f; +#endif + m_scanparam->scannum = cfs.ScanCount; m_scanparam->is_autotext = cfs.Orentation==4?1:0; if (cfs.Orentation != 4) { diff --git a/huagao/huagaotwds.rc b/huagao/huagaotwds.rc index a014c1cc3f3306bc87798ccd60e39bb654000adf..9298c4c75b947f41fdc557b00e85e229956ddacf 100644 GIT binary patch delta 55 zcmdlpk!jCFrVR>NjAoM+vkZac+$_n>IawQ+fXt0~;*%S4#3p;?&R{lTFqr%__cWu~ J=8bvWQUEt@6g~g| delta 55 zcmdlpk!jCFrVR>NjK-4{vkZac+$_n>IawQ+fXt0~;*%S4#3p;?&R{lVFrNH0_cWvN J=8bvWQUEq06f^(; diff --git a/huagao/stdafx.h b/huagao/stdafx.h index bba214790a126924bc2df26e848789fe8f3555c1..b6b122e1e2b04915b2d31447584b01a88a11734f 100644 GIT binary patch delta 38 scmeBBZBgBjz{MHP;K<;~;K!gexsg+JavfI&vl)