From ffb55dcda2e2bd48bc2e818b1d57e74737e7d55a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 9 Mar 2017 10:53:39 +0000 Subject: [PATCH] EgtExecutor 1.8c4 : - aggiunta a Exe e Lua GetAllTablesNames. --- EXE_MachMgr.cpp | 10 ++++++++++ EgtExecutor.rc | Bin 15088 -> 15088 bytes LUA_MachMgr.cpp | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 54891b0..d37280d 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -2476,6 +2476,16 @@ ExeGetAllHeadsNames( STRVECTOR& vNames) return pMachMgr->GetAllHeadsNames( vNames) ; } +//----------------------------------------------------------------------------- +bool +ExeGetAllTablesNames( STRVECTOR& vNames) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero l'elenco delle tavole + return pMachMgr->GetAllTablesNames( vNames) ; +} + //----------------------------------------------------------------------------- bool ExeSetAxisPos( const string& sAxis, double dVal) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 9fb056fad1419d9c091d55d1b4c7a93272abeba7..eb5448da17e5eb8937d6bd4814a64c1399962ba1 100644 GIT binary patch delta 79 zcmexR`k{2gFE&P#&A-`PnSqoe*K!sx?>N)s4T4pSCX*exk~jAW*?>e(i-FY$N+HxV MD8kglDNT|90G!nul>h($ delta 79 zcmexR`k{2gFE&Qw&A-`PnSqoe*K!sx?>N)s4T4pS#*-bnk~jAW*?>e(i-FY$N+HxV MD8kglDNT|90Go*$jQ{`u diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index aecb24d..649bbbc 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -2912,6 +2912,23 @@ LuaGetAllHeadsNames( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaGetAllTablesNames( lua_State* L) +{ + // nessun parametro + LuaClearStack( L) ; + // recupero l'elenco delle tavole della macchina corrente + STRVECTOR vNames ; + bool bOk = ExeGetAllTablesNames( vNames) ; + // restituisco il risultato + if ( bOk) + LuaSetParam( L, vNames) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaSetAxisPos( lua_State* L) @@ -3220,6 +3237,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtGetHeadId", LuaGetHeadId) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisToken", LuaGetAxisToken) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetAllHeadsNames", LuaGetAllHeadsNames) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtGetAllTablesNames", LuaGetAllTablesNames) ; // Machine Calc bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTable", LuaSetCalcTable) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTool", LuaSetCalcTool) ;