From 970c07edd58fa50c236455e312288ca9a194e045 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 2 Jul 2016 15:03:58 +0000
Subject: [PATCH] EgtExecutor 1.6s2 : - aggiunte ExeGetTable e
 ExeTdbGetToolFromUUID - aggiunta a Lua EgtGetTableName.

---
 EXE_MachMgr.cpp |  20 ++++++++++++++++++++
 EgtExecutor.rc  | Bin 11710 -> 11694 bytes
 LUA_MachMgr.cpp |  18 ++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 57358be..3b428b8 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -720,6 +720,16 @@ ExeSetTable( const string& sTable)
    return pGseCtx->m_pMachMgr->SetTable( sTable) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetTable( string& sTable)
+{
+   GseContext* pGseCtx = GetCurrGseContext() ;
+   VERIFY_CTX_MACHMGR( pGseCtx, false)
+  // recupero il nome della tavola corrente della macchinata corrente
+   return pGseCtx->m_pMachMgr->GetTable( sTable) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeGetTableRef( int nInd, Point3d& ptPos)
@@ -842,6 +852,16 @@ ExeTdbGetNextTool( int nFamily, string& sName, int& nType)
    return pGseCtx->m_pMachMgr->TdbGetNextTool( nFamily, sName, nType) ;
 }
 
+//----------------------------------------------------------------------------
+bool
+ExeTdbGetToolFromUUID( const string& sTuuid, string& sName)
+{
+   GseContext* pGseCtx = GetCurrGseContext() ;
+   VERIFY_CTX_MACHMGR( pGseCtx, false)
+  // restituisce nome dell'utensile di dato UUID
+   return pGseCtx->m_pMachMgr->TdbGetToolFromUUID( sTuuid, sName) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeTdbSetCurrTool( const string& sName)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 79c88c814abe1e45adf9fdd4af80656559934c07..4c510c5c929fc4a3c12cc86267a830e028d4ab72 100644
GIT binary patch
delta 121
zcmdlNy)Jsg4>ndy1|0^Y&Hve)nVE|jj3$5N)ZH8)<;S@B5VsaHRPwysWv0o;1asgD
k9F*J`H?I<gEBMcLooVtWNrZv`sR|ajW_yIm4oY?006-Nbm;e9(

delta 145
zcmZ1%y)Syh4>ooS1|0@N27}EP#jZ0=zQUQqT*P2F`67qp<N{8y%>`T)EN~SE<t{T#
rJ|Kvy!a&K5aq}W!EoQi~i(<~qXomPPZk{BKq~xHSJ*pA|r8;f^m0l^3

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 5ebaabf..b96353e 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -726,6 +726,23 @@ LuaSetTable( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaGetTableName( lua_State* L)
+{
+  // nessun parametro
+   LuaClearStack( L) ;
+  // recupero il nome della tavola corrente
+   string sTable ;
+   bool bOk = ExeGetTable( sTable) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, sTable) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaGetTableRef( lua_State* L)
@@ -2521,6 +2538,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtRotatePartInRawPart", LuaRotatePartInRawPart) ;
    // Table & Fixtures
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetTable", LuaSetTable) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableName", LuaGetTableName) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableRef", LuaGetTableRef) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableArea", LuaGetTableArea) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtAddFixture", LuaAddFixture) ;