From 564d1d94a3f6240191df64a74f617c93194c63ca Mon Sep 17 00:00:00 2001
From: masayume <1936714878@qq.com>
Date: Fri, 18 Dec 2020 17:47:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E7=81=B0=E5=BA=A6=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=9B=BE=E7=89=87=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BA=8C=E5=80=BC=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 huagao/CImageProcPage.cpp       |   2 +-
 huagao/CTwainUI.cpp             |   2 +-
 huagao/Device/ImageMatQueue.cpp |   2 +-
 huagao/Device/PublicFunc.h      |  94 ++++++++++++++++----------------
 huagao/huagaods.cpp             |   6 --
 huagao/huagaotwds.rc            | Bin 41286 -> 41282 bytes
 huagao/stdafx.h                 | Bin 10774 -> 10774 bytes
 7 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/huagao/CImageProcPage.cpp b/huagao/CImageProcPage.cpp
index f21905c5..b95e235e 100644
--- a/huagao/CImageProcPage.cpp
+++ b/huagao/CImageProcPage.cpp
@@ -63,7 +63,7 @@ void CImageProcPage::ImageProcPageUpdate(int val,bool is_Crop)
 	{
 		((CButton*)GetDlgItem(IDC_ADVANCEDSET))->EnableWindow(false);
 	}
-	if (0 == val)//褰╄壊
+	if (0 == val||val==3)//褰╄壊
 	{
 		m_temp->SetCurSel(0);
 		m_temp->EnableWindow(FALSE);
diff --git a/huagao/CTwainUI.cpp b/huagao/CTwainUI.cpp
index a28b2da4..c15a7f80 100644
--- a/huagao/CTwainUI.cpp
+++ b/huagao/CTwainUI.cpp
@@ -555,7 +555,7 @@ void CTwainUI::GetGScanCap(GScanCap & cap)
 
 void CTwainUI::UpdateUi()
 {
-	m_pageImageProc->m_cmBoxFilter.EnableWindow(m_pageBasic->m_cmBoxColorMode->GetCurSel() != 0);
+	m_pageImageProc->m_cmBoxFilter.EnableWindow((m_pageBasic->m_cmBoxColorMode->GetCurSel() != 0) && (m_pageBasic->m_cmBoxColorMode->GetCurSel() != 3));
 	INT dupindex = m_pageBasic->m_cmBoxDuplex->GetCurSel();
 	BOOL enableback = dupindex == 0 || dupindex == 4;
 	if (enableback)
diff --git a/huagao/Device/ImageMatQueue.cpp b/huagao/Device/ImageMatQueue.cpp
index 5b47d734..61afa943 100644
--- a/huagao/Device/ImageMatQueue.cpp
+++ b/huagao/Device/ImageMatQueue.cpp
@@ -414,7 +414,7 @@ void ImageMatQueue::proc()
 					if (scanParam.pixtype == 1 && scanParam.hsvcorrect)
 						if (mats[i].channels() == 3)
 							cvtColor(mats[i], mats[i], cv::COLOR_BGR2GRAY);
-					idata = (scanParam.pixtype == 0 || ((scanParam.automaticcolortype == 0) && (mats[i].channels() == 1))) ? (IMat2Bmp)Mat2BmpBw(mats[i], scanParam.resolution_dst) : Mat2Bmp(mats[i], scanParam.resolution_dst);
+					idata = (scanParam.pixtype == 0 || (((scanParam.automaticcolortype == 0)&&(scanParam.automaticcolor==true)) && (mats[i].channels() == 1))) ? (IMat2Bmp)Mat2BmpBw(mats[i], scanParam.resolution_dst) : Mat2Bmp(mats[i], scanParam.resolution_dst);
 					if (!scanParam.multi_output_red)
 						mats[i].release();
 
diff --git a/huagao/Device/PublicFunc.h b/huagao/Device/PublicFunc.h
index 03cf7e48..3c453829 100644
--- a/huagao/Device/PublicFunc.h
+++ b/huagao/Device/PublicFunc.h
@@ -20,60 +20,60 @@ using namespace std;
 *************************************/
 
 //<!基本选项卡
-#define  PIXTYPE          "iPixType"
-#define  AUTOMATICCOLOR   "iautomaticcolor"
-#define  AUTOMATICCOLORTYPR "iautomaticcolortype"
-#define  PAPARSIZE        "iPaparSize"
-#define  ENSIZECHECK      "iEnSizeCheck"
-#define  PAPERALIGN       "iPaperAlign"
-#define  RESOLUTION       "iResolution"
-#define  DUPLEX           "iDuplex"
-#define  DISCARBLANK      "bDiscardBlank"
-#define  DISCARBLANKVINCE "bDiscardBlankVince"
-#define  DISCARBLANK_VALUE "discardblank_percent"
-#define  DB_AREANUM       "iAreaNum"
-#define  DB_DEVNMAX       "iDevnMax"
-#define  FLOD             "bFlod"
-#define  AUTOCROP         "bAuotCrop"
-#define  SWITCHFRONTBACK  "bSwitchFrontBack"
+const std::string  PIXTYPE = "iPixType";
+const std::string   AUTOMATICCOLOR = "iautomaticcolor";
+const std::string   AUTOMATICCOLORTYPR = "iautomaticcolortype";
+const std::string   PAPARSIZE = "iPaparSize";
+const std::string   ENSIZECHECK = "iEnSizeCheck";
+const std::string   PAPERALIGN = "iPaperAlign";
+const std::string   RESOLUTION = "iResolution";
+const std::string   DUPLEX = "iDuplex";
+const std::string   DISCARBLANK = "bDiscardBlank";
+const std::string   DISCARBLANKVINCE = "bDiscardBlankVince";
+const std::string   DISCARBLANK_VALUE = "discardblank_percent";
+const std::string   DB_AREANUM = "iAreaNum";
+const std::string   DB_DEVNMAX = "iDevnMax";
+const std::string   FLOD = "bFlod";
+const std::string   AUTOCROP = "bAuotCrop";
+const std::string   SWITCHFRONTBACK = "bSwitchFrontBack";
 
 
 //<!亮度对比度选项卡
-#define  AUTOCONTRAST    "bAutoContrast"
-#define  BRIGHTNESS      "iBrightness"
-#define  CONTRAST	     "iContrast"
-#define  GAMMA_          "dGamma"
+const std::string   AUTOCONTRAST = "bAutoContrast";
+const std::string   BRIGHTNESS = "iBrightness";
+const std::string   CONTRAST = "iContrast";
+const std::string   GAMMA_ = "dGamma";
 
 
 //<!图像处理选项卡
-#define  FILTERTYPE      "iFilter"
-#define  ENHANCECOLOR    "iEnhance"
-#define  SHARPENTYPE     "iSharpen"
-#define  FILLBLACK       "bFillBlcak"
-#define  AUTODESCREW	 "bAutoDescrew"
-#define  MULTIOUTPUT     "iMultiOutPut"
-#define  OUTHOLE         "bOutHole"
-#define  OUTHOLERATIO    "iOutHoleRatio"
-#define  DETACHNOISE     "detachnoise"
-#define  DETACHNOISEVALUE "detachnoisevalue"
-#define  HSVCORRECT		 "bHsvCorrect"
+const std::string   FILTERTYPE = "iFilter";
+const std::string   ENHANCECOLOR = "iEnhance";
+const std::string   SHARPENTYPE = "iSharpen";
+const std::string   FILLBLACK = "bFillBlcak";
+const std::string   AUTODESCREW = "bAutoDescrew";
+const std::string   MULTIOUTPUT = "iMultiOutPut";
+const std::string   OUTHOLE = "bOutHole";
+const std::string   OUTHOLERATIO = "iOutHoleRatio";
+const std::string   DETACHNOISE = "detachnoise";
+const std::string   DETACHNOISEVALUE = "detachnoisevalue";
+const std::string   HSVCORRECT = "bHsvCorrect";
 
 //<!送纸选项卡
-#define  ULTRADETECT      "bUltrasonicDetect"
-#define  BINDINGDETECT    "bBindingDetect"
-#define  SCANCOUNT        "ScanCount"
-#define  DOCORIENTATION   "bOrientation"
-#define  AUTO_TEXT        "bAutoText"
-#define  BACKROTATE180    "iBackRotate180"
-#define  DOGEAR_DETECTION "dogeardetection"
-#define  SCREWDETECT      "bScrewDetect"
-#define  SCREWLEVEL       "iScrewLevel"
-#define  ITEMCAPTION      "Caption"
-#define  SAVEPATH         "SavePath"
-#define  ISCONVEX         "isConvex"
-#define  INDENT           "Indent"
-#define  AUTOCROP_THRESHOLD "AutoCrop_Threshold"
-#define  NOISE            "Noise"
+const std::string   ULTRADETECT = "bUltrasonicDetect";
+const std::string   BINDINGDETECT = "bBindingDetect";
+const std::string   SCANCOUNT = "ScanCount";
+const std::string   DOCORIENTATION = "bOrientation";
+const std::string   AUTO_TEXT = "bAutoText";
+const std::string   BACKROTATE180 = "iBackRotate180";
+const std::string   DOGEAR_DETECTION = "dogeardetection";
+const std::string   SCREWDETECT = "bScrewDetect";
+const std::string   SCREWLEVEL = "iScrewLevel";
+const std::string   ITEMCAPTION = "Caption";
+const std::string   SAVEPATH = "SavePath";
+const std::string   ISCONVEX = "isConvex";
+const std::string   INDENT = "Indent";
+const std::string   AUTOCROP_THRESHOLD = "AutoCrop_Threshold";
+const std::string   NOISE = "Noise";
 
 
 /******************
@@ -184,7 +184,7 @@ struct GScanCap
 {
 	byte             papertype;           /**< the current paper source ADF or Flatbed*/
 	PaperAlign       paperAlign;
-	byte             en_sizecheck;
+	byte             en_sizecheck;          /**< 尺寸检测*/
 	float            imageRotateDegree;
 	byte             is_duplex;                /**< True to use duplex false for simplex, ignored if flatbed*/
 	byte             en_fold;
diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp
index 6bde8d08..f1a19565 100644
--- a/huagao/huagaods.cpp
+++ b/huagao/huagaods.cpp
@@ -1742,8 +1742,6 @@ Result HuagaoDs::identityOpenDs(const Identity&) {
 	m_caps[(CapType)(CapTypeEx::TwEx_CroporDesaskewIndent)] = [this](Msg msg, Capability& data)->Result {
 		switch (msg) {
 		case Msg::Get:
-			data = Capability::createEnumeration<UInt8>((CapType)(CapTypeEx::TwEx_CroporDesaskewIndent), m_scanparam->indent);
-			return success();
 		case Msg::GetCurrent:
 			data = Capability::createOneValue<UInt8>((CapType)(CapTypeEx::TwEx_CroporDesaskewIndent), m_scanparam->indent);
 			return success();
@@ -1769,8 +1767,6 @@ Result HuagaoDs::identityOpenDs(const Identity&) {
 	m_caps[(CapType)(CapTypeEx::TwEx_CropNoise)] = [this](Msg msg, Capability& data)->Result {
 		switch (msg) {
 		case Msg::Get:
-			data = Capability::createEnumeration<UInt8>((CapType)(CapTypeEx::TwEx_CropNoise), m_scanparam->noise);
-			return success();
 		case Msg::GetCurrent:
 			data = Capability::createOneValue<UInt8>((CapType)(CapTypeEx::TwEx_CropNoise), m_scanparam->noise);
 			return success();
@@ -1796,8 +1792,6 @@ Result HuagaoDs::identityOpenDs(const Identity&) {
 	m_caps[(CapType)(CapTypeEx::TwEx_CroporDesaskewThreshold)] = [this](Msg msg, Capability& data)->Result {
 		switch (msg) {
 		case Msg::Get:
-			data = Capability::createEnumeration<UInt8>((CapType)(CapTypeEx::TwEx_CroporDesaskewThreshold), m_scanparam->AutoCrop_threshold);
-			return success();
 		case Msg::GetCurrent:
 			data = Capability::createOneValue<UInt8>((CapType)(CapTypeEx::TwEx_CroporDesaskewThreshold), m_scanparam->AutoCrop_threshold);
 			return success();
diff --git a/huagao/huagaotwds.rc b/huagao/huagaotwds.rc
index d5ad69ac3881cd9ee78ee109ed92afdcae473441..ed5db196699d52116cc0f8074f30e7ef89f49e5c 100644
GIT binary patch
delta 23
fcmX?hi0RNFrVS0XEOTZQHBDZSleGC&ZHzJijgAY1

delta 43
zcmV+`0M!4&!UD#^0<eI63`78F0AT=Z0B-<i0Fw?{8k692M3ZW34wJxyu(PCoo+4ou
B5bFQ{

diff --git a/huagao/stdafx.h b/huagao/stdafx.h
index e5fcf2ff835eaa8275f15b20cfce88b78c3361f1..b7dc8cad2406fe0cb419247509c309cfea2dd34c 100644
GIT binary patch
delta 22
ecmbOhGA(4oHV#%31_K6z$&HMXo3C&<DFOgjX9oNL

delta 22
ecmbOhGA(4oHV#%}1_K6z$&HMXo3C&<DFOgjSqA$6