EgtExecutor 1.6l9 :

- modifiche varie
- aggiunta funzione EXE e LUA GetOutstrokeInfo
- rinominata funzione EXE e LUA VerifyOutOfStroke in VerifyOutStroke.
This commit is contained in:
Dario Sassi
2016-01-18 08:03:48 +00:00
parent bf7dc57fca
commit 919cfcf24e
3 changed files with 59 additions and 11 deletions
+20 -3
View File
@@ -1791,7 +1791,7 @@ LuaGetCalcTipFromPositions( lua_State* L)
//-------------------------------------------------------------------------------
static int
LuaVerifyOutOfStroke( lua_State* L)
LuaVerifyOutstroke( lua_State* L)
{
// 5 parametri : dX, dY, dZ, dAngA, dAngB
double dX ;
@@ -1807,7 +1807,7 @@ LuaVerifyOutOfStroke( lua_State* L)
LuaClearStack( L) ;
// imposto la tavola corrente per il calcolo
int nStat ;
bool bOk = ExeVerifyOutOfStroke( dX, dY, dZ, dAngA, dAngB, nStat) ;
bool bOk = ExeVerifyOutstroke( dX, dY, dZ, dAngA, dAngB, nStat) ;
// restituisco il risultato
if ( bOk) {
LuaSetParam( L, bOk) ;
@@ -1820,6 +1820,22 @@ LuaVerifyOutOfStroke( lua_State* L)
}
}
//-------------------------------------------------------------------------------
static int
LuaGetOutstrokeInfo( lua_State* L)
{
// nessun parametro
LuaClearStack( L) ;
// recupero le info sull'ultima extracorsa
string sInfo ;
bool bOk = ExeGetOutstrokeInfo( sInfo) ;
if ( bOk)
LuaSetParam( L, sInfo) ;
else
LuaSetParam( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
// Machine Move
//-------------------------------------------------------------------------------
@@ -2035,7 +2051,8 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcAngles", LuaGetCalcAngles) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcPositions", LuaGetCalcPositions) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcTipFromPositions", LuaGetCalcTipFromPositions) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtVerifyOutOfStroke", LuaVerifyOutOfStroke) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtVerifyOutstroke", LuaVerifyOutstroke) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetOutstrokeInfo", LuaGetOutstrokeInfo) ;
// Machine Move
bOk = bOk && luaMgr.RegisterFunction( "EgtSetAxisPos", LuaSetAxisPos) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisPos", LuaGetAxisPos) ;