diff --git a/EGnLuaAux.h b/EGnLuaAux.h index 8776316..0698829 100644 --- a/EGnLuaAux.h +++ b/EGnLuaAux.h @@ -20,8 +20,9 @@ //---------------------------------------------------------------------------- #define LuaCheckParam(L,I,P) { if ( ! LuaGetParam(L,I,P)) \ return luaL_error( L, " Invalid Parameter # " #I) ;} -#define LuaCheckTabFieldParam(L,I,F,P) { if ( ! LuaGetTabFieldParam(L,I,F,P)) \ - return luaL_error( L, " Invalid Parameter # " #I " (field %s)", F) ;} +#define LuaCheckTabFieldParam(L,I,F,P) { if ( ! LuaGetTabFieldParam(L,I,F,P))\ + return luaL_error( L, " Invalid Parameter # " #I " (field %s)",\ + std::string( F).c_str()) ; } //---------------------------------------------------------------------------- inline bool diff --git a/EMkMachMgr.h b/EMkMachMgr.h index d641da6..afdb636 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -230,6 +230,7 @@ class __declspec( novtable) IMachMgr virtual int GetTableId( const std::string& sTable) const = 0 ; virtual int GetAxisId( const std::string& sAxis) const = 0 ; virtual int GetHeadId( const std::string& sHead) const = 0 ; + virtual bool GetAxisToken( const std::string& sAxis, std::string& sToken) const = 0 ; virtual bool SetAxisPos( const std::string& sAxis, double dVal) = 0 ; virtual bool GetAxisPos( const std::string& sAxis, double& dVal) const = 0 ; virtual bool GetAxisHomePos( const std::string& sAxis, double& dHomeVal) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 92bcb17..8a9b2b8 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -742,6 +742,7 @@ EXE_EXPORT int ExeGetBaseId( const std::string& sBase) ; EXE_EXPORT int ExeGetTableId( const std::string& sTable) ; EXE_EXPORT int ExeGetAxisId( const std::string& sAxis) ; EXE_EXPORT int ExeGetHeadId( const std::string& sHead) ; +EXE_EXPORT bool ExeGetAxisToken( const std::string& sAxis, std::string& sToken) ; // Machine Calc EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ; EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ;