新增阿尔泰卡测试功能。

This commit is contained in:
TAO Cheng
2014-04-29 18:13:54 +08:00
parent d1cf313511
commit 46b61ce1e0
19 changed files with 711 additions and 27 deletions
@@ -148,3 +148,4 @@ Init:Open device succeed .
Construct Cso7_Proto.
Init:Open device succeed .
@@ -395,31 +395,32 @@ BEGIN
EDITTEXT IDC_EDIT_ZOOM_TIME,14,159,112,112,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
END
IDD_SO7_OPTION_DIALOG DIALOGEX 0, 0, 278, 198
IDD_SO7_OPTION_DIALOG DIALOGEX 0, 0, 317, 169
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Utility for SO7"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON | WS_GROUP,39,39,69,10
CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,39,55,69,10
CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,39,71,68,10
CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,39,87,69,10
CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,39,103,62,10
CONTROL "USB Camera",IDC_RADIO_SO7_USB_CAMERA,"Button",BS_AUTORADIOBUTTON,39,119,62,10
CONTROL "控制器(USB",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,166,39,69,10
CONTROL "控制器(RS232",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,166,71,77,10
CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,166,87,76,10
CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,166,103,76,10
CONTROL "SDK3000视频卡",IDC_RADIO_VIDEOCARD_SDK3000,"Button",BS_AUTORADIOBUTTON | WS_GROUP,34,39,69,10
CONTROL "SV2000E视频卡",IDC_RADIO_VIDEOCARD_SV2000E,"Button",BS_AUTORADIOBUTTON,34,55,69,10
CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,34,71,68,10
CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,34,87,69,10
CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,34,103,62,10
CONTROL "USB Camera",IDC_RADIO_SO7_USB_CAMERA,"Button",BS_AUTORADIOBUTTON,34,119,62,10
CONTROL "控制器(USB",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,211,38,69,10
CONTROL "控制器(RS232",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,211,70,77,10
CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,114,39,76,10
CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,114,55,76,10
CONTROL "LK_H激光(ETHERNET)",IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET,
"Button",BS_AUTORADIOBUTTON,166,119,85,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,166,135,76,10
"Button",BS_AUTORADIOBUTTON,114,71,85,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,114,87,76,10
CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM,
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,39,135,81,10
CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,39,151,45,10
DEFPUSHBUTTON "OK",IDOK,163,177,50,14
PUSHBUTTON "Cancel",IDCANCEL,221,177,50,14
GROUPBOX "测试选项",IDC_STATIC,20,15,242,157
CONTROL "控制器(USB R",IDC_RADIO_CONTROLLER2,"Button",BS_AUTORADIOBUTTON,166,55,75,10
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,8,152,81,10
CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,152,45,10
DEFPUSHBUTTON "OK",IDOK,191,148,50,14
PUSHBUTTON "Cancel",IDCANCEL,260,148,50,14
GROUPBOX "测试选项",IDC_STATIC,20,15,280,123
CONTROL "控制器(USB R",IDC_RADIO_CONTROLLER2,"Button",BS_AUTORADIOBUTTON,211,54,75,10
CONTROL "ART PCI8822",IDC_RADIO_ART_PCI8622,"Button",BS_AUTORADIOBUTTON,114,103,76,10
END
IDD_SO7_VIDEOCARD_SDK3000 DIALOGEX 0, 0, 488, 316
@@ -941,6 +942,20 @@ BEGIN
CONTROL "Abs",IDC_RADIO_R2_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,66,213,28,8
END
IDD_SO7_ART_PCI8622 DIALOGEX 0, 0, 403, 284
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ART PCI8622"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "Exit",IDCANCEL,347,264,50,14
PUSHBUTTON "Start",IDC_BUTTON_ART_PCI8622_START,29,41,50,14
PUSHBUTTON "Stop",IDC_BUTTON_ART_PCI8622_STOP,98,41,50,14
EDITTEXT IDC_EDIT_ART_PCI8622_LOG,20,88,326,161,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
PUSHBUTTON "Clear all",IDC_BUTTON_ART_PCI8622_CLEAR_LOG,351,170,38,14
PUSHBUTTON "Read",IDC_BUTTON_ART_PCI8622_READ_DATA,167,41,50,14
GROUPBOX "Machine",-1,20,15,325,65
END
/////////////////////////////////////////////////////////////////////////////
//
@@ -976,9 +991,9 @@ BEGIN
IDD_SO7_OPTION_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 271
RIGHTMARGIN, 310
TOPMARGIN, 6
BOTTOMMARGIN, 191
BOTTOMMARGIN, 162
END
IDD_SO7_VIDEOCARD_SDK3000, DIALOG
@@ -1096,6 +1111,14 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 244
END
IDD_SO7_ART_PCI8622, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 396
TOPMARGIN, 7
BOTTOMMARGIN, 277
END
END
#endif // APSTUDIO_INVOKED
@@ -0,0 +1,56 @@
// So7_Art_PCI8622.cpp : implementation file
//
#include "stdafx.h"
#include "resource.h"
#include "..\..\..\ART\ART_PCI8622.h"
#include "So7_Art_PCI8622.h"
#include "afxdialogex.h"
extern CART_PCI8622* m_pART_PCI8622;
// CSo7_Art_PCI8622 dialog
IMPLEMENT_DYNAMIC(CSo7_Art_PCI8622, CDialog)
CSo7_Art_PCI8622::CSo7_Art_PCI8622(CWnd* pParent /*=NULL*/)
: CDialog(CSo7_Art_PCI8622::IDD, pParent)
{
}
CSo7_Art_PCI8622::~CSo7_Art_PCI8622()
{
}
void CSo7_Art_PCI8622::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
}
BEGIN_MESSAGE_MAP(CSo7_Art_PCI8622, CDialog)
ON_BN_CLICKED(IDC_BUTTON_ART_PCI8622_READ_DATA, &CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622ReadData)
ON_BN_CLICKED(IDC_BUTTON_ART_PCI8622_CLEAR_LOG, &CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622ClearLog)
ON_BN_CLICKED(IDCANCEL, &CSo7_Art_PCI8622::OnBnClickedCancel)
END_MESSAGE_MAP()
// CSo7_Art_PCI8622 message handlers
void CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622ReadData()
{
m_pART_PCI8622->GetData();
}
void CSo7_Art_PCI8622::OnBnClickedButtonArtPci8622ClearLog()
{
// TODO: Add your control notification handler code here
}
void CSo7_Art_PCI8622::OnBnClickedCancel()
{
CDialog::OnCancel();
}
@@ -0,0 +1,25 @@
#pragma once
// CSo7_Art_PCI8622 dialog
class CSo7_Art_PCI8622 : public CDialog
{
DECLARE_DYNAMIC(CSo7_Art_PCI8622)
public:
CSo7_Art_PCI8622(CWnd* pParent = NULL); // standard constructor
virtual ~CSo7_Art_PCI8622();
// Dialog Data
enum { IDD = IDD_SO7_ART_PCI8622 };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
DECLARE_MESSAGE_MAP()
public:
afx_msg void OnBnClickedButtonArtPci8622ReadData();
afx_msg void OnBnClickedButtonArtPci8622ClearLog();
afx_msg void OnBnClickedCancel();
};
@@ -34,6 +34,10 @@
#include "KeyenceLKH_Dlg.h"
#include "Keyence_LKG5000_Ethernet.h"
#include "..\..\..\ART\ART_PCI8622.h"
#include "So7_Art_PCI8622.h"
#include "..\..\..\SevenOcean\dll.h"
#include "..\..\..\SevenOcean\So7_Interface.h"
#include "So7_Util_ImageDll.h"
@@ -61,6 +65,7 @@ CSo7_Interface* m_pSo7_Interface=NULL;
CEF8000_Interface* m_pEF8000_Interface=NULL;
CXBOXController* XBoxPlayer =NULL;
CART_PCI8622* m_pART_PCI8622=NULL;
// CSo7_Option dialog
IMPLEMENT_DYNAMIC(CSo7_Option, CDialog)
@@ -86,6 +91,7 @@ BEGIN_MESSAGE_MAP(CSo7_Option, CDialog)
ON_WM_TIMER()
ON_BN_CLICKED(IDOK, &CSo7_Option::OnBnClickedOk)
ON_BN_CLICKED(IDCANCEL, &CSo7_Option::OnBnClickedCancel)
ON_BN_CLICKED(IDC_RADIO_ART_PCI8622, &CSo7_Option::OnBnClickedRadioArtPci8622)
END_MESSAGE_MAP()
@@ -125,7 +131,8 @@ BOOL CSo7_Option::OnInitDialog()
((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);
((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->SetCheck(FALSE);
#ifdef _RELEASE_SO7_CONTROLER_ONLY
((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->EnableWindow(FALSE);
@@ -139,6 +146,7 @@ BOOL CSo7_Option::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER3))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->EnableWindow(FALSE);
#endif
#ifdef _RELEASE_ONLY_ONE_FUNCTION
@@ -323,6 +331,21 @@ void CSo7_Option::OnBnClickedOk()
delete m_pKeyence_Laser_LK_H;
m_pKeyence_Laser_LK_H=NULL;
}
else if(((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->GetCheck())
{
if (!m_pART_PCI8622)
{
m_pART_PCI8622=new CART_PCI8622();
}
CSo7_Art_PCI8622* pSo7_Art_PCI8622=new CSo7_Art_PCI8622();
pSo7_Art_PCI8622->DoModal();
delete pSo7_Art_PCI8622;
pSo7_Art_PCI8622=nullptr;
delete m_pART_PCI8622;
m_pART_PCI8622=NULL;
}
else if (((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->GetCheck())
{
#ifdef _RELEASE_FULL_VERSION
@@ -402,3 +425,9 @@ void CSo7_Option::OnTimer(UINT_PTR nIDEvent)
}
CDialog::OnTimer(nIDEvent);
}
void CSo7_Option::OnBnClickedRadioArtPci8622()
{
// TODO: Add your control notification handler code here
}
@@ -23,4 +23,5 @@ public:
afx_msg void OnBnClickedOk();
afx_msg void OnBnClickedCancel();
afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnBnClickedRadioArtPci8622();
};
@@ -145,7 +145,7 @@
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\Videocard\SV4000E\dataAcq.lib;..\..\..\Videocard\SV4000E\DXMediaCap.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\Videocard\SV4000E\dataAcq.lib;..\..\..\Videocard\SV4000E\DXMediaCap.lib;..\..\..\ART\PCI8622_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -206,7 +206,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\SV2000E\dataAcq.lib;..\..\..\Videocard\SV2000E\DXMediaCap.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\SV2000E\dataAcq.lib;..\..\..\Videocard\SV2000E\DXMediaCap.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\ART\PCI8622_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSO7|Win32'">
@@ -303,6 +303,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Animatics\Animatics_Proto.cpp" />
<ClCompile Include="..\..\..\ART\ART_PCI8622.cpp" />
<ClCompile Include="..\..\..\KeyenceTM065\KeyenceTM065_Proto.cpp" />
<ClCompile Include="..\..\..\Keyence\Keyence_Laser.cpp" />
<ClCompile Include="..\..\..\Keyence\Keyence_Laser_LK_H.cpp" />
@@ -351,6 +352,7 @@
<ClCompile Include="ProcessButton.cpp" />
<ClCompile Include="SetSo7MotionConfig.cpp" />
<ClCompile Include="Setup_so7config.cpp" />
<ClCompile Include="So7_Art_PCI8622.cpp" />
<ClCompile Include="SO7_Automatic_Zoom.cpp" />
<ClCompile Include="So7_Config_Pages.cpp" />
<ClCompile Include="So7_Manual_Machine.cpp" />
@@ -383,6 +385,8 @@
<ClInclude Include="..\..\..\Animatics\Animatics_Proto.h" />
<ClInclude Include="..\..\..\Animatics\IntegMotorInterface.h" />
<ClInclude Include="..\..\..\Animatics\SMIDefs.h" />
<ClInclude Include="..\..\..\ART\ART_PCI8622.h" />
<ClInclude Include="..\..\..\ART\PCI8622.h" />
<ClInclude Include="..\..\..\KeyenceTM065\KeyenceTM065_Proto.h" />
<ClInclude Include="..\..\..\Keyence\Keyence_Laser.h" />
<ClInclude Include="..\..\..\Keyence\Keyence_Laser_LK_H.h" />
@@ -435,6 +439,7 @@
<ClInclude Include="Resource.h" />
<ClInclude Include="SetSo7MotionConfig.h" />
<ClInclude Include="Setup_so7config.h" />
<ClInclude Include="So7_Art_PCI8622.h" />
<ClInclude Include="SO7_Automatic_Zoom.h" />
<ClInclude Include="So7_Config_Pages.h" />
<ClInclude Include="So7_Manual_Machine.h" />
@@ -202,6 +202,12 @@
<ClCompile Include="So7_UtilUsbCtlR.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\ART\ART_PCI8622.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="So7_Art_PCI8622.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CaptureDataDlg.h">
@@ -438,6 +444,15 @@
<ClInclude Include="So7_UtilUsbCtlR.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ART\ART_PCI8622.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\ART\PCI8622.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="So7_Art_PCI8622.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
@@ -718,6 +718,7 @@
#define IDC_EDIT_TEST_KEYENCE_MESSAGE 1591
#define IDC_RADIO_KEYENCE_LASER3 1591
#define IDC_RADIO_MACHINE_KEYENCE_TM3000 1592
#define IDC_RADIO_ART_PCI8622 1592
#define IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER 1593
#define IDC_RADIO_KEYENCE_LASER_LK_H 1594
#define IDC_RADIO_TEST_IMAGE_DLL 1595
@@ -850,6 +851,7 @@
#define IDD_SO7_VIDEOCARD_TC4000 1718
#define IDD_DIALOG_KEYENCE_LKG5000 1719
#define IDD_SO7_UTIL_SETUP_SO7_CONFIG_MOTION 1720
#define IDD_SO7_ART_PCI8622 1721
#define IDC_RADIO_SPEED_SLOW 1770
#define IDC_RADIO_SCALE 1772
#define IDC_EDIT_SPEED_X 1773
@@ -962,11 +964,15 @@
#define IDC_STATIC_IO_ADDR5 1841
#define IDC_STATIC_IO_ADDR6 1842
#define IDC_BUTTON_START_SO7_R_MACHINE 1843
#define IDC_BUTTON_ART_PCI8622_START 1843
#define IDC_BUTTON_STOP_SO7_R_MACHINE 1844
#define IDC_BUTTON_ART_PCI8622_STOP 1844
#define IDC_BUTTON_R1_HOME 1845
#define IDC_BUTTON_ART_PCI8622_READ_DATA 1845
#define IDC_CHECK_SO7_R1_ENABLE 1846
#define IDC_EDIT_ART_PCI8622_LOG 1846
#define IDC_EDIT_R1_CURRENT_POSITION 1847
#define IDC_BUTTON_ART_PCI8622_CLEAR_LOG 1847
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741
@@ -976,7 +982,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 191
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1843
#define _APS_NEXT_CONTROL_VALUE 1848
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif