From 57d055bb4da25ec420f1edd80d96e2f6a43ee4da Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Fri, 16 Jan 2015 10:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=85=8D=E7=BD=AEso7=5Fconfi?= =?UTF-8?q?g=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 16 ++++++++++++---- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h | 2 +- .../MachineInterfaceDll.cpp | 2 +- .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 10 +++++----- .../UsbUtility/UsbUtil/SetSo7MotionConfig.cpp | 2 +- .../Tools/UsbUtility/UsbUtil/So7_Option.cpp | 6 ++++-- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 156160 -> 156160 bytes 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 3c57e0d..860c711 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -2166,7 +2166,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() char *outBuff = NULL; CString csAppPath; GetAppPath(csAppPath); - CString cFileName=csAppPath+_T("\\so7_config.ini"); + CString cFileName=csAppPath+_T("\\UtilitySo7Config.ini"); _wfopen_s(&m_pOutFile, cFileName, _T("wt")); if (!m_pOutFile) { @@ -2400,7 +2400,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config() return SSI_STATUS_MOTION_NORMAL; } //****************************************************************************** -SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config() +SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config(int _FileName) { FILE *hConfigFile = NULL; char szLine[MAX_BUFF_SIZE]; @@ -2409,7 +2409,15 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config() char cTemp[30]={0}; CString csAppPath; GetAppPath(csAppPath); - CString csSO7ConfigFile =csAppPath+_T("\\so7_config.ini"); + CString csSO7ConfigFile(_T("")); + if (_FileName==1) + { + csSO7ConfigFile=csAppPath+_T("\\so7_config.ini"); + } + else + { + csSO7ConfigFile=csAppPath+_T("\\UtilitySo7Config.ini"); + } _wfopen_s(&hConfigFile,csSO7ConfigFile,_T("rt")); if(hConfigFile) { @@ -4485,7 +4493,7 @@ SSI_STATUS_MOTION CSO7_Proto::_calculate_straightline_motion(double dSpeedMM) { CString csAppPath; GetAppPath(csAppPath); - CString csSO7ConfigFile = csAppPath + _T("\\Utility_Config.ini"); + CString csSO7ConfigFile = csAppPath + _T("\\Utility_config.ini"); Load_SevenOcean_Inifile(csSO7ConfigFile); g_machine.s_machine_config.x_axis._speed_max[0]=static_cast(g_machine.s_machine_config.x_axis._speed_max[0]*dSpeedMM); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index 287d040..00bea55 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -453,7 +453,7 @@ public: SSI_STATUS_MOTION _process_replay_capture_commands(char *inBuff, FILE* pInFile); SSI_STATUS_MOTION Load_SevenOcean_Inifile(CString csSO7INIFile); SSI_STATUS_MOTION Save_SevenOcean_Inifile(CString csSO7INIFile); - SSI_STATUS_MOTION Load_So7_Config(); + SSI_STATUS_MOTION Load_So7_Config(int _FileName=0); SSI_STATUS_MOTION Save_So7_Config(); SSI_STATUS_MOTION GetAppPath(CString &Path); SSI_STATUS_MOTION ExtractAppPath(CString &Path); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp index baa96de..442a60c 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp @@ -36,7 +36,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION Machine_Startup(bool bOfflineOnly,EHOME_MAC m_pSO7_Proto->_start_machine(); if (rStatus==SSI_STATUS_MOTION_NORMAL) { - rStatus=m_pSO7_Proto->Load_So7_Config(); + rStatus=m_pSO7_Proto->Load_So7_Config(1); rStatus=LoadMotionParameter(); if (rStatus==SSI_STATUS_MOTION_NORMAL) { 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 64c2f59..b33ed5b 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 @@ -16,7 +16,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// 中文(简体，中国) resources +// Chinese (Simplified, PRC) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -128,7 +128,7 @@ BEGIN CTEXT "Y",IDC_STATIC,84,291,8,8 CTEXT "Z",IDC_STATIC,143,291,8,8 GROUPBOX "速度档位",IDC_STATIC,160,183,53,81 - PUSHBUTTON "配置so7_config",IDC_BUTTON_SETUP_SO7CONFIG,28,94,63,25,BS_MULTILINE + PUSHBUTTON "配置INI文件",IDC_BUTTON_SETUP_SO7CONFIG,28,94,63,25,BS_MULTILINE LTEXT "1",IDC_STATIC_IO_ADDR1,403,28,8,8 LTEXT "2",IDC_STATIC_IO_ADDR2,403,44,8,8 LTEXT "3",IDC_STATIC_IO_ADDR3,403,60,8,8 @@ -1848,12 +1848,12 @@ BEGIN IDS_SO7_ABOUTBOX "&About Utility for SO7..." END -#endif // 中文(简体，中国) resources +#endif // Chinese (Simplified, PRC) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// 英语(美国) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -2812,7 +2812,7 @@ BEGIN END END -#endif // 英语(美国) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp index 5ace553..2d178f5 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp @@ -558,7 +558,7 @@ void CSetSo7MotionConfig::OnBnClickedButtonSo7MotionConfigOk() CString m_csMsg=_T(""); m_pSO7_Proto->Save_So7_Config(); m_pSO7_Proto->GetAppPath(m_csMsg); - m_csMsg=_T("配置文件保存在:")+m_csMsg+_T("\\so7_config.ini。"); + m_csMsg=_T("配置文件保存在:")+m_csMsg+_T("\\UtilitySo7Config.ini。"); OutputWithScroll(m_csMsg,m_edit_MsgOut); } void CSetSo7MotionConfig::OnBnClickedButtonSo7MotionConfigSetDefault() 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 9ab9c35..8f037e4 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 @@ -148,16 +148,18 @@ BOOL CSo7_Option::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_MV900))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->SetCheck(FALSE); - ((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->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); ((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->SetCheck(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC))->SetCheck(FALSE); - ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC_SERVER))->SetCheck(TRUE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC_SERVER))->SetCheck(FALSE); #ifdef _RELEASE_SO7_CONTROLER_ONLY + ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC))->EnableWindow(FALSE); + ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC_SERVER))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV4000E))->EnableWindow(FALSE); 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 16e77c3bdfe663112e10ffdc82210fff89932ef5..19da8e0f3aca4192dd01b64cd569adbe90c5691d 100644 GIT binary patch delta 3185 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