1.qt 项目配置文件更新

2.TWPP 框架部分代码调整

.gitignore

@@ -3,6 +3,7 @@
 ################################################################################
 
 /huagao/.vs/huagaotwds/v15
+/3rdparty/nick
 /huagao/debug/qmake
 /huagao/debug
 /huagao/Win32/Debug

huagao/huagaotwds.pro

@@ -65,7 +65,7 @@ SOURCES += huagaods.cpp \
     Device/CJsonObject.cpp \
     Device/JsonConfig.cpp \
     Device/GetMemoryUsage.cpp \
-	Device/G400ScanConfig.cpp \
+    Device/G400ScanConfig.cpp \
     ImageProcess/ImageApply.cpp \
     ImageProcess/ImageApplyAdjustColors.cpp \
     ImageProcess/ImageApplyAutoCrop.cpp \
@@ -79,7 +79,7 @@ SOURCES += huagaods.cpp \
     ImageProcess/ImageApplySharpen.cpp \
     ImageProcess/ImageProcess_Public.cpp \
 	ImageProcess/ImageApplyConcatenation.cpp \
-	G400ScanConfig.cpp \
+    GscanJsonConfig.cpp \  
     Sliders.cpp \
     SmartEdit.cpp \
     TabCtrlSSL.cpp \
@@ -119,7 +119,7 @@ HEADERS += huagaods.hpp \
     Device/cJSON.h \
     Device/JsonConfig.h \
     Device/CJsonObject.hpp \
-	Device/G400ScanConfig.h \
+    Device/G400ScanConfig.h \
     ImageProcess/ImageApply.h \
     ImageProcess/ImageApplyAdjustColors.h \
     ImageProcess/ImageApplyAutoCrop.h \
@@ -134,6 +134,8 @@ HEADERS += huagaods.hpp \
     ImageProcess/ImageApplySharpen.h \
     ImageProcess/ImageProcess_Public.h \
 	ImageProcess/ImageApplyConcatenation.h \
+    GscanJsonConfig.h \
+    MapFinder.h \
     Sliders.h \
     SmartEdit.h \
     TabCtrlSSL.h \

twpp/capability.hpp

@@ -89,7 +89,7 @@ template<> struct Cap<CapType::IBarCodeMaxSearchPriorities> {static constexpr co
 template<> struct Cap<CapType::IBarCodeSearchMode> {static constexpr const Type twty = Type::UInt16; typedef SearchMode DataType;};
 template<> struct Cap<CapType::IBarCodeSearchPriorities> {static constexpr const Type twty = Type::UInt16; typedef BarCodeType DataType;};
 template<> struct Cap<CapType::IBarCodeTimeOut> {static constexpr const Type twty = Type::UInt32; typedef UInt32 DataType;};
-template<> struct Cap<CapType::IBitDepth> {static constexpr const Type twty = Type::UInt16; typedef UInt16 DataType;};
+template<> struct Cap<CapType::IBitDepth> {static constexpr const Type twty = Type::UInt16; typedef	UInt16 DataType;};
 template<> struct Cap<CapType::IBitDepthReduction> {static constexpr const Type twty = Type::UInt16; typedef BitDepthReduction DataType;};
 template<> struct Cap<CapType::IBitOrder> {static constexpr const Type twty = Type::UInt16; typedef BitOrder DataType;};
 template<> struct Cap<CapType::IBitOrderCodes> {static constexpr const Type twty = Type::UInt16; typedef BitOrder DataType;};