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 04d4e4f..b2065dd 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -1024,3 +1024,67 @@ 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. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log index 932310e..7dd97e5 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log @@ -1,275 +1,14 @@ Construct Cso7_Proto. 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. 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 -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. 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. -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. -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. -Init:Open device succeed . -_start_machine -Exit: Exit_SO7Usb -Destruct Cso7_Proto. -Construct Cso7_Proto. -Destruct Cso7_Proto. -Construct Cso7_Proto. -Init:Open device succeed . -_start_machine -Exit: Exit_SO7Usb -Destruct Cso7_Proto. -Construct Cso7_Proto. -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. -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 -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 -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 -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. -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. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp index 98de599..077afd5 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "resource.h" #include "afxdialogex.h" +#include #include #include #include "..\..\..\Keyence\Keyence_Laser.h" @@ -12,7 +13,7 @@ #include "..\..\..\SevenOcean\SO7_Proto.h" #include "Keyence_UtilDlg.h" -#define _TEST_NEED_SO7_MACHINE +//#define _TEST_NEED_SO7_MACHINE #ifdef _TEST_NEED_SO7_MACHINE extern CSO7_Proto* m_pSO7_Proto; @@ -34,6 +35,7 @@ INT Axis_Y(0); float fLaserVaule1(0); float fLaserVaule2(0); +std::vector LK_GReport; // CKeyence_UtilDlg 对话框 IMPLEMENT_DYNAMIC(CKeyence_UtilDlg, CDialog) @@ -124,6 +126,16 @@ BOOL CKeyence_UtilDlg::OnInitDialog() m_LK_G_ProNOState[i]=FALSE; } m_LK_G_ProNOChecked=0; + m_LK_G_BTN_StartGetData=FALSE; + m_LK_G_CalibrateNO=100; + m_BTNFont.CreatePointFont(200,L"Arial Black") ; + ((CButton*)(GetDlgItem(IDC_BUTTON_INIT_KEYENCE_LASER)))->SetFont(&m_BTNFont); + ((CButton*)(GetDlgItem(IDC_EDIT_LASER_VALUE1)))->SetFont(&m_BTNFont); + ((CButton*)(GetDlgItem(IDC_EDIT_LASER_VALUE2)))->SetFont(&m_BTNFont); + + m_BTNFont_MSG.CreatePointFont(160,L"Arial") ; + ((CButton*)(GetDlgItem(IDC_EDIT_TEST_KEYENCE_MESSAGE)))->SetFont(&m_BTNFont_MSG); + return TRUE; // return TRUE unless you set the focus to a control } @@ -211,33 +223,73 @@ void CKeyence_UtilDlg::OnBnClickedButtonTestKeyenceSaveLog() FILE* m_pOutFile; FileName=_T("LK_G_Data.txt"); - CString szFilter=_T("TXT Files(*.txt)|*.txt|ALL Files(*.*)|*.*||"); - CFileDialog fdlg(FALSE,_T("INI"),FileName,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,szFilter); + CString szFilter=_T("TXT Files(*.txt)|*.txt|CSV Files(*.csv)|*.csv|ALL Files(*.*)|*.*||"); + CFileDialog fdlg(FALSE,_T("TEXT"),FileName,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,szFilter); if( fdlg.DoModal()==IDOK) { - const char* outBuff=NULL; - CString strOutput; + PathName=fdlg.GetPathName(); _wfopen_s(&m_pOutFile, PathName, _T("wt")); if (!m_pOutFile) { MessageBox( _T("File name Error."), _T("Message"), MB_OK); }; - m_edMSG.GetWindowText(strOutput); - outBuff=T2A(strOutput); - fprintf(m_pOutFile,"%s", outBuff); - fclose(m_pOutFile); + switch(fdlg.m_ofn.nFilterIndex) + { + case 1: + { + const char* outBuff=NULL; + CString strOutput; + m_edMSG.GetWindowText(strOutput); + outBuff=T2A(strOutput); + fprintf(m_pOutFile,"%s", outBuff); + fclose(m_pOutFile); + + break; + } + case 2: + { + + + break; + } + } } delete fdlg; + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } #pragma endregion // CKeyence_UtilDlg 消息处理程序 #pragma region LK_G_LASER - +//=========================================================== void CKeyence_UtilDlg::OnBnClickedButtonInitKeyenceLaser() +{ + if (((CButton*)(GetDlgItem(IDC_CHECK_CONTINUE_READ_LASER_VALUE)))->GetCheck()) + { + if (m_LK_G_BTN_StartGetData) + { + KillTimer(1); + m_LK_G_BTN_StartGetData=FALSE; + ((CButton*)GetDlgItem(IDC_BUTTON_INIT_KEYENCE_LASER))->SetWindowTextW(_T("Get Data")); + } + else + { + m_LK_G_BTN_StartGetData=TRUE; + SetTimer(1,m_LK_G_Interval,NULL); + ((CButton*)GetDlgItem(IDC_BUTTON_INIT_KEYENCE_LASER))->SetWindowTextW(_T("STOP")); + } + } + else + { + Get_LK_G_DATA(); + } + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); +} +//===================================== +void CKeyence_UtilDlg::Get_LK_G_DATA() { #ifdef _TEST_NEED_SO7_MACHINE m_pSO7_Proto->_send_cmd_SO7_CMD_OPEN_KEYENCE_LASER(); @@ -250,6 +302,10 @@ void CKeyence_UtilDlg::OnBnClickedButtonInitKeyenceLaser() #endif CString csLaserValue; + CString csTmp; + float fResult(0.0); + KeyenceReport m_TmpVal; + m_OutMessage=_T(""); for(int i=0;i<8;i++) { if(m_LK_G_ProNOState[i]) @@ -263,17 +319,23 @@ void CKeyence_UtilDlg::OnBnClickedButtonInitKeyenceLaser() GetDlgItem(IDC_EDIT_LASER_VALUE2)->SetWindowText(csLaserValue); if (i==m_LK_G_CalibrateNO) { - m_OutMessage.Format(_T(" OUT1:%.4f,OUT2:%.4f,Result:%.4f"),i,fLaserVaule1,fLaserVaule2,(fLaserVaule1-m_LK_G_TopCalibrateVal)+m_LK_G_CalibrateVal+(m_LK_G_BottomCalibrateVal-fLaserVaule2)); + fResult=(fLaserVaule1-m_LK_G_TopCalibrateVal)+m_LK_G_CalibrateVal+(m_LK_G_BottomCalibrateVal-fLaserVaule2); + csTmp.Format(_T("[No.%d]OUT1:%.4f,OUT2:%.4f,Ans:%.4f."),i,fLaserVaule1,fLaserVaule2,fResult); } else { - m_OutMessage.Format(_T(" OUT1:%.4f,OUT2:%.4f,Average:%.4f"),i,fLaserVaule1,fLaserVaule2,0.5*(fLaserVaule1+fLaserVaule2)); - } - OutputWithScroll(m_OutMessage,m_edMSG); - } - } - - + fResult=static_cast(0.5*(fLaserVaule1+fLaserVaule2)); + csTmp.Format(_T("[No.%d]OUT1:%.4f,OUT2:%.4f,Aver:%.4f. "),i,fLaserVaule1,fLaserVaule2,fResult); + } + m_OutMessage+=csTmp; + m_TmpVal.ProgramNo=static_cast(i); + m_TmpVal.OUT1Value=fLaserVaule1; + m_TmpVal.OUT2Value=fLaserVaule2; + m_TmpVal.Result=fResult; + LK_GReport.push_back(m_TmpVal); + } + } + OutputWithScroll(m_OutMessage,m_edMSG); } //================================================================================================ @@ -281,16 +343,14 @@ void CKeyence_UtilDlg::OnBnClickedCheckContinueReadLaserValue() { if (((CButton*)(GetDlgItem(IDC_CHECK_CONTINUE_READ_LASER_VALUE)))->GetCheck()) { - ((CButton*)(GetDlgItem(IDC_BUTTON_INIT_KEYENCE_LASER)))->EnableWindow(FALSE); - SetTimer(1,m_LK_G_Interval,NULL); + ; } else { - ((CButton*)(GetDlgItem(IDC_BUTTON_INIT_KEYENCE_LASER)))->EnableWindow(TRUE); + ((CButton*)GetDlgItem(IDC_BUTTON_INIT_KEYENCE_LASER))->SetWindowTextW(_T("Get Data")); KillTimer(1); } - - + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } //================================================================================================ @@ -355,6 +415,7 @@ void CKeyence_UtilDlg::OnBnClickedButtonTestKeyenceClearLog() { m_edMSG.SetWindowText(_T("")); UpdateData(FALSE); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedButtonKeyenceLaserCalibrateValue() @@ -366,42 +427,57 @@ void CKeyence_UtilDlg::OnBnClickedButtonKeyenceLaserCalibrateValue() const char* cTempValue=T2A(csTmp); m_LK_G_CalibrateVal=static_cast(atof(cTempValue)); m_LK_G_CalibrateNO=1; + m_pKeyence_Laser->SetProgramNO(m_LK_G_CalibrateNO); + Sleep(20); m_pKeyence_Laser->Get_KeyenceLaserData(&fLaserVaule1,&fLaserVaule2); m_LK_G_TopCalibrateVal=fLaserVaule1; m_LK_G_BottomCalibrateVal=fLaserVaule2; + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); + m_OutMessage=_T("--------------------------------------------------------------------------------------------------------"); + OutputWithScroll(m_OutMessage,m_edMSG); + m_OutMessage.Format(_T("[Calibrate is successfully] OUT1:%.4f,OUT2:%.4f,Standard value:%.4f."),m_LK_G_TopCalibrateVal,m_LK_G_BottomCalibrateVal,m_LK_G_CalibrateVal); + OutputWithScroll(m_OutMessage,m_edMSG); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram0() { m_LK_G_ProNOState[0]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM0))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram1() { m_LK_G_ProNOState[1]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM1))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram2() { m_LK_G_ProNOState[2]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM2))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram3() { m_LK_G_ProNOState[3]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM3))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram4() { m_LK_G_ProNOState[4]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM4))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram5() { m_LK_G_ProNOState[5]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM5))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram6() { m_LK_G_ProNOState[6]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM6))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } void CKeyence_UtilDlg::OnBnClickedCheckTestKeyenceLkGProgram7() { m_LK_G_ProNOState[7]=((CButton *)GetDlgItem(IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM7))->GetCheck(); + GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } #pragma endregion //================================================================================================ @@ -409,7 +485,7 @@ void CKeyence_UtilDlg::OnTimer(UINT_PTR nIDEvent) { switch(nIDEvent) { - case 1:OnBnClickedButtonInitKeyenceLaser(); + case 1:Get_LK_G_DATA(); break; case 2: { @@ -449,6 +525,22 @@ void CKeyence_UtilDlg::OnTimer(UINT_PTR nIDEvent) CDialog::OnTimer(nIDEvent); } +//================================================================================================ +BOOL CKeyence_UtilDlg::PreTranslateMessage(MSG* pMsg) +{ + if(pMsg->message==WM_KEYDOWN) + { + if (pMsg->wParam==VK_SPACE) + { + OnBnClickedButtonInitKeyenceLaser(); + } + else if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE) + { + return TRUE; + } + } + return CDialog::PreTranslateMessage(pMsg); +} #pragma region BackUp /************************************************ *************************************************/ diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.h index 74b4ab7..66143d4 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.h @@ -1,6 +1,12 @@ #pragma once // CKeyence_UtilDlg 对话框 +typedef struct{ + char ProgramNo; + float OUT1Value; + float OUT2Value; + float Result; +}KeyenceReport; class CKeyence_UtilDlg : public CDialog { @@ -26,12 +32,16 @@ protected: float m_LK_G_CalibrateVal; float m_LK_G_TopCalibrateVal; float m_LK_G_BottomCalibrateVal; - + BOOL m_LK_G_BTN_StartGetData; + CFont m_BTNFont; + CFont m_BTNFont_MSG; public: int m_LK_H_StorageOutNumber; CString m_OutMessage; + void Get_LK_G_DATA(); void RunCNC(); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); + afx_msg BOOL PreTranslateMessage(MSG* pMsg); afx_msg void OnBnClickedButtonInitKeyenceLaser(); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnBnClickedButtonRuncnc(); 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 28ec6a9..17b2b93 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 @@ -1364,119 +1364,55 @@ BEGIN PUSHBUTTON "Browse",IDC_BUTTON_BROWSE,250,17,33,14 END -IDD_DIALOG_TEST_KEYENCE DIALOGEX 0, 0, 759, 478 +IDD_DIALOG_TEST_KEYENCE DIALOGEX 0, 0, 741, 349 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Test Keyence" +CAPTION "Keyence Utility" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - PUSHBUTTON "Exit",IDCANCEL,702,457,50,14 - CONTROL "LK_G",IDC_RADIO_KEYENCE_LASER_LK_G,"Button",BS_AUTORADIOBUTTON,251,27,32,10 - CONTROL "LK_H",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,418,27,32,10 - EDITTEXT IDC_EDIT_LASER_VALUE1,65,301,52,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_LASER_VALUE2,65,324,52,14,ES_AUTOHSCROLL - CONTROL "Continuous",IDC_CHECK_CONTINUE_READ_LASER_VALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,64,250,52,10 - PUSHBUTTON "Get Once Data",IDC_BUTTON_INIT_KEYENCE_LASER,52,205,60,14 - PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_GLASER,666,322,50,14,NOT WS_VISIBLE - PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER,666,322,50,14,NOT WS_VISIBLE - PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER,666,322,50,14,NOT WS_VISIBLE - EDITTEXT IDC_EDIT_LASER_LK_H_VALUE1,32,389,69,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_LASER_LK_H_VALUE2,32,412,69,14,ES_AUTOHSCROLL + CONTROL "Thickness",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,42,47,10 + CONTROL "Double Surface",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,63,65,10 + EDITTEXT IDC_EDIT_KEYENCE_LASER_CALIBRATE_VALUE,92,61,40,14,ES_AUTOHSCROLL + PUSHBUTTON "Calibrate",IDC_BUTTON_KEYENCE_LASER_CALIBRATE_VALUE,138,60,50,14 + CONTROL "2",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,41,20,10 + CONTROL "3",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,62,20,10 + CONTROL "4",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,41,20,10 + CONTROL "5",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,231,62,20,10 + CONTROL "6",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,259,41,20,10 + CONTROL "7",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,62,20,10 + EDITTEXT IDC_EDIT_TEST_LK_G_INTERVAL,503,40,40,14,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "Continuous",IDC_CHECK_CONTINUE_READ_LASER_VALUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,502,61,52,10 + PUSHBUTTON "Get Data",IDC_BUTTON_INIT_KEYENCE_LASER,576,28,90,65 + PUSHBUTTON "Clear All",IDC_BUTTON_TEST_KEYENCE_CLEAR_LOG,687,161,37,20 + PUSHBUTTON "Save as...",IDC_BUTTON_TEST_KEYENCE_SAVE_LOG,687,217,37,20 + PUSHBUTTON "Exit",IDCANCEL,684,328,50,14 + EDITTEXT IDC_EDIT_LASER_VALUE1,348,32,98,26,ES_CENTER | ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_LASER_VALUE2,348,66,98,26,ES_CENTER | ES_AUTOHSCROLL + PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_GLASER,27,298,50,14,NOT WS_VISIBLE + PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER,31,295,50,14,NOT WS_VISIBLE + PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_GLASER,25,295,50,14,NOT WS_VISIBLE + GROUPBOX "LKIF.DLL",IDC_STATIC,12,11,722,313 + EDITTEXT IDC_EDIT_TEST_KEYENCE_MESSAGE,22,104,649,207,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + GROUPBOX "Program No. Setting",IDC_STATIC,19,20,276,78 + LTEXT "Interval",IDC_STATIC,475,40,26,8 + LTEXT "ms",IDC_STATIC,549,40,10,8 + GROUPBOX "Get Data",IDC_STATIC,471,23,95,74 + GROUPBOX "Readout",IDC_STATIC,302,21,163,76 + LTEXT "OUT1",IDC_STATIC,314,41,19,8 + LTEXT "OUT2",IDC_STATIC,313,70,19,8 + CONTROL "LK_G",IDC_RADIO_KEYENCE_LASER_LK_G,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,19,292,32,10 + CONTROL "LK_H",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,17,306,32,10 + GROUPBOX "Laser Type",IDC_STATIC,9,282,57,44,NOT WS_VISIBLE + EDITTEXT IDC_EDIT_LASER_LK_H_VALUE1,7,295,13,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_EDIT_LASER_LK_H_VALUE2,7,295,10,14,ES_AUTOHSCROLL | NOT WS_VISIBLE CONTROL "Continue",IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,135,391,45,10 - PUSHBUTTON "Get_Data",IDC_BUTTON_LASER_LK_H_GET_DATA,127,405,50,14 - PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_HLASER,202,391,50,14 - PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_HLASER,202,410,50,14 - PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER,202,428,50,14 - GROUPBOX "LKIF.DLL",IDC_STATIC,22,50,712,314 - GROUPBOX "LKIF2.DLL",IDC_STATIC,22,367,713,89 - GROUPBOX "Laser Type",IDC_STATIC,22,14,708,32 - EDITTEXT IDC_EDIT_TEST_KEYENCE_MESSAGE,142,190,507,166,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL - PUSHBUTTON "Save as...",IDC_BUTTON_TEST_KEYENCE_SAVE_LOG,666,270,50,14 - GROUPBOX "Program No. Setting",IDC_STATIC,33,60,690,118 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,56,133,24,10 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,89,24,10 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,224,133,24,10 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,391,89,24,10 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,391,133,24,10 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,559,89,24,10 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,561,133,24,10 - CONTROL "En",IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,89,24,10 - EDITTEXT IDC_EDIT_TEST_LK_G_INTERVAL,65,229,40,14,ES_AUTOHSCROLL - LTEXT "Interval",IDC_STATIC,37,229,26,8 - LTEXT "ms",IDC_STATIC,111,229,10,8 - PUSHBUTTON "Clear All",IDC_BUTTON_TEST_KEYENCE_CLEAR_LOG,666,232,50,14 - EDITTEXT IDC_EDIT_KEYENCE_LASER_CALIBRATE_VALUE,668,303,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - PUSHBUTTON "Calibrate",IDC_BUTTON_KEYENCE_LASER_CALIBRATE_VALUE,666,322,50,14,NOT WS_VISIBLE - GROUPBOX "Get Data",IDC_STATIC,33,189,91,82 - GROUPBOX "Calibrate",IDC_STATIC,658,288,64,76,NOT WS_VISIBLE - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE0,"Button",BS_AUTORADIOBUTTON,117,96,37,10 - GROUPBOX "Readout",IDC_STATIC,32,278,93,77 - LTEXT "OUT1",IDC_STATIC,38,303,19,8 - LTEXT "OUT2",IDC_STATIC,38,325,19,8 - GROUPBOX "NO.0",IDC_STATIC,50,70,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,117,82,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,77,82,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,77,95,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE0,165,94,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,170,82,30,8 - GROUPBOX "",IDC_STATIC,161,71,48,40 - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE1,"Button",BS_AUTORADIOBUTTON,118,140,37,10 - GROUPBOX "NO.1",IDC_STATIC,50,114,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,118,125,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,125,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,138,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE1,166,138,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,170,125,30,8 - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE2,"Button",BS_AUTORADIOBUTTON,286,97,37,10 - GROUPBOX "NO.2",IDC_STATIC,219,71,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE2,"Button",BS_AUTORADIOBUTTON | WS_GROUP,286,83,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,246,83,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,246,96,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE2,334,95,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,339,83,30,8 - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE3,"Button",BS_AUTORADIOBUTTON,285,140,37,10 - GROUPBOX "NO.3",IDC_STATIC,218,114,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE3,"Button",BS_AUTORADIOBUTTON | WS_GROUP,285,126,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,245,126,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,245,139,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE3,333,138,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,338,126,30,8 - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE4,"Button",BS_AUTORADIOBUTTON,455,96,37,10 - GROUPBOX "NO.4",IDC_STATIC,387,71,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE4,"Button",BS_AUTORADIOBUTTON | WS_GROUP,455,82,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,415,82,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,415,95,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE4,503,95,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,507,82,30,8 - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE5,"Button",BS_AUTORADIOBUTTON,454,140,37,10 - GROUPBOX "NO.5",IDC_STATIC,387,114,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE5,"Button",BS_AUTORADIOBUTTON | WS_GROUP,454,126,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,414,126,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,414,139,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE5,502,138,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,507,126,30,8 - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE6,"Button",BS_AUTORADIOBUTTON,623,97,37,10 - GROUPBOX "NO.6",IDC_STATIC,555,71,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE6,"Button",BS_AUTORADIOBUTTON | WS_GROUP,623,83,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,583,83,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,583,95,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE6,671,95,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,675,83,30,8 - CONTROL "Relative",IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE7,"Button",BS_AUTORADIOBUTTON,624,140,37,10 - GROUPBOX "NO.7",IDC_STATIC,556,114,159,41 - CONTROL "Average",IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE7,"Button",BS_AUTORADIOBUTTON | WS_GROUP,624,126,39,10 - CONTROL "OUT1",IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,584,126,34,10 - CONTROL "OUT2",IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,584,139,34,10 - EDITTEXT IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE7,672,138,40,14,ES_AUTOHSCROLL - LTEXT "Calibrate",IDC_STATIC,676,126,30,8 - PUSHBUTTON "SET",IDC_BUTTON_TEST_KEYENCE_SET_OUTPUT,666,159,50,14 - GROUPBOX "",IDC_STATIC,161,114,48,40 - GROUPBOX "",IDC_STATIC,330,71,48,40 - GROUPBOX "",IDC_STATIC,329,114,48,40 - GROUPBOX "",IDC_STATIC,498,71,48,40 - GROUPBOX "",IDC_STATIC,498,114,48,40 - GROUPBOX "",IDC_STATIC,666,71,48,40 - GROUPBOX "",IDC_STATIC,667,114,48,40 + "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,7,295,13,10 + PUSHBUTTON "Get_Data",IDC_BUTTON_LASER_LK_H_GET_DATA,7,295,10,14,NOT WS_VISIBLE + PUSHBUTTON "Begin Scan",IDC_BUTTON_SCAN_KEYENCE_LK_HLASER,7,295,6,14,NOT WS_VISIBLE + PUSHBUTTON "Stop Scan",IDC_BUTTON_STOP_SCAN_KEYENCE_LK_HLASER,7,295,9,14,NOT WS_VISIBLE + PUSHBUTTON "Get Data",IDC_BUTTON_GET_SCAN_DATA_KEYENCE_LK_HLASER,7,295,8,14,NOT WS_VISIBLE + GROUPBOX "LKIF2.DLL",IDC_STATIC,7,284,13,28,NOT WS_VISIBLE + EDITTEXT IDC_EDIT_TEST_KEYENCE_SETFOCUS,7,328,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE END @@ -1587,9 +1523,9 @@ BEGIN IDD_DIALOG_TEST_KEYENCE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 752 + RIGHTMARGIN, 734 TOPMARGIN, 7 - BOTTOMMARGIN, 471 + BOTTOMMARGIN, 342 END END #endif // APSTUDIO_INVOKED 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 cbe9646..5798be7 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 @@ -99,10 +99,10 @@ BOOL CSo7_Option::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->SetCheck(TRUE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->SetCheck(FALSE); - return TRUE; // return TRUE unless you set the focus to a control } + //=================================== void CSo7_Option::OnBnClickedOk() { @@ -147,6 +147,7 @@ void CSo7_Option::OnBnClickedOk() m_pKeyence_Proto=NULL; delete m_pSO7_Proto; m_pSO7_Proto=NULL; + OnBnClickedCancel(); } else if (((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->GetCheck()) { @@ -188,3 +189,16 @@ void CSo7_Option::OnBnClickedCancel() { CDialog::OnCancel(); } +//=================================== +void CSo7_Option::OnTimer(UINT_PTR nIDEvent) +{ + switch(nIDEvent) + { + case 1: + { + + } + break; + } + CDialog::OnTimer(nIDEvent); +} 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 c6e51a1..2b9a761 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 @@ -21,4 +21,5 @@ protected: public: 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/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index b85428f..fbb8c44 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -713,48 +713,7 @@ #define IDC_BUTTON_TEST_KEYENCE_CLEAR_LOG 1606 #define IDC_BUTTON_KEYENCE_LASER_CALIBRATE_VALUE 1607 #define IDC_EDIT_KEYENCE_LASER_CALIBRATE_VALUE 1608 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE0 1609 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE1 1610 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE2 1611 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE0 1612 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT0 1613 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT0 1614 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE0 1615 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE1 1616 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT1 1617 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT1 1618 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE1 1619 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE2 1620 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT2 1621 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT2 1622 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE2 1623 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE3 1624 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE3 1625 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT3 1626 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT3 1627 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE3 1628 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE4 1629 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE4 1630 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT4 1631 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT4 1632 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE4 1633 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE5 1634 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE5 1635 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT5 1636 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT5 1637 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE5 1638 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE6 1639 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE6 1640 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT6 1641 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT6 1642 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE6 1643 -#define IDC_RADIO_TEST_KEYENCE_LK_G_RELATIVE7 1644 -#define IDC_RADIO_TEST_KEYENCE_LK_G_AVERAGE7 1645 -#define IDC_CHECK_TEST_KEYENCE_LK_G_FIRSTOUT7 1646 -#define IDC_CHECK_TEST_KEYENCE_LK_G_SECONDOUT7 1647 -#define IDC_EDIT_TEST_KEYENCE_LK_G_CALIBRATE7 1648 -#define IDC_BUTTONIDC_BUTTON_TEST_KEYENCE_CLEAR_LOG 1649 -#define IDC_BUTTON_TEST_KEYENCE_SET_OUTPUT 1649 +#define IDC_EDIT_TEST_KEYENCE_SETFOCUS 1650 // Next default values for new objects // @@ -762,7 +721,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 168 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1650 +#define _APS_NEXT_CONTROL_VALUE 1651 #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 8713f1a..54b3d21 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