变更版本信息

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();
 }

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) {