diff --git a/huagao/CBasicPage.cpp b/huagao/CBasicPage.cpp index 5d8528da..82a2962e 100644 --- a/huagao/CBasicPage.cpp +++ b/huagao/CBasicPage.cpp @@ -152,7 +152,7 @@ BOOL CBasicPage::OnInitDialog() m_cmBoxDuplex = (CComboBox*)GetDlgItem(IDC_CMBDUPLEX); m_Edit_Dpi.SetSlideLink(this, IDC_SLIDERDPI); - m_Edit_Dpi.SetParams(100, 600, 10); + m_Edit_Dpi.SetParams(100, 300, 10); m_Edit_Dpi.SetValue(200); for (const CString& colorMode : color_Modes) diff --git a/huagao/CMakeLists.txt b/huagao/CMakeLists.txt index 081dfa4b..d4e6aa22 100644 --- a/huagao/CMakeLists.txt +++ b/huagao/CMakeLists.txt @@ -34,12 +34,14 @@ ${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../3rdparty/libtiff/include ${PROJECT_SOURCE_DIR}/../3rdparty/gpdf/ ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include +${PROJECT_SOURCE_DIR}/../3rdparty/log4cplus/include ) message($ENV{windir}) link_directories(${PROJECT_SOURCE_DIR}/../3rdparty/opencv/x86/staticlib/ ${PROJECT_SOURCE_DIR}/../3rdparty/libtiff/ +${PROJECT_SOURCE_DIR}/../3rdparty/log4cplus/lib/ ${PROJECT_SOURCE_DIR}/../3rdparty/gpdf/x86/staticlib/ ${PROJECT_SOURCE_DIR}/../3rdparty/gpdf/3rdparty/tesseract/staticlib/x86/ ${PROJECT_SOURCE_DIR}/../3rdparty/turbojpeg/x86/lib/) @@ -87,6 +89,7 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows") link_libraries(tesseract_viewer) link_libraries(tesseract_wordrec) link_libraries(turbojpeg) + link_libraries(log4cplusS) MESSAGE(STATUS "current platform: Windows") ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") MESSAGE(STATUS "current platform: FreeBSD") diff --git a/huagao/CTwainUI.h b/huagao/CTwainUI.h index e6e3936c..8f71ab26 100644 --- a/huagao/CTwainUI.h +++ b/huagao/CTwainUI.h @@ -13,7 +13,7 @@ class CImageProcPage; class CBasicPage; class CFeedPaperPage; class CBrightnessPage; - +using std::vector; /*配置文件默认索引号*/ #define SUPPORTRESNUMS 6 //static int Resolutions[SUPPORTRESNUMS] = {100,150,200,240,300,600}; diff --git a/huagao/Device/GScan.h b/huagao/Device/GScan.h index 90c0dea4..3553f986 100644 --- a/huagao/Device/GScan.h +++ b/huagao/Device/GScan.h @@ -10,7 +10,7 @@ #include #include "filetools.h" #include "PublicFunc.h" - +using namespace std; enum tagDevState { DEV_STOP = -1, diff --git a/huagao/Device/GScanO200.cpp b/huagao/Device/GScanO200.cpp index ebeb10d1..caba7db2 100644 --- a/huagao/Device/GScanO200.cpp +++ b/huagao/Device/GScanO200.cpp @@ -217,7 +217,7 @@ int GScanO200::aquire_bmpdata(std::vector& bmpdata) { if (m_pImages->empty()) { DoEvents(); - this_thread::sleep_for(chrono::milliseconds(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); if (sw.elapsed_s() > 20.00) { if (m_threadUsb && m_threadUsb->joinable()) { @@ -253,7 +253,7 @@ int GScanO200::aquire_bmpdata(std::vector& bmpdata) return 0; } DoEvents(); - this_thread::sleep_for(chrono::milliseconds(2)); + std::this_thread::sleep_for(std::chrono::milliseconds(2)); } } } @@ -643,9 +643,6 @@ void GScanO200::usbmain() { writelog(e.what()); } - - ////FileTools::write_log("D:\\1.txt", "thread usb exit"); - } /////////////////////////////////////////////////////////////////////////// diff --git a/huagao/Device/GScanVirtual.cpp b/huagao/Device/GScanVirtual.cpp index cff20bd7..fc238ebc 100644 --- a/huagao/Device/GScanVirtual.cpp +++ b/huagao/Device/GScanVirtual.cpp @@ -119,7 +119,7 @@ void GScanVirtual::Scanner_StartScan(UINT16 count) void GScanVirtual::Stop_scan() { std::lock_guard lck(m_imgLocker); - fstream fs("D:\\1.txt", ios::out); + std::fstream fs("D:\\1.txt", std::ios::out); fs << 0; fs.close(); } @@ -195,7 +195,7 @@ DWORD GScanVirtual::usbmain() fread(imgData->data(), sizeof(unsigned char), length, file); fclose(file); m_pImages->pushMat(std::shared_ptr(new G400Decode(imgData))); - this_thread::sleep_for(std::chrono::milliseconds(1000)); + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); } } } diff --git a/huagao/Device/GScanVirtual.h b/huagao/Device/GScanVirtual.h index b9e81a42..13dfa17a 100644 --- a/huagao/Device/GScanVirtual.h +++ b/huagao/Device/GScanVirtual.h @@ -2,6 +2,7 @@ #include "GScan.h" #include +using namespace std; class GScanVirtual : public IScanner { diff --git a/huagao/Device/IConfig.h b/huagao/Device/IConfig.h index a5e2ec83..b56e333b 100644 --- a/huagao/Device/IConfig.h +++ b/huagao/Device/IConfig.h @@ -91,7 +91,7 @@ static std::map SupResolutions = { }; -static std::map secrewMaps = { +static std::map secrewMaps = { {1,0}, {2,1}, {3,2}, diff --git a/huagao/Device/ImageMatQueue.h b/huagao/Device/ImageMatQueue.h index 374f46a5..2ef31541 100644 --- a/huagao/Device/ImageMatQueue.h +++ b/huagao/Device/ImageMatQueue.h @@ -9,7 +9,7 @@ //#include "threadpool.hpp" #include "PaperSize.h" #include "filetools.h" - +using namespace std; class IMat2Bmp { public: virtual ~IMat2Bmp() {} diff --git a/huagao/Device/PaperSize.cpp b/huagao/Device/PaperSize.cpp index 021e5b39..2d0feb17 100644 --- a/huagao/Device/PaperSize.cpp +++ b/huagao/Device/PaperSize.cpp @@ -28,7 +28,7 @@ namespace Device { papersize.insert({ USStatement,CSize(297,420 * 1.5) }); papersize.insert({ USLetter,CSize(216,279) }); papersize.insert({ USLegal,CSize(216,356) }); - papersize.insert({ USLedger,CSize(297,432) }); + papersize.insert({ USLedger,CSize(279,432) }); papersize.insert({ None,CSize(297,420) }); papersize.insert({ K8,CSize(270,390) }); papersize.insert({ K16,CSize(190,270) }); diff --git a/huagao/Device/PublicFunc.h b/huagao/Device/PublicFunc.h index e2f57a03..512371a3 100644 --- a/huagao/Device/PublicFunc.h +++ b/huagao/Device/PublicFunc.h @@ -13,7 +13,9 @@ #define BYTES_PERLINE_ALIGN4(width, bpp) (((((int)(width)*(bpp))+31)/32)*4) #define BYTES_PERLINE(width, bpp) ((((int)(width)*(bpp))+7)/8) -using namespace std; +using byte = unsigned char; +using std::string; + /************************************ **ɨjsonʽ** @@ -24,8 +26,8 @@ using namespace std; const std::string CONFIG = "Config"; // #include #include +//#include #include "PublicFunc.h" +enum log_lv :int { + log_TRACE = 0, + log_DEBUG = 10000, + log_INFO = 20000, + log_WARN = 30000, + log_ERROR = 40000, + log_FATAL = 50000, +}; + class FileTools { public: @@ -40,24 +50,23 @@ public: p=localtime(&timp); ofs << p->tm_year+1900 << "/" << p->tm_mon+1 << "/" << p->tm_mday << " " << p->tm_hour << ":" << p->tm_min << ":" << p->tm_sec << " "<setName(LOG4CPLUS_TEXT("file")); // log4cplus::tstring pattern = LOG4CPLUS_TEXT("%D{%m/%d/%y %H:%M:%S,%Q} [%t] %-5p %c - %m [%l]%n"); // rf->setLayout(std::unique_ptr(new log4cplus::PatternLayout(pattern))); - // log4cplus::Logger logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("hglog")); - // logger.setLogLevel(log4cplus::INFO_LOG_LEVEL); + // log4cplus::Logger logger = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("hglog")); + // logger.setLogLevel(lv); // logger.addAppender(rf); // LOG4CPLUS_WARN(logger, log.c_str()); // logger.removeAllAppenders(); //} - private: static void getFiles(std::string path, std::vector& files) { diff --git a/huagao/GscanJsonConfig.cpp b/huagao/GscanJsonConfig.cpp index a49c4ecd..5cb7d952 100644 --- a/huagao/GscanJsonConfig.cpp +++ b/huagao/GscanJsonConfig.cpp @@ -270,13 +270,20 @@ GScanCap GscanJsonConfig::ReadGscanCap() _tcscat(szIniFile, TEXT("\\")); std::string dirpath = TCHAR2STRING(szIniFile); bool is_exist = isFileExist(dirpath+ TCHAR2STRING(TWAIN_JSON_NAME)); - if (is_exist) - return JsonToGscancap(Readjson(dirpath + TCHAR2STRING(TWAIN_JSON_NAME))); - else{ - createDirectory((char*)dirpath.c_str()); - SaveGscancapJson(JsonToGscancap(GetDefaultJson()), dirpath + TCHAR2STRING(TWAIN_JSON_NAME)); + try { + if (is_exist) return JsonToGscancap(Readjson(dirpath + TCHAR2STRING(TWAIN_JSON_NAME))); + else { + throw std::exception(); + } } + catch (...){ + remove((dirpath + TCHAR2STRING(TWAIN_JSON_NAME)).c_str()); + createDirectory((char*)dirpath.c_str()); + SaveGscancapJson(JsonToGscancap(GetDefaultJson()), dirpath + TCHAR2STRING(TWAIN_JSON_NAME)); + return JsonToGscancap(Readjson(dirpath + TCHAR2STRING(TWAIN_JSON_NAME))); + } + //if (!is_exist) { // createDirectory((char*)dirpath.c_str()); @@ -795,8 +802,8 @@ json GscanJsonConfig::GetDefaultJson() return json::parse(R"({ "Config": { "iPixType": 2 , - "iautomaticcolor": false , - "iautomaticcolortype": 1 , + "bAutoMaticColorDetece": false , + "iAutoMaticColorDeteceType": 1 , "iPaparSize": 0 , "iPaperAlign": 0 , "iEnSizeCheck": false , diff --git a/huagao/GscanJsonConfig.h b/huagao/GscanJsonConfig.h index 12abe8bd..41722a9d 100644 --- a/huagao/GscanJsonConfig.h +++ b/huagao/GscanJsonConfig.h @@ -4,6 +4,7 @@ #include using json = nlohmann::json; +using std::vector; struct json_cast { json_cast(json s) :m_json(s) { if (s.is_null()) throw std::bad_alloc(); } diff --git a/huagao/ImageProcess/ImageApplyRotation.cpp b/huagao/ImageProcess/ImageApplyRotation.cpp index 94cce93f..8e8db5aa 100644 --- a/huagao/ImageProcess/ImageApplyRotation.cpp +++ b/huagao/ImageProcess/ImageApplyRotation.cpp @@ -91,7 +91,7 @@ void CImageApplyRotation::apply(cv::Mat & pDib, int side) if (m_rotation == RotationType::Rotate_90_clockwise || m_rotation == RotationType::Rotate_90_anti_clockwise) //90�� -90�� { transpose(pDib, pDib); - flip(pDib, pDib, m_rotation == RotationType::Rotate_90_clockwise ? 0 : 1); + flip(pDib, pDib, m_rotation == RotationType::Rotate_90_clockwise ? 1 : 0); } else { diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp index 409b9295..73fe5151 100644 --- a/huagao/huagaods.cpp +++ b/huagao/huagaods.cpp @@ -26,7 +26,7 @@ #ifdef WIN32 #include #endif // WIN32 - +using namespace std; //custom define caps enum enum class CapTypeEx : unsigned short { @@ -266,6 +266,7 @@ HuagaoDs::HuagaoDs() ,bmpData(new std::vector) , hMutex(NULL) { + //log4cplus::Initializer initializer; /*string ss1= getOSInfo(); string ss2=getManufactureID(); string ss3=getCpuType(); @@ -862,8 +863,8 @@ Result HuagaoDs::identityOpenDs(const Identity&) { { m_scanparam->pixtype = (int)mech; if (m_scanparam->pixtype == (int)PixelType::Rgb){ - m_scanparam->filter = (byte)Filter::None; - m_scanparam->enhance_color = (byte)Enchace_Color::Enhance_None; + m_scanparam->filter = (BYTE)Filter::None; + m_scanparam->enhance_color = (BYTE)Enchace_Color::Enhance_None; m_scanparam->automaticcolor = FALSE; } else{ @@ -874,8 +875,8 @@ Result HuagaoDs::identityOpenDs(const Identity&) { { if (m_scanparam->filter == 3 && m_scanparam->enhance_color == 0) { - m_scanparam->filter = (byte)Filter::None; - m_scanparam->enhance_color = (byte)Enchace_Color::Enhance_Red; + m_scanparam->filter = (BYTE)Filter::None; + m_scanparam->enhance_color = (BYTE)Enchace_Color::Enhance_Red; } } } @@ -894,8 +895,8 @@ Result HuagaoDs::identityOpenDs(const Identity&) { auto mech = data.currentItem(); if (mech){ m_scanparam->automaticcolor = TRUE; - m_scanparam->filter = (byte)Filter::None; - m_scanparam->enhance_color = (byte)Enchace_Color::Enhance_None; + m_scanparam->filter = (BYTE)Filter::None; + m_scanparam->enhance_color = (BYTE)Enchace_Color::Enhance_None; m_scanparam->pixtype = (int)PixelType::Rgb; } else @@ -955,7 +956,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_caps[CapType::IXResolution] = [this](Msg msg, Capability& data) { switch (msg) { case Msg::Get: - data = Capability::createRange(Fix32(100.0f), Fix32(600.0f), Fix32(1.0f), Fix32(m_scanparam->resolution_dst), Fix32(200.0)); + data = Capability::createRange(Fix32(100.0f), Fix32(300.0f), Fix32(1.0f), Fix32(m_scanparam->resolution_dst), Fix32(200.0)); return success(); case Msg::GetCurrent: data = Capability::createOneValue(Fix32(m_scanparam->resolution_dst)); @@ -967,7 +968,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { return success(); case Msg::Set: { auto mech = data.currentItem(); - if (mech < 100.0f || mech > 600.0f) + if (mech < 100.0f || mech > 300.0f) return badValue(); m_scanparam->resolution_dst = (float)mech; return success(); @@ -995,25 +996,25 @@ Result HuagaoDs::identityOpenDs(const Identity&) { if (std::distance(paperSizeList.begin(), std::find(paperSizeList.begin(), paperSizeList.end(), paper)) == paperSizeList.size()) return badValue(); else { - m_scanparam->papertype = (byte)paper; - if (paper == (byte)PaperSize::None || paper == (byte)PaperSize::UsStatement){ + m_scanparam->papertype = (BYTE)paper; + if (paper == (BYTE)PaperSize::None || paper == (BYTE)PaperSize::UsStatement){ m_scanparam->paperAlign = PaperAlign::Rot0; m_scanparam->en_sizecheck = 0; } - if (paper == (byte)PaperSize::UsStatement){ + if (paper == (BYTE)PaperSize::UsStatement){ m_autosize = (UInt16)AutoSize::None; m_autoboarderdetcet = false; m_scanparam->is_autocrop = 0; } else{ - m_autosize = (paper == (byte)PaperSize::None) ? (UInt16)AutoSize::Auto : (UInt16)AutoSize::None; - m_autoboarderdetcet = paper == (byte)PaperSize::None; - m_scanparam->is_autocrop = paper == (byte)PaperSize::None ? 1 : 0; + m_autosize = (paper == (BYTE)PaperSize::None) ? (UInt16)AutoSize::Auto : (UInt16)AutoSize::None; + m_autoboarderdetcet = paper == (BYTE)PaperSize::None; + m_scanparam->is_autocrop = paper == (BYTE)PaperSize::None ? 1 : 0; } return success(); } } - return CapSupGetAllReset(msg, data, { PaperSize::A4,PaperSize::A5,PaperSize::A6, + return CapSupGetAllReset(msg, data, { PaperSize::A4,PaperSize::A5,PaperSize::A6, PaperSize::IsoB5,PaperSize::IsoB6,PaperSize::UsLetter, PaperSize::UsLegal,PaperSize::None,(PaperSize)PaperSizeEx::K16 #ifndef G300 @@ -1040,7 +1041,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->en_sizecheck = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->en_sizecheck, false, m_scanparam->en_sizecheck, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->en_sizecheck, false, m_scanparam->en_sizecheck, 0); }; #endif // !ISG100 #endif // G200 @@ -1155,7 +1156,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->is_autodiscradblank_normal = m_scanparam->is_autodiscradblank_vince = m_scanparam->en_fold = 0; return success(); } - return CapSupGetAllReset(msg, data, m_scanparam->is_duplex, Bool(true)); + return CapSupGetAllReset(msg, data, m_scanparam->is_duplex, Bool(true)); }; m_query[CapType::AutoFeed] = msgSupportGetAllSetReset; @@ -1192,7 +1193,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->autodescrew = (bool)atuodsw; return success(); } - return CapSupGetAllReset(msg,data, m_scanparam->autodescrew,true); + return CapSupGetAllReset(msg,data, m_scanparam->autodescrew,true); }; m_query[(CapType)(CapTypeEx::TwEx_SwitchFrontBack)] = msgSupportGetAllSetReset; @@ -1202,7 +1203,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->is_switchfrontback = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->is_switchfrontback, (Bool)false, m_scanparam->is_switchfrontback ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->is_switchfrontback, (Bool)false, m_scanparam->is_switchfrontback ? 1 : 0, 0); }; m_query[CapType::IAutomaticRotate] = msgSupportGetAllSetReset; @@ -1214,12 +1215,12 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->imageRotateDegree = 0.0f; return success(); } - return CapSupGetAllReset(msg, data, m_scanparam->is_autotext, false); + return CapSupGetAllReset(msg, data, m_scanparam->is_autotext, false); }; m_query[CapType::IAutomaticCropUsesFrame] = msgSupportGetAll; m_caps[CapType::IAutomaticCropUsesFrame] = [this](Msg msg, Capability& data)->Result { - return CapSupGetAll(msg, data, m_scanparam->is_autocrop, false); + return CapSupGetAll(msg, data, m_scanparam->is_autocrop, false); }; m_query[CapType::AutoScan] = msgSupportGetAllSetReset; @@ -1238,13 +1239,13 @@ Result HuagaoDs::identityOpenDs(const Identity&) { if (Msg::Set == msg) { auto autosize = data.currentItem(); if (autosize == AutoSize::Auto){ - if(m_scanparam->papertype==(byte)PaperSize::UsStatement){ + if(m_scanparam->papertype==(BYTE)PaperSize::UsStatement){ m_scanparam->is_autocrop = 0; m_autoboarderdetcet = false; } else{ m_scanparam->is_autocrop = 1; - m_scanparam->papertype = (byte)Twpp::PaperSize::None; + m_scanparam->papertype = (BYTE)Twpp::PaperSize::None; m_scanparam->paperAlign = PaperAlign::Rot0; m_autoboarderdetcet = true; } @@ -1264,9 +1265,9 @@ Result HuagaoDs::identityOpenDs(const Identity&) { if (Msg::Set == msg) { auto autodetectborder = data.currentItem(); if (autodetectborder){ - if(m_scanparam->papertype!=(byte)PaperSize::UsStatement){ + if(m_scanparam->papertype!=(BYTE)PaperSize::UsStatement){ m_scanparam->is_autocrop = true; - m_scanparam->papertype = (byte)Twpp::PaperSize::None; + m_scanparam->papertype = (BYTE)Twpp::PaperSize::None; m_scanparam->paperAlign = PaperAlign::Rot0; m_autosize = (UInt16)AutoSize::Auto; } @@ -1284,7 +1285,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { //m_caps[CapType::IImageMerge] = [this](Msg msg, Capability& data)->Result { // if (Msg::Set == msg) { // auto autocrop = data.currentItem(); - // m_scanparam->en_fold = (byte)autocrop; + // m_scanparam->en_fold = (BYTE)autocrop; // if ((UInt16)autocrop != 0){ // m_scanparam->is_duplex = 1; // m_scanparam->autodescrew = 1;//ϲʱ ĬԶƫ @@ -1292,7 +1293,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { // } // return success(); // } - // return CapSupGetAllResetEx(msg, data, m_scanparam->en_fold, 0); + // return CapSupGetAllResetEx(msg, data, m_scanparam->en_fold, 0); //}; m_query[CapType(CapTypeEx::TwEx_EnFold)] = msgSupportGetAllSetReset; @@ -1307,7 +1308,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { } return success(); } - return CapSupGetAllResetEx(msg, data, { 0,1 }, m_scanparam->en_fold, 0,m_scanparam->en_fold ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { 0,1 }, m_scanparam->en_fold, 0,m_scanparam->en_fold ? 1 : 0, 0); }; m_query[CapType::IAutoDiscardBlankPages] = msgSupportGetAllSetReset; @@ -1347,7 +1348,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->is_autodiscradblank_normal = 0; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->is_autodiscradblank_normal, Bool(false), m_scanparam->is_autodiscradblank_normal ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->is_autodiscradblank_normal, Bool(false), m_scanparam->is_autodiscradblank_normal ? 1 : 0, 0); }; m_query[(CapType)(CapTypeEx::TwEx_IBackRotate180)] = msgSupportGetAllSetReset; @@ -1359,7 +1360,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->is_duplex = 1; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->is_backrotate180, Bool(false), m_scanparam->is_backrotate180 ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->is_backrotate180, Bool(false), m_scanparam->is_backrotate180 ? 1 : 0, 0); }; //ڿ @@ -1370,7 +1371,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->fillbackground = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->fillbackground, Bool(true), m_scanparam->fillbackground ? 1 : 0, 1); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->fillbackground, Bool(true), m_scanparam->fillbackground ? 1 : 0, 1); }; //üƫ m_query[(CapType)(CapTypeEx::TwEx_CroporDesaskewIndent)] = msgSupportGetAllSetReset; @@ -1427,7 +1428,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->fillhole.is_fillhole = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->fillhole.is_fillhole, Bool(true), m_scanparam->fillhole.is_fillhole ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->fillhole.is_fillhole, Bool(true), m_scanparam->fillhole.is_fillhole ? 1 : 0, 0); }; m_query[(CapType)(CapTypeEx::TwEx_IFillHoleRatio)] = msgSupportGetAllSetReset; @@ -1452,7 +1453,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->detachnoise.is_detachnoise = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->detachnoise.is_detachnoise, FALSE, m_scanparam->detachnoise.is_detachnoise ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->detachnoise.is_detachnoise, FALSE, m_scanparam->detachnoise.is_detachnoise ? 1 : 0, 0); }; m_query[(CapType)(CapTypeEx::TwEx_IDetachNoiseValue)] = msgSupportGetAllSetReset; @@ -1472,13 +1473,13 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_caps[(CapType)(CapTypeEx::TwEx_IMultiOutputRed)] = [this](Msg msg, Capability& data)->Result { if (Msg::Set == msg) { auto mech = data.currentItem(); - if (m_scanparam->pixtype == (byte)PixelType::Rgb) + if (m_scanparam->pixtype == (BYTE)PixelType::Rgb) m_scanparam->multi_output_red = mech; else m_scanparam->multi_output_red = 0;//Dzɫ ʹö return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->multi_output_red, FALSE, m_scanparam->multi_output_red ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->multi_output_red, FALSE, m_scanparam->multi_output_red ? 1 : 0, 0); }; //⿨ m_query[(CapType)(CapTypeEx::TwEx_HsvCorrect)] = msgSupportGetAllSetReset; @@ -1488,7 +1489,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->hsvcorrect = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->hsvcorrect, FALSE, m_scanparam->hsvcorrect ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->hsvcorrect, FALSE, m_scanparam->hsvcorrect ? 1 : 0, 0); }; m_query[CapType::IFilter] = msgSupportGetAllSetReset; @@ -1496,15 +1497,15 @@ Result HuagaoDs::identityOpenDs(const Identity&) { if (Msg::Set == msg) { auto mech = data.currentItem(); if (mech == Filter::None || mech == Filter::Red || mech == Filter::Green || mech == Filter::Blue) { - m_scanparam->filter = (byte)mech; + m_scanparam->filter = (BYTE)mech; if (mech != Filter::None){ - m_scanparam->enhance_color = (byte)Enchace_Color::Enhance_None; + m_scanparam->enhance_color = (BYTE)Enchace_Color::Enhance_None; } return success(); } return badValue(); } - return CapSupGetAllReset(msg, data, { Filter::Red,Filter::Green,Filter::Blue,Filter::None }, m_scanparam->filter, Filter::None, m_scanparam->filter, 3); + return CapSupGetAllReset(msg, data, { Filter::Red,Filter::Green,Filter::Blue,Filter::None }, m_scanparam->filter, Filter::None, m_scanparam->filter, 3); }; //ɫǿ @@ -1512,22 +1513,22 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_caps[(CapType)(CapTypeEx::TwEx_IEnhanceColor)] = [this](Msg msg, Capability& data)->Result { if (Msg::Set == msg) { auto mech = data.currentItem(); - if (m_scanparam->pixtype == (byte)PixelType::Rgb){ - m_scanparam->enhance_color = (byte)Enchace_Color::Enhance_None; + if (m_scanparam->pixtype == (BYTE)PixelType::Rgb){ + m_scanparam->enhance_color = (BYTE)Enchace_Color::Enhance_None; } else{ if (mech == Enchace_Color::Enhance_None || mech == Enchace_Color::Enhance_Red || mech == Enchace_Color::Enhance_Green || mech == Enchace_Color::Enhance_Blue) { - m_scanparam->enhance_color = (byte)mech; - if (mech != (byte)Enchace_Color::Enhance_None) - m_scanparam->filter = (byte)Filter::None; + m_scanparam->enhance_color = (BYTE)mech; + if (mech != (BYTE)Enchace_Color::Enhance_None) + m_scanparam->filter = (BYTE)Filter::None; if (m_scanparam->pixtype == (int)PixelType::BlackWhite) { - if (m_scanparam->filter == (byte)Filter::None && m_scanparam->enhance_color == (byte)Enchace_Color::Enhance_None) + if (m_scanparam->filter == (BYTE)Filter::None && m_scanparam->enhance_color == (BYTE)Enchace_Color::Enhance_None) { - m_scanparam->filter = (byte)Filter::None; - m_scanparam->enhance_color = (byte)Enchace_Color::Enhance_Red; + m_scanparam->filter = (BYTE)Filter::None; + m_scanparam->enhance_color = (BYTE)Enchace_Color::Enhance_Red; } } return success(); @@ -1535,7 +1536,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { } return badValue(); } - return CapSupGetAllResetEx(msg, data, { Enchace_Color::Enhance_None,Enchace_Color::Enhance_Red,Enchace_Color::Enhance_Green,Enchace_Color::Enhance_Blue }, m_scanparam->enhance_color, Enchace_Color::Enhance_None, m_scanparam->enhance_color, 0); + return CapSupGetAllResetEx(msg, data, { Enchace_Color::Enhance_None,Enchace_Color::Enhance_Red,Enchace_Color::Enhance_Green,Enchace_Color::Enhance_Blue }, m_scanparam->enhance_color, Enchace_Color::Enhance_None, m_scanparam->enhance_color, 0); }; m_query[(CapType)(CapTypeEx::TwEx_Sharpen)] = msgSupportGetAllSetReset; @@ -1544,10 +1545,10 @@ Result HuagaoDs::identityOpenDs(const Identity&) { auto mech = data.currentItem(); if (m_scanparam->pixtype == (int)PixelType::BlackWhite) return badValue(); - m_scanparam->sharpen = (byte)mech; + m_scanparam->sharpen = (BYTE)mech; return success(); } - return CapSupGetAllResetEx(msg, data, { SharpenBlur::Sharpen_None,SharpenBlur::Sharpen_Normal,SharpenBlur::Sharpen_More,SharpenBlur::Sharpen_Blur,SharpenBlur::Sharpen_Blur_More }, m_scanparam->sharpen, SharpenBlur::Sharpen_None, m_scanparam->sharpen, 0); + return CapSupGetAllResetEx(msg, data, { SharpenBlur::Sharpen_None,SharpenBlur::Sharpen_Normal,SharpenBlur::Sharpen_More,SharpenBlur::Sharpen_Blur,SharpenBlur::Sharpen_Blur_More }, m_scanparam->sharpen, SharpenBlur::Sharpen_None, m_scanparam->sharpen, 0); }; /* Աȶ gamma range Range */ @@ -1691,7 +1692,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->hardwarecaps.en_skrewdetect = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->sharpen, TRUE, m_scanparam->hardwarecaps.en_skrewdetect ? 1 : 0, 1); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->sharpen, TRUE, m_scanparam->hardwarecaps.en_skrewdetect ? 1 : 0, 1); }; m_query[(CapType)(CapTypeEx::TwEx_ScrewLevel)] = msgSupportGetAllSetReset; @@ -1704,7 +1705,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { } return badValue(); } - return CapSupGetAllResetEx(msg, data, m_scanparam->hardwarecaps.skrewdetectlevel, 3); + return CapSupGetAllResetEx(msg, data, m_scanparam->hardwarecaps.skrewdetectlevel, 3); }; //װ m_query[(CapType)(CapTypeEx::TwEx_StableDetectEnable)] = msgSupportGetAllSetReset; @@ -1714,7 +1715,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->hardwarecaps.en_stapledetect = mech; return success(); } - return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->hardwarecaps.en_stapledetect, FALSE, m_scanparam->hardwarecaps.en_stapledetect ? 1 : 0, 0); + return CapSupGetAllResetEx(msg, data, { FALSE,TRUE }, m_scanparam->hardwarecaps.en_stapledetect, FALSE, m_scanparam->hardwarecaps.en_stapledetect ? 1 : 0, 0); }; m_query[(CapType)(CapTypeEx::TwEx_DogEarDelection)] = msgSupportGetAllSetReset; @@ -1724,7 +1725,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->is_dogeardetection= mech; return success(); } - return CapSupGetAllResetEx(msg, data, m_scanparam->is_dogeardetection, FALSE); + return CapSupGetAllResetEx(msg, data, m_scanparam->is_dogeardetection, FALSE); }; //˫ż ٷ׼ Э޸Ϊbool m_query[CapType::DoubleFeedDetection] = msgSupportGetAllSetReset; @@ -1734,7 +1735,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_scanparam->hardwarecaps.en_doublefeed = mech; return success(); } - return CapSupGetAllResetEx(msg, data, m_scanparam->hardwarecaps.en_doublefeed, TRUE); + return CapSupGetAllResetEx(msg, data, m_scanparam->hardwarecaps.en_doublefeed, TRUE); }; #ifdef G200 @@ -1742,13 +1743,13 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_query[(CapType)(CapTypeEx::TwEx_LowPowerMode)] = msgSupportGetAllSetReset; m_caps[(CapType)(CapTypeEx::TwEx_LowPowerMode)] = [this](Msg msg, Capability& data)->Result { if (Msg::Set == msg) { - auto mech = data.currentItem(); + auto mech = data.currentItem(); m_scanparam->hardwarecaps.lowpowermode = (LowPowerMode)mech; return success(); } - return CapSupGetAllResetEx(msg, data, + return CapSupGetAllResetEx(msg, data, { LowPowerMode::Min_None,LowPowerMode::Min_5,LowPowerMode::Min_10,LowPowerMode::Min_20, LowPowerMode::Min_30, LowPowerMode::Min_60, LowPowerMode::Min_120, LowPowerMode::Min_240 }, - m_scanparam->hardwarecaps.lowpowermode, LowPowerMode::Min_30,(byte)m_scanparam->hardwarecaps.lowpowermode, 4); + m_scanparam->hardwarecaps.lowpowermode, LowPowerMode::Min_30,(BYTE)m_scanparam->hardwarecaps.lowpowermode, 4); }; #endif // LANXUM return success();