Add Keyence LK_H laser test dialog:VER1.1
This commit is contained in:
TAO Cheng
@@ -411,3 +411,68 @@ Init:Open device succeed .
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
Destruct Cso7_Proto.
|
||||
|
||||
Construct Cso7_Proto.
|
||||
|
||||
Init:Open device succeed .
|
||||
|
||||
_start_machine
|
||||
Exit: Exit_SO7Usb
|
||||
|
||||
Destruct Cso7_Proto.
|
||||
|
||||
Construct Cso7_Proto.
|
||||
|
||||
@@ -5,14 +5,17 @@
|
||||
#include "resource.h"
|
||||
#include "afxdialogex.h"
|
||||
#include "..\..\..\Keyence\Keyence_Laser.h"
|
||||
#include "..\..\..\Keyence\Keyence_Laser_LK_H.h"
|
||||
#include "..\..\..\Keyence\\Keyence_Proto.h"
|
||||
#include "..\..\..\SevenOcean\SO7_Proto.h"
|
||||
#include "Keyence_UtilDlg.h"
|
||||
extern CSO7_Proto* m_pSO7_Proto;
|
||||
extern CKeyence_Laser* m_pKeyence_Laser;
|
||||
extern CKeyence_Laser_LK_H* m_pKeyence_Laser_LK_H;
|
||||
extern CKeyence_Proto* m_pKeyence_Proto;
|
||||
|
||||
#define MAX_STORAGE_DATA_SIZE 65536
|
||||
static const int LK_G_MAX_STORAGE_DATA_SIZE=65536;
|
||||
static const int LK_H_MAX_STORAGE_DATA_SIZE=65535;
|
||||
|
||||
long lmove_to_x(0);
|
||||
long lmove_to_y(0);
|
||||
@@ -57,6 +60,11 @@ BEGIN_MESSAGE_MAP(CKeyence_UtilDlg, CDialog)
|
||||
ON_BN_CLICKED(IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER, &CKeyence_UtilDlg::OnBnClickedButtonGetScanDataKeyenceLkGlaser)
|
||||
ON_BN_CLICKED(IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER, &CKeyence_UtilDlg::OnBnClickedButtonStopScanKeyenceLkGlaser)
|
||||
ON_BN_CLICKED(IDC_BUTTON_SCAN_KEYENCE_LK_GLASER, &CKeyence_UtilDlg::OnBnClickedButtonScanKeyenceLkGlaser)
|
||||
ON_BN_CLICKED(IDC_BUTTON_LASER_LK_H_GET_DATA, &CKeyence_UtilDlg::OnBnClickedButtonLaserLkHGetData)
|
||||
ON_BN_CLICKED(IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE, &CKeyence_UtilDlg::OnBnClickedCheckContinueReadLaserLkHValue)
|
||||
ON_BN_CLICKED(IDC_BUTTON_SCAN_KEYENCE_LK_HLASER, &CKeyence_UtilDlg::OnBnClickedButtonScanKeyenceLkHlaser)
|
||||
ON_BN_CLICKED(IDC_BUTTON_STOP_SCAN_KEYENCE_LK_HLASER, &CKeyence_UtilDlg::OnBnClickedButtonStopScanKeyenceLkHlaser)
|
||||
ON_BN_CLICKED(IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER, &CKeyence_UtilDlg::OnBnClickedButtonGetScanDataKeyenceLkHlaser)
|
||||
END_MESSAGE_MAP()
|
||||
|
||||
|
||||
@@ -66,14 +74,25 @@ BOOL CKeyence_UtilDlg::OnInitDialog()
|
||||
|
||||
m_pSO7_Proto->Init_SO7Usb();
|
||||
m_pSO7_Proto->_start_machine();
|
||||
m_pKeyence_Laser->KeyenceLaserInit();
|
||||
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_G))->SetCheck(FALSE);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_H))->SetCheck(TRUE);
|
||||
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_G))->GetCheck())
|
||||
{
|
||||
m_pKeyence_Laser->KeyenceLaserInit();
|
||||
}
|
||||
else if (((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_H))->GetCheck())
|
||||
{
|
||||
m_pKeyence_Laser_LK_H->KeyenceLaserInit();
|
||||
}
|
||||
|
||||
|
||||
return TRUE; // return TRUE unless you set the focus to a control
|
||||
}
|
||||
|
||||
|
||||
// CKeyence_UtilDlg 消息处理程序
|
||||
|
||||
#pragma region LK_G_LASER
|
||||
|
||||
void CKeyence_UtilDlg::OnBnClickedButtonInitKeyenceLaser()
|
||||
{
|
||||
@@ -126,7 +145,7 @@ void CKeyence_UtilDlg::OnBnClickedButtonStopScanKeyenceLkGlaser()
|
||||
//================================================================================================
|
||||
void CKeyence_UtilDlg::OnBnClickedButtonGetScanDataKeyenceLkGlaser()
|
||||
{
|
||||
float GetData[MAX_STORAGE_DATA_SIZE];
|
||||
float GetData[LK_G_MAX_STORAGE_DATA_SIZE];
|
||||
int GetDataNumber(0);
|
||||
m_pKeyence_Laser->GetStoredData(GetData,&GetDataNumber);
|
||||
m_OutMessage.Format(_T("------TotaL:%d--------------"),GetDataNumber);
|
||||
@@ -154,6 +173,7 @@ void CKeyence_UtilDlg::OnBnClickedButtonGetScanDataKeyenceLkGlaser()
|
||||
}
|
||||
|
||||
}
|
||||
#pragma endregion
|
||||
//================================================================================================
|
||||
void CKeyence_UtilDlg::OnTimer(UINT_PTR nIDEvent)
|
||||
{
|
||||
@@ -162,16 +182,38 @@ void CKeyence_UtilDlg::OnTimer(UINT_PTR nIDEvent)
|
||||
case 1:OnBnClickedButtonInitKeyenceLaser();
|
||||
break;
|
||||
case 2:
|
||||
float GetData[MAX_STORAGE_DATA_SIZE];
|
||||
int GetDataNumber(0);
|
||||
m_pKeyence_Laser->PauseScanAndGetData(GetData,&GetDataNumber);
|
||||
m_OutMessage.Format(_T("<Stored>:%d"),m_pKeyence_Laser->m_StoredDataNumber);
|
||||
OutputWithScroll(m_OutMessage,m_edMSG);
|
||||
/*for(INT I=0;I<GetDataNumber;I++)
|
||||
{
|
||||
float GetData[LK_G_MAX_STORAGE_DATA_SIZE];
|
||||
int GetDataNumber(0);
|
||||
m_pKeyence_Laser->PauseScanAndGetData(GetData,&GetDataNumber);
|
||||
m_OutMessage.Format(_T("<Stored>:%d"),m_pKeyence_Laser->m_StoredDataNumber);
|
||||
OutputWithScroll(m_OutMessage,m_edMSG);
|
||||
/*for(INT I=0;I<GetDataNumber;I++)
|
||||
{
|
||||
m_OutMessage.Format(_T("[%d]:%.4f"),I,GetData[I]);
|
||||
OutputWithScroll(m_OutMessage,m_edMSG);
|
||||
}*/
|
||||
}*/
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
OnBnClickedButtonLaserLkHGetData();
|
||||
break;
|
||||
case 4:
|
||||
/*1
|
||||
float GetData[LK_H_MAX_STORAGE_DATA_SIZE];
|
||||
int GetDataNumber(0);
|
||||
for(int i=0;i<=m_LK_H_StorageOutNumber;i++)
|
||||
{
|
||||
m_pKeyence_Laser_LK_H->PauseScanAndGetData(i,GetData,&GetDataNumber);
|
||||
m_OutMessage.Format(_T("OUT%d:<Stored>:%d"),i+1,m_pKeyence_Laser_LK_H->m_StoredDataNumber);
|
||||
OutputWithScroll(m_OutMessage,m_edMSG);
|
||||
}
|
||||
*/
|
||||
|
||||
m_pKeyence_Laser_LK_H->GetStoreDataStatus();
|
||||
m_OutMessage.Format(_T("<Status>:%d <Stored>:%d"),m_pKeyence_Laser_LK_H->m_bIsStorage,m_pKeyence_Laser_LK_H->m_StoredDataNumber);
|
||||
OutputWithScroll(m_OutMessage,m_edMSG);
|
||||
|
||||
break;
|
||||
}
|
||||
CDialog::OnTimer(nIDEvent);
|
||||
@@ -181,6 +223,9 @@ void CKeyence_UtilDlg::OnBnClickedCancel()
|
||||
{
|
||||
KillTimer(1);
|
||||
KillTimer(2);
|
||||
KillTimer(3);
|
||||
KillTimer(4);
|
||||
|
||||
m_pSO7_Proto->_shutdown_machine();
|
||||
m_pSO7_Proto->Exit_SO7Usb();
|
||||
CDialog::OnCancel();
|
||||
@@ -208,6 +253,8 @@ void CKeyence_UtilDlg::OutputWithScroll(const CString &strNewText,CEdit &edtOutp
|
||||
edtOutput.SetSel(iCount, iCount);
|
||||
edtOutput.SetRedraw(TRUE);
|
||||
}
|
||||
|
||||
#pragma region BackUp
|
||||
/************************************************
|
||||
*************************************************/
|
||||
//===============================================
|
||||
@@ -295,10 +342,88 @@ void CKeyence_UtilDlg::OnBnClickedButtonExitKeyenceUsb()
|
||||
|
||||
}
|
||||
|
||||
#pragma endregion
|
||||
|
||||
void CKeyence_UtilDlg::OnBnClickedButtonLaserLkHGetData()
|
||||
{
|
||||
m_pSO7_Proto->_send_cmd_SO7_CMD_OPEN_KEYENCE_LASER();
|
||||
do
|
||||
{
|
||||
Sleep(20);
|
||||
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_INTERRUPT_MESSAGE();
|
||||
} while (m_pSO7_Proto->g_machine.InterruptFlag[0]!=CT_SEND_XYZLASE);
|
||||
m_pSO7_Proto->g_machine.InterruptFlag[0]=0;
|
||||
CString csLaserValue;
|
||||
m_pKeyence_Laser_LK_H->Get_KeyenceLaserData(&fLaserVaule1,&fLaserVaule2);
|
||||
csLaserValue.Format(_T("%f"),fLaserVaule1);
|
||||
GetDlgItem(IDC_EDIT_LASER_LK_H_VALUE1)->SetWindowText(csLaserValue);
|
||||
csLaserValue.Format(_T("%f"),fLaserVaule2);
|
||||
GetDlgItem(IDC_EDIT_LASER_LK_H_VALUE2)->SetWindowText(csLaserValue);
|
||||
}
|
||||
|
||||
|
||||
void CKeyence_UtilDlg::OnBnClickedCheckContinueReadLaserLkHValue()
|
||||
{
|
||||
if (((CButton*)(GetDlgItem(IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE)))->GetCheck())
|
||||
{
|
||||
((CButton*)(GetDlgItem(IDC_BUTTON_LASER_LK_H_GET_DATA)))->EnableWindow(FALSE);
|
||||
SetTimer(3,20,NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
((CButton*)(GetDlgItem(IDC_BUTTON_LASER_LK_H_GET_DATA)))->EnableWindow(TRUE);
|
||||
KillTimer(3);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CKeyence_UtilDlg::OnBnClickedButtonScanKeyenceLkHlaser()
|
||||
{
|
||||
m_LK_H_StorageOutNumber=4;
|
||||
m_pKeyence_Laser_LK_H->StartStoreData(m_LK_H_StorageOutNumber,1000,20);
|
||||
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_X(5);
|
||||
SetTimer(4,100,NULL);
|
||||
}
|
||||
|
||||
|
||||
void CKeyence_UtilDlg::OnBnClickedButtonStopScanKeyenceLkHlaser()
|
||||
{
|
||||
m_pSO7_Proto->_send_cmd_SO7_CMD_STOP_MOVE_XYZ();
|
||||
m_pKeyence_Laser_LK_H->StopStoreData();
|
||||
KillTimer(4);
|
||||
}
|
||||
|
||||
|
||||
void CKeyence_UtilDlg::OnBnClickedButtonGetScanDataKeyenceLkHlaser()
|
||||
{
|
||||
float GetData[LK_H_MAX_STORAGE_DATA_SIZE]={0.0};
|
||||
int GetDataNumber(0);
|
||||
|
||||
FILE* m_pOutFile;
|
||||
char *outBuff = NULL;
|
||||
CString cFileName=_T("T:\\log\\LK_H_Laser.log");
|
||||
_wfopen_s(&m_pOutFile, cFileName, _T("wt"));
|
||||
if (!m_pOutFile)
|
||||
{
|
||||
free(outBuff);
|
||||
}
|
||||
else
|
||||
{
|
||||
for(int i=0;i<=m_LK_H_StorageOutNumber;i++)
|
||||
{
|
||||
m_pKeyence_Laser_LK_H->GetStoredData(i,GetData,&GetDataNumber);
|
||||
m_OutMessage.Format(_T("--------OUT%d: TotaL:%d----------"),i,GetDataNumber);
|
||||
OutputWithScroll(m_OutMessage,m_edMSG);
|
||||
|
||||
fprintf(m_pOutFile,"--------OUT%d: TotaL:%d----------\n", i,GetDataNumber);
|
||||
for (int i=0;i<GetDataNumber;i++)
|
||||
{
|
||||
fprintf(m_pOutFile,"[%d]:", i);
|
||||
fprintf(m_pOutFile,"%.4f", GetData[i]);
|
||||
fprintf(m_pOutFile, "\n");
|
||||
}
|
||||
}
|
||||
fclose(m_pOutFile);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ protected:
|
||||
CEdit m_edMSG;
|
||||
DECLARE_MESSAGE_MAP()
|
||||
public:
|
||||
int m_LK_H_StorageOutNumber;
|
||||
CString m_OutMessage;
|
||||
void RunCNC();
|
||||
void OutputWithScroll(const CString &strNewText,CEdit &edtOutput);
|
||||
@@ -33,4 +34,9 @@ public:
|
||||
afx_msg void OnBnClickedButtonGetScanDataKeyenceLkGlaser();
|
||||
afx_msg void OnBnClickedButtonStopScanKeyenceLkGlaser();
|
||||
afx_msg void OnBnClickedButtonScanKeyenceLkGlaser();
|
||||
afx_msg void OnBnClickedButtonLaserLkHGetData();
|
||||
afx_msg void OnBnClickedCheckContinueReadLaserLkHValue();
|
||||
afx_msg void OnBnClickedButtonScanKeyenceLkHlaser();
|
||||
afx_msg void OnBnClickedButtonStopScanKeyenceLkHlaser();
|
||||
afx_msg void OnBnClickedButtonGetScanDataKeyenceLkHlaser();
|
||||
};
|
||||
|
||||
@@ -554,7 +554,7 @@ CAPTION "Option Dialog"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
CONTROL "控制器",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,175,39,40,10
|
||||
CONTROL "LK-G激光",IDC_RADIO_KEYENCE_LASER_LK_G,"Button",BS_AUTORADIOBUTTON,175,64,47,10
|
||||
CONTROL "Keyence激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,64,76,10
|
||||
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 | NOT WS_VISIBLE,48,89,69,10
|
||||
@@ -1224,26 +1224,38 @@ BEGIN
|
||||
CONTROL "V",IDC_CHECK_REPETESTV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,267,20,10
|
||||
END
|
||||
|
||||
IDD_DIALOG_TEST_KEYENCE DIALOGEX 0, 0, 409, 214
|
||||
IDD_DIALOG_TEST_KEYENCE DIALOGEX 0, 0, 338, 344
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Test Keyence"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
PUSHBUTTON "Exit",IDCANCEL,352,193,50,14
|
||||
PUSHBUTTON "Get_Data",IDC_BUTTON_INIT_KEYENCE_LASER,125,41,50,14
|
||||
EDITTEXT IDC_EDIT_LASER_VALUE1,30,25,69,14,ES_AUTOHSCROLL
|
||||
EDITTEXT IDC_EDIT_LASER_VALUE2,30,48,69,14,ES_AUTOHSCROLL
|
||||
PUSHBUTTON "Run CNC",IDC_BUTTON_RUNCNC,379,25,6,14,NOT WS_VISIBLE
|
||||
GROUPBOX "LKIF.dll",IDC_STATIC,11,10,380,98
|
||||
GROUPBOX "libusb.lib",IDC_STATIC,355,16,35,27,NOT WS_VISIBLE
|
||||
PUSHBUTTON "Init_KeyenceUsb",IDC_BUTTON_INIT_KEYENCE_USB,359,25,6,14,NOT WS_VISIBLE
|
||||
PUSHBUTTON "Reset",IDC_BUTTON_RESET_KEYENCE_USB,365,25,7,14,NOT WS_VISIBLE
|
||||
PUSHBUTTON "Exit_Keyence_Usb",IDC_BUTTON_EXIT_KEYENCE_USB,373,25,6,14,NOT WS_VISIBLE
|
||||
EDITTEXT IDC_EDIT_TEST_KEYENCE_MESSAGE,15,115,377,73,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
|
||||
PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_GLASER,200,27,50,14
|
||||
CONTROL "Continue",IDC_CHECK_CONTINUE_READ_LASER_VALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,27,45,10
|
||||
PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER,200,46,50,14
|
||||
PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER,200,64,50,14
|
||||
PUSHBUTTON "Exit",IDCANCEL,281,323,50,14
|
||||
CONTROL "LK_G",IDC_RADIO_KEYENCE_LASER_LK_G,"Button",BS_AUTORADIOBUTTON,73,27,32,10
|
||||
CONTROL "LK_H",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,200,27,32,10
|
||||
EDITTEXT IDC_EDIT_LASER_VALUE1,33,71,69,14,ES_AUTOHSCROLL
|
||||
EDITTEXT IDC_EDIT_LASER_VALUE2,33,94,69,14,ES_AUTOHSCROLL
|
||||
CONTROL "Continue",IDC_CHECK_CONTINUE_READ_LASER_VALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,73,45,10
|
||||
PUSHBUTTON "Get_Data",IDC_BUTTON_INIT_KEYENCE_LASER,128,87,50,14
|
||||
PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_GLASER,203,73,50,14
|
||||
PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER,203,92,50,14
|
||||
PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER,203,110,50,14
|
||||
EDITTEXT IDC_EDIT_LASER_LK_H_VALUE1,32,163,69,14,ES_AUTOHSCROLL
|
||||
EDITTEXT IDC_EDIT_LASER_LK_H_VALUE2,32,186,69,14,ES_AUTOHSCROLL
|
||||
CONTROL "Continue",IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,135,165,45,10
|
||||
PUSHBUTTON "Get_Data",IDC_BUTTON_LASER_LK_H_GET_DATA,127,179,50,14
|
||||
PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_HLASER,202,165,50,14
|
||||
PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_HLASER,202,184,50,14
|
||||
PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER,202,202,50,14
|
||||
PUSHBUTTON "Run CNC",IDC_BUTTON_RUNCNC,255,323,6,14,NOT WS_VISIBLE
|
||||
GROUPBOX "LKIF.DLL",IDC_STATIC,22,53,288,83
|
||||
GROUPBOX "libusb.lib",IDC_STATIC,226,310,35,27,NOT WS_VISIBLE
|
||||
PUSHBUTTON "Init_KeyenceUsb",IDC_BUTTON_INIT_KEYENCE_USB,235,323,6,14,NOT WS_VISIBLE
|
||||
PUSHBUTTON "Reset",IDC_BUTTON_RESET_KEYENCE_USB,241,323,7,14,NOT WS_VISIBLE
|
||||
PUSHBUTTON "Exit_Keyence_Usb",IDC_BUTTON_EXIT_KEYENCE_USB,249,323,6,14,NOT WS_VISIBLE
|
||||
EDITTEXT IDC_EDIT_TEST_KEYENCE_MESSAGE,22,239,302,73,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
|
||||
GROUPBOX "LKIF2.DLL",IDC_STATIC,22,141,296,89
|
||||
GROUPBOX "Laser Type",IDC_STATIC,22,14,287,32
|
||||
END
|
||||
|
||||
|
||||
@@ -1354,9 +1366,9 @@ BEGIN
|
||||
IDD_DIALOG_TEST_KEYENCE, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 402
|
||||
RIGHTMARGIN, 331
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 207
|
||||
BOTTOMMARGIN, 337
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
@@ -421,9 +421,6 @@ void CSO7_UtilDlg::OnBnClickedButtonManualHome()
|
||||
//=====================================================================
|
||||
void CSO7_UtilDlg::OnBnClickedCancel()
|
||||
{
|
||||
|
||||
delete m_pSO7_Proto;
|
||||
m_pSO7_Proto=NULL;
|
||||
delete g_pLoggerDebug;
|
||||
g_pLoggerDebug=NULL;
|
||||
CDialog::OnCancel();
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "Videocard_SV2000E.h"
|
||||
#include "SO7_UtilDlg.h"
|
||||
#include "..\..\..\Keyence\Keyence_Laser.h"
|
||||
#include "..\..\..\Keyence\Keyence_Laser_LK_H.h"
|
||||
#include "..\..\..\Keyence\\Keyence_Proto.h"
|
||||
#include "Keyence_UtilDlg.h"
|
||||
#include "afxdialogex.h"
|
||||
@@ -21,6 +22,7 @@
|
||||
|
||||
CSO7_Proto* m_pSO7_Proto=NULL;
|
||||
CKeyence_Laser* m_pKeyence_Laser=NULL;
|
||||
CKeyence_Laser_LK_H* m_pKeyence_Laser_LK_H=NULL;
|
||||
CKeyence_Proto* m_pKeyence_Proto=NULL;
|
||||
// CSo7_Option dialog
|
||||
|
||||
@@ -74,10 +76,11 @@ BOOL CSo7_Option::OnInitDialog()
|
||||
}
|
||||
}
|
||||
|
||||
((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->SetCheck(TRUE);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->SetCheck(FALSE);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->SetCheck(FALSE);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->SetCheck(FALSE);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->SetCheck(FALSE);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->SetCheck(TRUE);
|
||||
|
||||
return TRUE; // return TRUE unless you set the focus to a control
|
||||
}
|
||||
@@ -85,33 +88,47 @@ BOOL CSo7_Option::OnInitDialog()
|
||||
//===================================
|
||||
void CSo7_Option::OnBnClickedOk()
|
||||
{
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->GetCheck())
|
||||
{
|
||||
if (!m_pSO7_Proto)
|
||||
m_pSO7_Proto = new CSO7_Proto();
|
||||
CSO7_UtilDlg* pSO7_UtilDlg=new CSO7_UtilDlg();
|
||||
pSO7_UtilDlg->DoModal();
|
||||
delete pSO7_UtilDlg;
|
||||
}
|
||||
else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_G))->GetCheck())
|
||||
{
|
||||
if (!m_pSO7_Proto)
|
||||
m_pSO7_Proto = new CSO7_Proto();
|
||||
if (!m_pKeyence_Proto)
|
||||
m_pKeyence_Proto=new CKeyence_Proto();
|
||||
if (!m_pKeyence_Laser)
|
||||
m_pKeyence_Laser = new CKeyence_Laser();
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->GetCheck())
|
||||
{
|
||||
if (!m_pSO7_Proto)
|
||||
m_pSO7_Proto = new CSO7_Proto();
|
||||
CSO7_UtilDlg* pSO7_UtilDlg=new CSO7_UtilDlg();
|
||||
pSO7_UtilDlg->DoModal();
|
||||
delete pSO7_UtilDlg;
|
||||
delete m_pSO7_Proto;
|
||||
m_pSO7_Proto=NULL;
|
||||
}
|
||||
else if(((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->GetCheck())
|
||||
{
|
||||
if (!m_pSO7_Proto)
|
||||
{
|
||||
m_pSO7_Proto = new CSO7_Proto();
|
||||
}
|
||||
if (!m_pKeyence_Proto)
|
||||
{
|
||||
m_pKeyence_Proto=new CKeyence_Proto();
|
||||
}
|
||||
if (!m_pKeyence_Laser)
|
||||
{
|
||||
m_pKeyence_Laser = new CKeyence_Laser();
|
||||
}
|
||||
if (!m_pKeyence_Laser_LK_H)
|
||||
{
|
||||
m_pKeyence_Laser_LK_H=new CKeyence_Laser_LK_H();
|
||||
}
|
||||
|
||||
CKeyence_UtilDlg* pKeyence_UtilDlg=new CKeyence_UtilDlg();
|
||||
pKeyence_UtilDlg->DoModal();
|
||||
delete pKeyence_UtilDlg;
|
||||
CKeyence_UtilDlg* pKeyence_UtilDlg=new CKeyence_UtilDlg();
|
||||
pKeyence_UtilDlg->DoModal();
|
||||
delete pKeyence_UtilDlg;
|
||||
|
||||
delete m_pKeyence_Laser;
|
||||
delete m_pKeyence_Proto;
|
||||
delete m_pSO7_Proto;
|
||||
m_pKeyence_Laser=NULL;
|
||||
m_pKeyence_Proto=NULL;
|
||||
m_pSO7_Proto=NULL;
|
||||
delete m_pKeyence_Laser;
|
||||
m_pKeyence_Laser=NULL;
|
||||
delete m_pKeyence_Laser_LK_H;
|
||||
m_pKeyence_Laser_LK_H=NULL;
|
||||
delete m_pKeyence_Proto;
|
||||
m_pKeyence_Proto=NULL;
|
||||
delete m_pSO7_Proto;
|
||||
m_pSO7_Proto=NULL;
|
||||
}
|
||||
else if (((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->GetCheck())
|
||||
{
|
||||
|
||||
@@ -170,7 +170,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;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\SV2000E\dataAcq.lib;..\..\..\Videocard\SV2000E\DXMediaCap.lib;..\..\..\Keyence\LKIF2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
@@ -206,6 +206,7 @@
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\Animatics\Animatics_Proto.cpp" />
|
||||
<ClCompile Include="..\..\..\Keyence\Keyence_Laser.cpp" />
|
||||
<ClCompile Include="..\..\..\Keyence\Keyence_Laser_LK_H.cpp" />
|
||||
<ClCompile Include="..\..\..\Keyence\Keyence_Proto.cpp" />
|
||||
<ClCompile Include="..\..\..\MicroVu\Mv_Proto.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Include</AdditionalIncludeDirectories>
|
||||
@@ -252,7 +253,9 @@
|
||||
<ClInclude Include="..\..\..\Animatics\IntegMotorInterface.h" />
|
||||
<ClInclude Include="..\..\..\Animatics\SMIDefs.h" />
|
||||
<ClInclude Include="..\..\..\Keyence\Keyence_Laser.h" />
|
||||
<ClInclude Include="..\..\..\Keyence\Keyence_Laser_LK_H.h" />
|
||||
<ClInclude Include="..\..\..\Keyence\Keyence_Proto.h" />
|
||||
<ClInclude Include="..\..\..\Keyence\LKIFCommonDefine.h" />
|
||||
<ClInclude Include="..\..\..\MicroVu\Mv_Proto.h" />
|
||||
<ClInclude Include="..\..\..\SevenOcean\CMD_H.h" />
|
||||
<ClInclude Include="..\..\..\SevenOcean\CMMIO_BASE.H" />
|
||||
|
||||
@@ -106,6 +106,9 @@
|
||||
<ClCompile Include="Setup_so7config.cpp">
|
||||
<Filter>Sources Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\Keyence\Keyence_Laser_LK_H.cpp">
|
||||
<Filter>Sources Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="CaptureDataDlg.h">
|
||||
@@ -237,6 +240,12 @@
|
||||
<ClInclude Include="..\..\..\SevenOcean\So7_Interface.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\Keyence\Keyence_Laser_LK_H.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\Keyence\LKIFCommonDefine.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="ReadMe.txt" />
|
||||
|
||||
@@ -251,6 +251,7 @@
|
||||
#define IDC_CHECK_SV2000E_MIRROR_VERTICALLY 1204
|
||||
#define IDC_CHECK_CONTINUE_READ_LASER_VALUE 1204
|
||||
#define IDC_RADIO_MACHINE_SevenOcean 1205
|
||||
#define IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE 1205
|
||||
#define IDC_BUTTON_INIT_SO7USB 1206
|
||||
#define IDC_BUTTON_LOAD_SOCONFIG 1207
|
||||
#define IDC_BUTTON_LOAD_SO7CONFIG 1207
|
||||
@@ -288,8 +289,11 @@
|
||||
#define IDC_BUTTON_RESET_KEYENCE_USB 1228
|
||||
#define IDC_BUTTON_EXIT_KEYENCE_USB 1229
|
||||
#define IDC_BUTTON_SO7_MOVE_X_RIGHT 1230
|
||||
#define IDC_BUTTON_LASER_LK_H_GET_DATA 1230
|
||||
#define IDC_BUTTON_SO7_MOVE_Y_BACK 1231
|
||||
#define IDC_EDIT_LASER_LK_H_VALUE1 1231
|
||||
#define IDC_BUTTON_SO7_MOVE_Z_DOWN 1232
|
||||
#define IDC_EDIT_LASER_LK_H_VALUE2 1232
|
||||
#define IDC_BUTTON_READ_PROBE 1233
|
||||
#define IDC_BUTTON_SO7_MOVE_ZOOM_IN 1236
|
||||
#define IDC_BUTTON_SO7_MOVE_ZOOM_OUT 1237
|
||||
@@ -600,6 +604,7 @@
|
||||
#define IDC_BUTTON_SETUP_SO7CONFIG 1518
|
||||
#define IDC_BUTTON_SCAN_KEYENCE_LK_GLASER 1518
|
||||
#define IDC_STATIC_CANVAS 1519
|
||||
#define IDC_BUTTON_SCAN_KEYENCE_LK_HLASER 1519
|
||||
#define IDC_BUTTON_STATUS_OVERHEAT_X 1520
|
||||
#define IDC_EDIT_SAMPLE_TIME_SCURVE 1520
|
||||
#define IDC_BUTTON_STATUS_OVERHEAT_Y 1521
|
||||
@@ -613,6 +618,7 @@
|
||||
#define IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER 1524
|
||||
#define IDC_CUSTOM1 1525
|
||||
#define IDC_CUSTOM_CANVAS 1525
|
||||
#define IDC_BUTTON_STOP_SCAN_KEYENCE_LK_HLASER 1525
|
||||
#define IDC_RADIO_CONTROLLER 1526
|
||||
#define IDC_RADIO_VIDEOCARD_SV2000E 1528
|
||||
#define IDC_RADIO_VIDEOCARD_TC4000 1529
|
||||
@@ -638,12 +644,14 @@
|
||||
#define IDC_RADIO_CANVAS_SPEED_TIME 1550
|
||||
#define IDC_RADIO_CANVAS_POSTION_TIME 1551
|
||||
#define IDC_EDIT_SET_PARAMETER_MSGOUTPUT 1552
|
||||
#define IDC_RADIO2 1553
|
||||
#define IDC_RADIO_KEYENCE_LASER_LK_G 1553
|
||||
#define IDC_RADIO_KEYENCE_LASER 1553
|
||||
#define IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER 1555
|
||||
#define IDC_EDIT_TEST_KEYENCE_MESSAGE 1556
|
||||
#define IDC_RADIO1 1557
|
||||
#define IDC_RADIO_MACHINE_KEYENCE_TM3000 1557
|
||||
#define IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER2 1557
|
||||
#define IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER 1557
|
||||
#define IDC_RADIO_KEYENCE_LASER_LK_G 1558
|
||||
#define IDC_RADIO_KEYENCE_LASER_LK_H 1559
|
||||
|
||||
// Next default values for new objects
|
||||
//
|
||||
@@ -651,7 +659,7 @@
|
||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||
#define _APS_NEXT_RESOURCE_VALUE 165
|
||||
#define _APS_NEXT_COMMAND_VALUE 32771
|
||||
#define _APS_NEXT_CONTROL_VALUE 1558
|
||||
#define _APS_NEXT_CONTROL_VALUE 1560
|
||||
#define _APS_NEXT_SYMED_VALUE 101
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user