diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/AboutDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/AboutDlg.cpp new file mode 100644 index 0000000..a10092b --- /dev/null +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/AboutDlg.cpp @@ -0,0 +1,34 @@ +// AboutDlg.cpp : implementation file +// + +#include "stdafx.h" +#include "resource.h" +#include "AboutDlg.h" +#include "afxdialogex.h" + + +// CAboutDlg dialog + +IMPLEMENT_DYNAMIC(CAboutDlg, CDialog) + +CAboutDlg::CAboutDlg(CWnd* pParent /*=NULL*/) + : CDialog(CAboutDlg::IDD, pParent) +{ + +} + +CAboutDlg::~CAboutDlg() +{ +} + +void CAboutDlg::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); +} + + +BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) +END_MESSAGE_MAP() + + +// CAboutDlg message handlers diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/AboutDlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/AboutDlg.h new file mode 100644 index 0000000..6a3e70b --- /dev/null +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/AboutDlg.h @@ -0,0 +1,21 @@ +#pragma once + + +// CAboutDlg dialog + +class CAboutDlg : public CDialog +{ + DECLARE_DYNAMIC(CAboutDlg) + +public: + CAboutDlg(CWnd* pParent = NULL); // standard constructor + virtual ~CAboutDlg(); + +// Dialog Data + enum { IDD = IDD_ABOUTBOX }; + +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + + DECLARE_MESSAGE_MAP() +}; 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 655126e..ea02d7a 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 @@ -368,15 +368,16 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Utility for SO7" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON,48,39,69,10 - CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,48,64,69,10 - CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,48,89,69,10 - CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,48,114,62,10 - CONTROL "控制器",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,175,39,40,10 - CONTROL "Manual Machine",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,175,57,67,10 + CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON | WS_GROUP,48,39,69,10 + CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,48,57,69,10 + CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,48,75,68,10 + CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,48,93,69,10 + CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,48,111,62,10 + CONTROL "控制器(USB)",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,175,39,69,10 + CONTROL "控制器(RS232)",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,175,57,77,10 CONTROL "Keyence激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,75,76,10 - CONTROL "Verifcation",IDC_RADIO_SO7_VERIFICATION_ALGORITHM, - "Button",BS_AUTORADIOBUTTON,175,93,50,10 + CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM, + "Button",BS_AUTORADIOBUTTON,175,93,81,10 CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON,175,111,45,10 DEFPUSHBUTTON "OK",IDOK,181,145,50,14 PUSHBUTTON "Cancel",IDCANCEL,241,145,50,14 @@ -756,7 +757,7 @@ BEGIN BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 291 - TOPMARGIN, 7 + TOPMARGIN, 6 BOTTOMMARGIN, 159 END @@ -1200,15 +1201,15 @@ BEGIN PUSHBUTTON "Home",IDC_BUTTON_ANIMATICS_HOME,35,40,63,15 END -IDD_ABOUTBOX DIALOGEX 0, 0, 198, 63 +IDD_ABOUTBOX DIALOGEX 0, 0, 198, 67 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About Mv_Util" +CAPTION "About Utility" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 103,IDC_STATIC,14,14,21,20 - LTEXT "Mv/Mitu_Util Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX - LTEXT "Hexagon Metrology., Copyright (C) 2012",IDC_STATIC,42,26,139,8 - DEFPUSHBUTTON "OK",IDOK,141,42,50,14,WS_GROUP + ICON IDR_MAINFRAME,IDC_STATIC,16,11,21,20 + LTEXT "Version 6.0",IDC_STATIC,89,13,45,8,SS_NOPREFIX + LTEXT "Hexagon Metrology, Copyright (C) 2013",IDC_STATIC,51,27,129,8 + DEFPUSHBUTTON "OK",IDOK,141,46,50,14,WS_GROUP END IDD_MV_UTIL_DIALOG DIALOGEX 0, 0, 407, 389 @@ -1688,7 +1689,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 191 TOPMARGIN, 7 - BOTTOMMARGIN, 56 + BOTTOMMARGIN, 60 END IDD_MV_UTIL_DIALOG, DIALOG @@ -1827,8 +1828,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2012,0,0,1 - PRODUCTVERSION 2012,0,0,1 + FILEVERSION 6,0,0,0 + PRODUCTVERSION 6,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1843,14 +1844,14 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "Hexagon" - VALUE "FileDescription", "Hexagon" - VALUE "FileVersion", "1.0.0.1" + VALUE "CompanyName", "Hexagon Metrology" + VALUE "FileDescription", "Utility for Hexagon Metrology" + VALUE "FileVersion", "6.0.0.0" VALUE "InternalName", "Usb_Util.exe" - VALUE "LegalCopyright", "(c) . All rights reserved." + VALUE "LegalCopyright", "Copyright 2013 Hexagon Metrology." VALUE "OriginalFilename", "Usb_Util.exe" VALUE "ProductName", "Utility" - VALUE "ProductVersion", "1.0.0.1" + VALUE "ProductVersion", "6.0.0.0" END END BLOCK "VarFileInfo" @@ -1868,6 +1869,7 @@ END STRINGTABLE BEGIN IDS_ABOUTBOX "&About Mv_Util..." + IDS_SO7_ABOUTBOX "&About Utility for SO7..." END #endif // English (United States) resources diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_UtilDlg.cpp index a6d292d..d363b84 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_UtilDlg.cpp @@ -2,6 +2,8 @@ // #include "stdafx.h" +#include "resource.h" +#include "AboutDlg.h" #include "Mv_Util.h" #include "Mv_UtilDlg.h" #include "Mv_Move_Location.h" @@ -32,35 +34,6 @@ char *str_index_z = "\r\nIndex Positions Z: "; char *str_model = "\r\nModel : "; char *str_serial_no = "\r\nSerial No : "; -// CAboutDlg dialog used for App About - -class CAboutDlg : public CDialog -{ -public: - CAboutDlg(); - -// Dialog Data - enum { IDD = IDD_ABOUTBOX }; - - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - -// Implementation -protected: - DECLARE_MESSAGE_MAP() -}; - -CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) -{ -} - -void CAboutDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); -} - -BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) -END_MESSAGE_MAP() // CMv_UtilDlg dialog diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp index d5c5910..ed9a716 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "resource.h" - +#include "AboutDlg.h" #include "..\..\..\SevenOcean\CMMIO_SERIAL.H" #include "..\..\..\SevenOcean\EF8000_Interface.h" #include "..\..\..\SevenOcean\SO7_Proto.h" @@ -39,6 +39,8 @@ #include "So7_Option.h" #include "afxdialogex.h" +//#define _RELEASE_ONLY_ONE_FUNCTION + //CSerial* m_pSO7_Serial=NULL; CPSerial* m_pSO7_PCDSerial=NULL; CSO7_Proto* m_pSO7_Proto=NULL; @@ -48,6 +50,7 @@ CKeyence_Proto* m_pKeyence_Proto=NULL; CSo7_Interface* m_pSo7_Interface=NULL; CEF8000_Interface* m_pEF8000_Interface=NULL; + // CSo7_Option dialog IMPLEMENT_DYNAMIC(CSo7_Option, CDialog) @@ -69,6 +72,7 @@ void CSo7_Option::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CSo7_Option, CDialog) + ON_WM_SYSCOMMAND() ON_WM_TIMER() ON_BN_CLICKED(IDOK, &CSo7_Option::OnBnClickedOk) ON_BN_CLICKED(IDCANCEL, &CSo7_Option::OnBnClickedCancel) @@ -92,7 +96,7 @@ BOOL CSo7_Option::OnInitDialog() { BOOL bNameValid; CString strAboutMenu; - bNameValid = strAboutMenu.LoadString(IDS_ABOUTBOX); + bNameValid = strAboutMenu.LoadString(IDS_SO7_ABOUTBOX); ASSERT(bNameValid); if (!strAboutMenu.IsEmpty()) { @@ -101,22 +105,47 @@ BOOL CSo7_Option::OnInitDialog() } } - ((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->SetCheck(TRUE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->SetCheck(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV4000E))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->SetCheck(FALSE); - ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->SetCheck(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->SetCheck(TRUE); ((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->SetCheck(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->SetCheck(FALSE); - + ((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->SetCheck(FALSE); + #ifdef _RELEASE_SO7_CONTROLER_ONLY + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV4000E))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->EnableWindow(FALSE); +#endif + +#ifdef _RELEASE_ONLY_ONE_FUNCTION SetTimer(1,50,NULL); #endif return TRUE; // return TRUE unless you set the focus to a control } - +//================================================================================================ +void CSo7_Option::OnSysCommand(UINT nID, LPARAM lParam) +{ + if ((nID & 0xFFF0) == IDM_ABOUTBOX) + { + CAboutDlg dlgAbout; + dlgAbout.DoModal(); + } + else + { + CDialog::OnSysCommand(nID, lParam); + } +} //=================================== void CSo7_Option::OnBnClickedOk() { @@ -249,7 +278,7 @@ void CSo7_Option::OnBnClickedOk() } -#ifdef _RELEASE_SO7_CONTROLER_ONLY +#ifdef _RELEASE_ONLY_ONE_FUNCTION OnBnClickedCancel(); #endif } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h index 2b9a761..775cb58 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.h @@ -19,6 +19,7 @@ protected: virtual BOOL OnInitDialog(); DECLARE_MESSAGE_MAP() public: + afx_msg void OnSysCommand(UINT nID, LPARAM lParam); afx_msg void OnBnClickedOk(); afx_msg void OnBnClickedCancel(); afx_msg void OnTimer(UINT_PTR nIDEvent); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj index 4e2bdd4..1a93509 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj @@ -117,6 +117,7 @@ false false false + Utility for So7 Controller @@ -313,6 +314,7 @@ + @@ -371,6 +373,7 @@ + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters index de1d576..3b180de 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters @@ -130,6 +130,9 @@ Sources Files + + Sources Files + @@ -291,6 +294,9 @@ Header Files + + Header Files + 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 33d6688..2b55c23 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -11,6 +11,7 @@ #define IDD_ABOUTBOX 100 #define IDS_ABOUTBOX 101 #define IDD_MV_UTIL_DIALOG 102 +#define IDS_SO7_ABOUTBOX 102 #define IDD_DIALOG_FRAME_ID 104 #define IDD_MV_UTIL_MOVE_LOCATION 105 #define IDD_DIALOG_SET_LIGHTS 106 @@ -756,6 +757,7 @@ #define IDC_MFCBUTTON_STATUS_IN_PORT5 1665 #define IDC_RADIO_SPEED_GEAR5 1666 #define IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS 1667 +#define IDC_RADIO_VIDEOCARD_SV4000E 1668 #define IDC_MFCBUTTON_STATUS_IN_PORT6 1670 // Next default values for new objects @@ -764,7 +766,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 169 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1668 -#define _APS_NEXT_SYMED_VALUE 101 +#define _APS_NEXT_CONTROL_VALUE 1669 +#define _APS_NEXT_SYMED_VALUE 104 #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 ed5c6e8..3e17003 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ