From 81ab1253fb9efe5a201398db15a6785b8268b50d Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 13 Sep 2021 15:49:34 +0200 Subject: [PATCH] EgtExecutor 2.3i2 : - aggiunta funzione EXE e Lua ChangeTable. --- EXE_MachMgr.cpp | 10 ++++++++++ EgtExecutor.rc | Bin 16176 -> 16176 bytes LUA_MachMgr.cpp | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index a476519..0402e4c 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -955,6 +955,16 @@ ExeGetTableAreaOffset( int nInd, BBox3d& b3AreaOffs) return pMachMgr->GetTableAreaOffset( nInd, b3AreaOffs) ; } +//----------------------------------------------------------------------------- +bool +ExeChangeTable( const string& sTable, bool bUpdateDisp) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // imposto la tavola corrente della macchinata corrente + return pMachMgr->ChangeTable( sTable, bUpdateDisp) ; +} + //----------------------------------------------------------------------------- bool ExeShowOnlyTable( bool bVal) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 71449851cabcddbeec4171341c0e1e709ba2ead1..910d73c1f48462503f3a94de79d1322bdcdd3811 100644 GIT binary patch delta 79 zcmdl`x1nysFE&P_&A-`PnSqoe*K!sx?>N)s4T4pSMw1=6k~jAW*?>e(i-FY$N+HxV MD8kglDP58Q0C_7LTL1t6 delta 79 zcmdl`x1nysFE&QQ&A-`PnSqoe*K!sx?>N)s4T4pShLat+k~jAW*?>e(i-FY$N+HxV MD8kglDP58Q0C(RTQvd(} diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index da7f87b..3e07f70 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -1025,6 +1025,23 @@ LuaGetTableAreaOffset( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaChangeTable( lua_State* L) +{ + // 2 parametri : sTable, bUpdateDisp + string sTable ; + LuaCheckParam( L, 1, sTable) + bool bUpdateDisp ; + LuaCheckParam( L, 2, bUpdateDisp) + LuaClearStack( L) ; + // cambio la tavola corrente + bool bOk = ExeChangeTable( sTable, bUpdateDisp) ; + // restituisco il risultato + LuaSetParam( L, bOk) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaAddFixture( lua_State* L) @@ -3995,6 +4012,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableRef", LuaGetTableRef) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableArea", LuaGetTableArea) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableAreaOffset", LuaGetTableAreaOffset) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtChangeTable", LuaChangeTable) ; bOk = bOk && luaMgr.RegisterFunction( "EgtAddFixture", LuaAddFixture) ; bOk = bOk && luaMgr.RegisterFunction( "EgtKeepFixture", LuaKeepFixture) ; bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveFixture", LuaRemoveFixture) ;