EgtExecutor 1.6e7 :

- aggiustamenti vari per macchina e lavorazioni.
This commit is contained in:
Dario Sassi
2015-05-26 06:50:52 +00:00
parent 63d85b005a
commit 785c9add4b
4 changed files with 40 additions and 5 deletions
+23 -2
View File
@@ -668,13 +668,15 @@ LuaSetCalcTool( lua_State* L)
static int
LuaGetCalcAngles( lua_State* L)
{
// 1 parametro : vtDirT
// 1 o 2 parametri : vtDirT, vtDirA
Vector3d vtDirT ;
LuaCheckParam( L, 1, vtDirT)
Vector3d vtDirA ;
LuaGetParam( L, 2, vtDirA) ;
LuaClearStack( L) ;
// imposto la tavola corrente per il calcolo
int nStat ; double dAngA1 ; double dAngB1 ; double dAngA2 ; double dAngB2 ;
bool bOk = ExeGetCalcAngles( vtDirT, nStat, dAngA1, dAngB1, dAngA2, dAngB2) ;
bool bOk = ExeGetCalcAngles( vtDirT, vtDirA, nStat, dAngA1, dAngB1, dAngA2, dAngB2) ;
// restituisco il risultato
if ( bOk) {
LuaSetReturn( L, bOk) ;
@@ -752,6 +754,24 @@ LuaVerifyOutOfStroke( lua_State* L)
}
}
//-------------------------------------------------------------------------------
static int
LuaAddDrilling( lua_State* L)
{
// 1 parametro : sName
string sName ;
LuaCheckParam( L, 1, sName)
LuaClearStack( L) ;
// aggiungo la lavorazione
int nId = ExeAddDrilling( sName) ;
// restituisco il risultato
if ( nId != GDB_ID_NULL)
LuaSetReturn( L, nId) ;
else
LuaSetReturn( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
bool
LuaInstallMachMgr( LuaMgr& luaMgr)
@@ -797,6 +817,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcAngles", LuaGetCalcAngles) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcPositions", LuaGetCalcPositions) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtVerifyOutOfStroke", LuaVerifyOutOfStroke) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtAddDrilling", LuaAddDrilling) ;
return bOk ;
}