xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除配置so7_config的功能。

Browse Source
This commit is contained in:
TAO Cheng
2015-01-16 10:45:20 +08:00
parent ec3b82d0ff
commit 57d055bb4d
7 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+12 -4
View File
@@ -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<char>(g_machine.s_machine_config.x_axis._speed_max[0]*dSpeedMM);