From 11bbcb77bbafad216e8fe06e899bbac06e8321eb Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Wed, 29 May 2013 17:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ESV200E=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8D=A1=E5=A4=9A=E9=80=9A=E9=81=93=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 20 +++++++++++ .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 5 ++- .../UsbUtility/UsbUtil/Videocard_SDK3000.cpp | 4 +-- .../UsbUtility/UsbUtil/Videocard_SV2000E.cpp | 31 +++++++++++++++--- .../UsbUtility/UsbUtil/Videocard_SV2000E.h | 3 ++ .../UsbUtility/UsbUtil/Videocard_TC4000.cpp | 4 +-- .../Hsi/Tools/UsbUtility/UsbUtil/resource.h | 5 ++- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 207360 -> 207360 bytes 8 files changed, 62 insertions(+), 10 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index 7a192d1..d791ba5 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -736,3 +736,23 @@ Init:Open device succeed . _start_machine Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index 8482aec..a84ee13 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -386,12 +386,15 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "SV2000视频卡" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "彩色图像",IDC_RADIO_SV2000E_RGB,"Button",BS_AUTORADIOBUTTON,435,37,48,10 + CONTROL "彩色图像",IDC_RADIO_SV2000E_RGB,"Button",BS_AUTORADIOBUTTON | WS_GROUP,435,37,48,10 CONTROL "黑白图像",IDC_RADIO_SV2000E_GRAY,"Button",BS_AUTORADIOBUTTON,435,58,48,10 CONTROL "垂直镜像",IDC_CHECK_SV2000E_MIRROR_VERTICALLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,435,85,48,10 PUSHBUTTON "保存图片",IDC_BUTTON_SV2000E_SAVEFILE,435,115,50,14 DEFPUSHBUTTON "开始",IDOK,372,298,50,14 PUSHBUTTON "退出",IDCANCEL,435,298,50,14 + GROUPBOX "通道选择",IDC_STATIC,439,140,42,61 + CONTROL "1",IDC_RADIO_SV2000E_CHANNEL1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,450,160,23,10 + CONTROL "2",IDC_RADIO_SV2000E_CHANNEL2,"Button",BS_AUTORADIOBUTTON,450,182,26,10 END IDD_SO7_UTIL_SETUP_CONFIGURE DIALOGEX 0, 0, 476, 451 diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SDK3000.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SDK3000.cpp index 3222d0b..bea4d4a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SDK3000.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SDK3000.cpp @@ -251,9 +251,9 @@ void CVideocard_SDK3000::ConvertVideoSubType(const Image_Buffer& _ImageBuffer, B { lCnt1=0; if(_bMirror) - pDstData=(BYTE*)_ImageBuffer.ScanLine[479-y]; - else pDstData=(BYTE*)_ImageBuffer.ScanLine[y]; + else + pDstData=(BYTE*)_ImageBuffer.ScanLine[479-y]; for(x=0;x<640*3;x+=3) { switch(_type) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.cpp index 7d028de..91a639c 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.cpp @@ -50,6 +50,8 @@ BEGIN_MESSAGE_MAP(CVideocard_SV2000E, CDialog) ON_BN_CLICKED(IDC_BUTTON_SV2000E_SAVEFILE, &CVideocard_SV2000E::OnBnClickedButtonSv2000eSavefile) ON_BN_CLICKED(IDCANCEL, &CVideocard_SV2000E::OnBnClickedCancel) ON_BN_CLICKED(IDOK, &CVideocard_SV2000E::OnBnClickedOk) + ON_BN_CLICKED(IDC_RADIO_SV2000E_CHANNEL1, &CVideocard_SV2000E::OnBnClickedRadioSv2000eChannel1) + ON_BN_CLICKED(IDC_RADIO_SV2000E_CHANNEL2, &CVideocard_SV2000E::OnBnClickedRadioSv2000eChannel2) END_MESSAGE_MAP() @@ -80,6 +82,10 @@ BOOL CVideocard_SV2000E::OnInitDialog() } ((CButton *)GetDlgItem(IDC_RADIO_SV2000E_RGB))->SetCheck(TRUE); ((CButton *)GetDlgItem(IDC_RADIO_SV2000E_GRAY))->SetCheck(FALSE); + + m_Channel=1; + ((CButton *)GetDlgItem(IDC_RADIO_SV2000E_CHANNEL1))->SetCheck(TRUE); + ((CButton *)GetDlgItem(IDC_RADIO_SV2000E_CHANNEL2))->SetCheck(FALSE); return TRUE; // return TRUE unless you set the focus to a control } @@ -93,6 +99,7 @@ void CVideocard_SV2000E::OnBnClickedOk() //=================================================== void CVideocard_SV2000E::OnBnClickedCancel() { + KillTimer(1); UnloadVideocard(); CDialog::OnCancel(); } @@ -138,7 +145,20 @@ void CVideocard_SV2000E::OnBnClickedButtonSv2000eSavefile() delete fdlg; m_bSaveFile=TRUE; } - +//=================================================== +void CVideocard_SV2000E::OnBnClickedRadioSv2000eChannel1() +{ + UnloadVideocard(); + m_Channel=1; + LoadVideocard(); +} +//=================================================== +void CVideocard_SV2000E::OnBnClickedRadioSv2000eChannel2() +{ + UnloadVideocard(); + m_Channel=2; + LoadVideocard(); +} //======================================= BOOL CVideocard_SV2000E::LoadVideocard() { @@ -170,7 +190,7 @@ BOOL CVideocard_SV2000E::LoadVideocard() DXDeviceRun(m_device); m_dwCard=2; - m_status=DXSetVideoSource(m_device, 1); + m_status=DXSetVideoSource(m_device, m_Channel); //==============================消除隔行========================================= m_status=DXSetVideoPara(m_device,standard,colorspace,width,height,framerate); @@ -215,9 +235,9 @@ void CVideocard_SV2000E::ConvertVideoSubType(const Image_Buffer& _ImageBuffer, B { lCnt1=0; if(_bMirror) - pDstData=(BYTE*)_ImageBuffer.ScanLine[479-y]; - else pDstData=(BYTE*)_ImageBuffer.ScanLine[y]; + else + pDstData=(BYTE*)_ImageBuffer.ScanLine[479-y]; for(x=0;x<640*3;x+=3) { switch(_type) @@ -455,3 +475,6 @@ unsigned CALLBACK SVAPrcVidCapCallBack(unsigned char* buffer, unsigned colorSpac memcpy(g_DataBuffer,(BYTE*)buffer,width*height*2); return 0; } + + + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.h index 64b53f3..d4b6aae 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV2000E.h @@ -37,10 +37,13 @@ protected: BOOL m_bMirror; BOOL m_bSaveFile; CString m_SaveFile; + unsigned int m_Channel; public: BOOL LoadVideocard(); BOOL UnloadVideocard(); void ConvertVideoSubType(const Image_Buffer& _ImageBuffer, BYTE *pSrcData,ConvertColorType _type,BOOL _bMirror); BOOL SaveBitmapToFile(const CBitmap& bitmap, CString lpFileName); + afx_msg void OnBnClickedRadioSv2000eChannel1(); + afx_msg void OnBnClickedRadioSv2000eChannel2(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_TC4000.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_TC4000.cpp index 5018415..dbe3c9e 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_TC4000.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_TC4000.cpp @@ -250,9 +250,9 @@ void CVideocard_TC4000::ConvertVideoSubType(const Image_Buffer& _ImageBuffer, BY { lCnt1=0; if(_bMirror) - pDstData=(BYTE*)_ImageBuffer.ScanLine[479-y]; - else pDstData=(BYTE*)_ImageBuffer.ScanLine[y]; + else + pDstData=(BYTE*)_ImageBuffer.ScanLine[479-y]; for(x=0;x<640*3;x+=3) { switch(_type) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index 5a577a1..d33410b 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -665,6 +665,9 @@ #define IDC_RADIO_TC4000_CHANNEL2 1567 #define IDC_RADIO_TC4000_CHANNEL3 1568 #define IDC_RADIO_TC4000_CHANNEL4 1569 +#define IDC_RADIO1 1570 +#define IDC_RADIO_SV2000E_CHANNEL1 1570 +#define IDC_RADIO_SV2000E_CHANNEL2 1571 // Next default values for new objects // @@ -672,7 +675,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 166 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1570 +#define _APS_NEXT_CONTROL_VALUE 1572 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo index 4a6d31cdc94b851c2175320e5faa77b9facb78d2..44cbfda2340d155592dac313768d1ed5219830f2 100644 GIT binary patch delta 3088 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