From c9d820b0131830eaac41349757875ac63a8196dc Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Fri, 7 Jun 2013 10:03:17 +0800 Subject: [PATCH] Keyence utility V2.0:add csv file save type. --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 2 +- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 15 +++ .../Tools/UsbUtility/Release/UtilityDebug.Log | 4 + .../UsbUtility/UsbUtil/Keyence_UtilDlg.cpp | 102 +++++++++++++++--- .../UsbUtility/UsbUtil/Keyence_UtilDlg.h | 1 + .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 1202176 -> 1202176 bytes 6 files changed, 106 insertions(+), 18 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index d5c3d2f..753d8eb 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -1889,7 +1889,7 @@ SSI_STATUS_MOTION CSO7_Proto::Load_SevenOcean_Inifile(CString cso7IniFile) //========================================================================================= SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() { - FILE* m_pOutFile; + FILE* m_pOutFile= NULL; char *outBuff = NULL; CString csAppPath; GetAppPath(csAppPath); 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 b2065dd..8c4e2e0 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -1088,3 +1088,18 @@ 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. +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. 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 7dd97e5..90847fb 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log @@ -12,3 +12,7 @@ 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/UsbUtil/Keyence_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Keyence_UtilDlg.cpp index 077afd5..d875b05 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 @@ -220,7 +220,7 @@ void CKeyence_UtilDlg::OnBnClickedButtonTestKeyenceSaveLog() CString FileName; CString PathName; - FILE* m_pOutFile; + FileName=_T("LK_G_Data.txt"); CString szFilter=_T("TXT Files(*.txt)|*.txt|CSV Files(*.csv)|*.csv|ALL Files(*.*)|*.*||"); @@ -228,30 +228,42 @@ void CKeyence_UtilDlg::OnBnClickedButtonTestKeyenceSaveLog() if( fdlg.DoModal()==IDOK) { - PathName=fdlg.GetPathName(); - _wfopen_s(&m_pOutFile, PathName, _T("wt")); - if (!m_pOutFile) - { - MessageBox( _T("File name Error."), _T("Message"), MB_OK); - }; 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); - + { + FILE* m_pOutFile; + _wfopen_s(&m_pOutFile, PathName, _T("wt")); + if (!m_pOutFile) + { + MessageBox( _T("File name Error."), _T("Message"), MB_OK); + } + else + { + const char* outBuff=NULL; + CString strOutput; + m_edMSG.GetWindowText(strOutput); + outBuff=T2A(strOutput); + fprintf(m_pOutFile,"%s", outBuff); + fclose(m_pOutFile); + m_OutMessage=_T("[Saving successful] Data Stored into ")+PathName+_T("."); + OutputWithScroll(m_OutMessage,m_edMSG); + } break; } case 2: { - - + BOOL bSTATUS=ExportReportCSV(PathName); + if (bSTATUS) + { + m_OutMessage=_T("[Saving successful] Data Stored into ")+PathName+_T("."); + OutputWithScroll(m_OutMessage,m_edMSG); + } + else + { + MessageBox( _T("File name Error."), _T("Message"), MB_OK); + } break; } } @@ -260,6 +272,61 @@ void CKeyence_UtilDlg::OnBnClickedButtonTestKeyenceSaveLog() GetDlgItem(IDC_EDIT_TEST_KEYENCE_SETFOCUS)->SetFocus(); } +//=========================================================== +BOOL CKeyence_UtilDlg::ExportReportCSV(const CString &FilePathName) +{ + FILE* m_pOutFile=NULL; + char *outBuff = NULL; + _wfopen_s(&m_pOutFile, FilePathName, _T("wt")); + if (!m_pOutFile) + { + free(outBuff); + return FALSE; + } + else + { + //Title + for (int i=0;i<8;i++) + { + if(m_LK_G_ProNOState[i]) + { + fprintf(m_pOutFile,"NO.%d,NO.%d,NO.%d,", i,i,i); + } + } + fprintf(m_pOutFile, "\n"); + for (int i=0;i<8;i++) + { + if(m_LK_G_ProNOState[i]) + { + if (i==m_LK_G_CalibrateNO) + { + fprintf(m_pOutFile,"OUT1,OUT2,ANSWER,"); + } + else + { + fprintf(m_pOutFile,"OUT1,OUT2,AVERAGE,"); + } + } + } + //OUTPUT DATA + KeyenceReport TmpReport; + for(size_t i=0;iSetFocus(); 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 66143d4..e79ec79 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 @@ -41,6 +41,7 @@ public: void Get_LK_G_DATA(); void RunCNC(); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); + BOOL ExportReportCSV(const CString &FilePathName); afx_msg BOOL PreTranslateMessage(MSG* pMsg); afx_msg void OnBnClickedButtonInitKeyenceLaser(); afx_msg void OnTimer(UINT_PTR nIDEvent); 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 54b3d21d83109c73c5beb20b3086cc43485894b1..bc54acd1bc3a00b6259f3ceb075b68826a71bab1 100644 GIT binary patch delta 1422 zcma)5ZA@EL7(O5OmRl(62LS$2S-nyT zu^0!JhpsBGO(R$@zmTC%4QDshWDw_PAup3HX5m-{SZm%RY0L_W3Rrw7c7BUl5 z>-SN?nxOI-Z-Z0>v@GG$e!Srm)}b&qSBxw4*C5+8VEz21KPOA^NfUWX;H_?a(@#54 z8GmvdzhK%i5E`^yG%Qcoe5#uItB-#l?OAMd@G*K3GKvT}ns`LTBNb-t+9&y6%`K+= zMt@pfKDYR?px|fIc;8)or94@r5D7!1yx2}it?5g8?X4n0|U zv-sFVXo=__y?S$jBU+hp<29;`|prL4hmNTu3S2g=&9SD#M}rO&?0Lpqob^- zj+)r6=jkqdi#65LkJ#^aOC`RUSggWV*zFQ}l=Xi`GPX6zfmd3a8{0aX1KlTE8k<^s zd)himceix}*nujVkFT>}u4S10vcpo&k3B{wMg8ocH*ft!x9h>|DLk{Bh6Uo;bb7OQ z!cOC3FW5#P)&8}GQw2k=|I}K*!VCw*$|G6pb zuvBNvkaz}L~$SLYl+^ZGJ)WLy~0QE?FA>06nJy$LV=pdd5?zadZpQeNd4_Jl- zPJ3t&vwL@lpZojhsK|r0mKDrfLi7T4+%Ls>$puLey4SNYM@Ba0(LvW{%bw0{Pl}2* zM%0czu7@hE4^uMR8T#|Py#o{=07QTekOYtbdO$KD1z-TA0=58*02A*WFb~ZC1Hz%X ACIA2c delta 1412 zcma)6ZA@EL7(O4jr7h*7cZFd<3zRY9TBN1W!a%xGK9@q-Y9x!%P62h24DgyTvPm~E z5;L;F%{cy83>(wM#Sg}fJ3ls)))7PeA=CH+9gZxTX%;nGQZvDg`L@_H|M@0Q&Uv5r zocBHNbMCpJ*_P03%WSWpp6#-WNgx@wfQtd?~7s$i3)qEWIB%WFk#a&y3naYs0ulzMI>QYvq-K ztr#h`?M*5y$cHSgDr`&Ej9RW~oZxlBJ{E?OO4MpJs;CN~btTPnX^R$bg|IPEUx_{w zAVONgRqch@fV?W0mD8OiIq|a=CWFTWgw~YRzC|jeCrCLeeJ5BqtG(gZX!H<#BC$Y` z-VETlAWC#NKn2rgV8q|4$p^PQNky+;3kZ=|wuLh6(yoJ4Ux2qhapvA7JMPLPM8$hN z_=h01qn*5d20xoweE-)b-#OFYx}7)g{W!Nh=bc!8F^yyPS2IEx(7S#g4=Z@eWvKoB zh3=)?D|5?Zq3e4;ez{tZ@t!Sw=r{aPg)Ty1Cs>5=vO+?9Y$1>2@wS8H`3!7g6NkwT zXoLLBuMCrU0WYvfhIlI9W8tu9!(@Njs~b zAvP9;*#a1+^*eh&KSA)0y$P$a#=rsGp zPpd%dev>%K(oLe1{qCS=n144-nc5~k#c!9<6+!pq3Gd2P^SB%7_{B;(D`+MQj@Wds zhuj;rOL$u?{nJ3aj~v4FzYY--@xSJcr)1#{nr%1-0&Q3xd|e3j@;~;_n`*5vpWEH_ zOSAjY7AR}263d8plWS)m7E!$}1v125lXtU8pK&gkIVU{-@0<@+i6c~=Xbtk5E#YLf0!CGN)`3{b)!ctlG1i9yx4C^|%^Rm`xP7Bh3ZSjX=k zrSDRTkb{NaBctqa7rl{oe?txwAKAsD@MI>tsUMqJ#}GNhIy%Hp*_|Cw@?<~Na#KKT m#BUFdQGftY0n~sLfCiui=m4nzJs=H`4#)sx^1(5~*y2C=Cbp~q