EgtMachKernel 1.6r10 :

- le funzioni lua di caricamento oggetti macchina ne restituiscono l'Id
- piccola miglioria a visualizzazione macchina.
This commit is contained in:
Dario Sassi
2016-06-19 16:22:54 +00:00
parent bce7e1353c
commit e03c692b64
3 changed files with 64 additions and 16 deletions
+42 -6
View File
@@ -316,7 +316,13 @@ Machine::LuaEmtBase( lua_State* L)
if ( ! m_pMchLua->LoadMachineBase( sName, sGeo, vsAux))
return luaL_error( L, " Load Machine Base failed") ;
return 0 ;
// restituisco l'indice della base
int nBaseId = m_pMchLua->GetBaseId( sName) ;
if ( nBaseId != GDB_ID_NULL)
LuaSetParam( L, nBaseId) ;
else
LuaSetParam( L) ;
return 1 ;
}
//----------------------------------------------------------------------------
@@ -358,7 +364,13 @@ Machine::LuaEmtTable( lua_State* L)
if ( ! m_pMchLua->LoadMachineTable( sName, sParent, nType, Ref1, sGeo, vsAux))
return luaL_error( L, " Load Machine Table failed") ;
return 0 ;
// restituisco l'indice della tavola
int nTableId = m_pMchLua->GetTableId( sName) ;
if ( nTableId != GDB_ID_NULL)
LuaSetParam( L, nTableId) ;
else
LuaSetParam( L) ;
return 1 ;
}
//----------------------------------------------------------------------------
@@ -416,7 +428,13 @@ Machine::LuaEmtAxis( lua_State* L)
Stroke, dHome, bAdjustAux, sGeo, vsAux))
return luaL_error( L, " Load Machine Axis failed") ;
return 0 ;
// restituisco l'indice dell'asse
int nAxisId = m_pMchLua->GetAxisId( sName) ;
if ( nAxisId != GDB_ID_NULL)
LuaSetParam( L, nAxisId) ;
else
LuaSetParam( L) ;
return 1 ;
}
//----------------------------------------------------------------------------
@@ -498,7 +516,13 @@ Machine::LuaEmtStdHead( lua_State* L)
dRot1W, Rot2Stroke, nSolCh, sGeo, vsAux))
return luaL_error( L, " Load Machine Standard Head failed") ;
return 0 ;
// restituisco l'indice della testa
int nHeadId = m_pMchLua->GetHeadId( sName) ;
if ( nHeadId != GDB_ID_NULL)
LuaSetParam( L, nHeadId) ;
else
LuaSetParam( L) ;
return 1 ;
}
//----------------------------------------------------------------------------
@@ -567,7 +591,13 @@ Machine::LuaEmtMultiHead( lua_State* L)
dRot1W, Rot2Stroke, nSolCh, sGeo, vsAux))
return luaL_error( L, " Load Machine Standard Head failed") ;
return 0 ;
// restituisco l'indice della testa
int nHeadId = m_pMchLua->GetHeadId( sName) ;
if ( nHeadId != GDB_ID_NULL)
LuaSetParam( L, nHeadId) ;
else
LuaSetParam( L) ;
return 1 ;
}
//----------------------------------------------------------------------------
@@ -625,7 +655,13 @@ Machine::LuaEmtSpecialHead( lua_State* L)
dRot1W, Rot2Stroke, nSolCh, sGeo, vsAux))
return luaL_error( L, " Load Machine Special Head failed") ;
return 0 ;
// restituisco l'indice della testa
int nHeadId = m_pMchLua->GetHeadId( sName) ;
if ( nHeadId != GDB_ID_NULL)
LuaSetParam( L, nHeadId) ;
else
LuaSetParam( L) ;
return 1 ;
}
//----------------------------------------------------------------------------