EgtExecutor 1.6w1 :

- in Exe e Lua aggiunto parametro per tipo asse a SimGetAxisInfoPos.
This commit is contained in:
Dario Sassi
2016-11-01 19:06:36 +00:00
parent 20f3f5755f
commit 4b95b19e9c
3 changed files with 10 additions and 7 deletions
+3 -3
View File
@@ -2075,12 +2075,12 @@ ExeSimHome( void)
//-----------------------------------------------------------------------------
bool
ExeSimGetAxisInfoPos( int nI, string& sName, double& dVal)
ExeSimGetAxisInfoPos( int nI, string& sToken, bool& bLinear, double& dVal)
{
IMachMgr* pMachMgr = GetCurrMachMgr() ;
VERIFY_MACHMGR( pMachMgr, false)
// recupero stringa con quote degli assi attivi
return pMachMgr->SimGetAxisInfoPos( nI, sName, dVal) ;
// recupero stringa con info asse di simulazione
return pMachMgr->SimGetAxisInfoPos( nI, sToken, bLinear, dVal) ;
}
//-----------------------------------------------------------------------------
BIN
View File
Binary file not shown.
+7 -4
View File
@@ -2245,19 +2245,22 @@ LuaSimGetAxisInfoPos( lua_State* L)
LuaCheckParam( L, 1, nInd)
LuaClearStack( L) ;
// calcolo nome e posizione dell'asse
string sName ;
string sToken ;
bool bLinear ;
double dVal ;
bool bOk = ExeSimGetAxisInfoPos( nInd, sName, dVal) ;
bool bOk = ExeSimGetAxisInfoPos( nInd, sToken, bLinear, dVal) ;
// restituisco il risultato
if ( bOk) {
LuaSetParam( L, sName) ;
LuaSetParam( L, sToken) ;
LuaSetParam( L, bLinear) ;
LuaSetParam( L, dVal) ;
}
else {
LuaSetParam( L) ;
LuaSetParam( L) ;
LuaSetParam( L) ;
}
return 2 ;
return 3 ;
}
//-------------------------------------------------------------------------------