diff --git a/huagao/CBasicPage.cpp b/huagao/CBasicPage.cpp index b9cb21d3..7e09b4c3 100644 --- a/huagao/CBasicPage.cpp +++ b/huagao/CBasicPage.cpp @@ -46,7 +46,7 @@ static std::vector surportStyles = { _T("A4"), _T("A5"), _T("A6"), - _T("B4"), + //_T("B4"), _T("B5"), _T("B6"), _T("Letter"), diff --git a/huagao/CFeedPaperPage.cpp b/huagao/CFeedPaperPage.cpp index 5d45e980..a6c74446 100644 --- a/huagao/CFeedPaperPage.cpp +++ b/huagao/CFeedPaperPage.cpp @@ -15,7 +15,6 @@ std::vector g400hiden = IDC_LBSDL, IDC_SLDDETECTLEVEL, IDC_LBSDR, - IDC_CKBACKROTATION }; // CFeedPaperPage 对话框 diff --git a/huagao/CTwainUI.h b/huagao/CTwainUI.h index 5ccead96..d7145f9f 100644 --- a/huagao/CTwainUI.h +++ b/huagao/CTwainUI.h @@ -51,12 +51,12 @@ static std::map paperStatusMap = { {0,{TwSS::A4,PaperAlign::Rot0}}, {1,{TwSS::A5,PaperAlign::Rot0}}, {2,{TwSS::A6,PaperAlign::Rot0}}, - {3,{TwSS::B4,PaperAlign::Rot0}}, - {4,{TwSS::B5,PaperAlign::Rot0}}, - {5,{TwSS::B6,PaperAlign::Rot0}}, - {6,{TwSS::USLetter,PaperAlign::Rot0}}, - {7,{TwSS::USLegal,PaperAlign::Rot0}}, - {8,{TwSS::None,PaperAlign::Rot0}}, + //{3,{TwSS::B4,PaperAlign::Rot0}}, + {3,{TwSS::B5,PaperAlign::Rot0}}, + {4,{TwSS::B6,PaperAlign::Rot0}}, + {5,{TwSS::USLetter,PaperAlign::Rot0}}, + {6,{TwSS::USLegal,PaperAlign::Rot0}}, + {7,{TwSS::None,PaperAlign::Rot0}}, }; #endif diff --git a/huagao/Device/UsbScanEx.cpp b/huagao/Device/UsbScanEx.cpp index 5ee6ff19..3fdcdc74 100644 --- a/huagao/Device/UsbScanEx.cpp +++ b/huagao/Device/UsbScanEx.cpp @@ -98,7 +98,7 @@ bool UsbScanEx::close() DWORD cbRet = 0; OVERLAPPED overlapped; PIPE_TYPE pipeType = ALL_PIPE; - + memset(&overlapped, 0, sizeof(OVERLAPPED)); overlapped.hEvent = CreateEvent(NULL, // pointer to security attributes @@ -142,7 +142,7 @@ void UsbScanEx::set_timeout(int timeout) int UsbScanEx::read_bulk(void* data, int len) { BOOL b_ret = FALSE; - HANDLE h_pipe = m_usb_pipes[BULK_IN].h_pipe; + HANDLE h_pipe = m_usb_pipes[BULK_IN].h_pipe; unsigned long pdw_ret = len; LPOVERLAPPED lp_overlap = ov + BULK_IN; lp_overlap->Internal = 0; diff --git a/huagao/ImageProcess/ImageApplyAdjustColors.cpp b/huagao/ImageProcess/ImageApplyAdjustColors.cpp index 0d1eead8..6554c4e2 100644 --- a/huagao/ImageProcess/ImageApplyAdjustColors.cpp +++ b/huagao/ImageProcess/ImageApplyAdjustColors.cpp @@ -23,7 +23,8 @@ CImageApplyAdjustColors::~CImageApplyAdjustColors(void) void CImageApplyAdjustColors::apply(cv::Mat& pDib,int side) { #ifdef LOG - FileTools::write_log("imgprc.txt", "enter CImageApplyAdjustColors apply"); + FileTools:: + "imgprc.txt", "enter CImageApplyAdjustColors apply"); #endif // LOG if (pDib.empty()) { diff --git a/huagao/ImageProcess/ImageApplyBWBinaray.cpp b/huagao/ImageProcess/ImageApplyBWBinaray.cpp index 7dfee1da..b87803d1 100644 --- a/huagao/ImageProcess/ImageApplyBWBinaray.cpp +++ b/huagao/ImageProcess/ImageApplyBWBinaray.cpp @@ -86,7 +86,8 @@ void CImageApplyBWBinaray::apply(cv::Mat& pDib, int side) } #ifdef LOG - FileTools::write_log("imgprc.txt", "exit CImageApplyBWBinaray apply"); + FileTools:: + "imgprc.txt", "exit CImageApplyBWBinaray apply"); #endif // LOG } diff --git a/huagao/ImageProcess/ImageApplyChannel.cpp b/huagao/ImageProcess/ImageApplyChannel.cpp index d4e7c6bb..a82b0800 100644 --- a/huagao/ImageProcess/ImageApplyChannel.cpp +++ b/huagao/ImageProcess/ImageApplyChannel.cpp @@ -21,7 +21,8 @@ CImageApplyChannel::~CImageApplyChannel(void) void CImageApplyChannel::apply(cv::Mat& pDib,int side) { #ifdef LOG - FileTools::write_log("imgprc.txt", "enter CImageApplyChannel apply"); + FileTools:: + "imgprc.txt", "enter CImageApplyChannel apply"); #endif // LOG if (pDib.empty()) diff --git a/huagao/ImageProcess/ImageApplyDiscardBlank.cpp b/huagao/ImageProcess/ImageApplyDiscardBlank.cpp index 02052262..9a1fa4c7 100644 --- a/huagao/ImageProcess/ImageApplyDiscardBlank.cpp +++ b/huagao/ImageProcess/ImageApplyDiscardBlank.cpp @@ -119,7 +119,8 @@ cv::Mat CImageApplyDiscardBlank::getRoiMat(const cv::Mat& image) void CImageApplyDiscardBlank::apply(cv::Mat& pDib, int side) { #ifdef LOG - FileTools::write_log("imgprc.txt", "enter CImageApplyDiscardBlank apply"); + FileTools:: + "imgprc.txt", "enter CImageApplyDiscardBlank apply"); #endif // LOG if (pDib.empty()) diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp index 2739e567..176c19ea 100644 --- a/huagao/huagaods.cpp +++ b/huagao/huagaods.cpp @@ -811,9 +811,10 @@ Result HuagaoDs::identityOpenDs(const Identity&) { data = Capability::createEnumeration(data.type(), { PaperSize::A3,PaperSize::A4,PaperSize::A5, PaperSize::A6,PaperSize::IsoB4,PaperSize::IsoB5, PaperSize::IsoB6,PaperSize::UsLetter,PaperSize::UsLegal, - PaperSize::UsLedger,PaperSize::MaxSize,PaperSize::None }, + PaperSize::UsLedger,PaperSize::MaxSize,PaperSize::None,PaperSize::UsStatement}, index == -1 ? 0 : index, 0); + return success(); } case Msg::GetCurrent: @@ -837,11 +838,21 @@ Result HuagaoDs::identityOpenDs(const Identity&) { } if (contains) { m_scanparam->papertype = (byte)paper; - if (paper == (byte)PaperSize::None) + if (paper == (byte)PaperSize::None|| paper == (byte)PaperSize::UsStatement) m_scanparam->paperAlign = PaperAlign::Rot0; - 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; + + 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; + } return success(); } return badValue(); @@ -1193,8 +1204,9 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_caps[CapType::IAutomaticDeskew] = [this](Msg msg, Capability& data)->Result { switch (msg) { case Msg::Get: - data = Capability::createEnumeration( - { Bool(), Bool(true) }, Bool(m_scanparam->autodescrew == 0 ? false : true)); + //data = Capability::createEnumeration( + // { Bool(), Bool(true) }, Bool(m_scanparam->autodescrew == 0 ? false : true)); + data = Capability::createOneValue(m_scanparam->autodescrew); return success(); case Msg::Reset: m_scanparam->autodescrew = true; @@ -1344,10 +1356,18 @@ Result HuagaoDs::identityOpenDs(const Identity&) { auto autosize = data.currentItem(); if (autosize == AutoSize::Auto) { - m_scanparam->is_autocrop = 1; - m_scanparam->papertype = (byte)Twpp::PaperSize::None; - m_scanparam->paperAlign = PaperAlign::Rot0; - m_autoboarderdetcet = true; + 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->paperAlign = PaperAlign::Rot0; + m_autoboarderdetcet = true; + } } else { @@ -1382,10 +1402,13 @@ Result HuagaoDs::identityOpenDs(const Identity&) { auto autodetectborder = data.currentItem(); if (autodetectborder) { - m_scanparam->is_autocrop = true; - m_scanparam->papertype = (byte)Twpp::PaperSize::None; - m_scanparam->paperAlign = PaperAlign::Rot0; - m_autosize = (UInt16)AutoSize::Auto; + if(m_scanparam->papertype!=(byte)PaperSize::UsStatement) + { + m_scanparam->is_autocrop = true; + m_scanparam->papertype = (byte)Twpp::PaperSize::None; + m_scanparam->paperAlign = PaperAlign::Rot0; + m_autosize = (UInt16)AutoSize::Auto; + } } else { @@ -2449,7 +2472,6 @@ void HuagaoDs::onDeviceEvent(int eventID) { //if (mapDeviceEvent.count(eventID)) //{ - // //devEvent.push(DeviceEvent::) // DeviceEvent::Type dev_type = mapDeviceEvent[eventID]; // auto evt = DeviceEvent::simple((DeviceEvent::Type)dev_type, "HuaGo Device Event"); // devEvent.push(evt); @@ -2497,7 +2519,7 @@ void HuagaoDs::updataGscanCap() Twpp::Result HuagaoDs::startScan() { xtfer = 0; - FileTools::write_log("D:\\1.txt", "RESET TWAIN TRANSFERED IMAGE COUNT"); + //FileTools::write_log("D:\\1.txt", "RESET TWAIN TRANSFERED IMAGE COUNT"); if (!scanner->IsConnected()) { scanner->open(0x064B, 0x7823); diff --git a/huagao/stdafx.h b/huagao/stdafx.h index 73b30bc3..587296b4 100644 Binary files a/huagao/stdafx.h and b/huagao/stdafx.h differ