From 1844d36b29c7033727f9d27e4bdcecbe3c066fd3 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sun, 22 May 2016 17:03:25 +0000
Subject: [PATCH] EgtExecutor 1.6r6 : - aggiunte GetLoadedTool e UnloadTool a
 Exe e Lua.

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

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 4419d6d..603d0d9 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -2010,6 +2010,26 @@ ExeLoadTool( const string& sHead, int nExit, const string& sTool)
    return pGseCtx->m_pMachMgr->LoadTool( sHead, nExit, sTool) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetLoadedTool( const string& sHead, int nExit, string& sTool)
+{
+   GseContext* pGseCtx = GetCurrGseContext() ;
+   VERIFY_CTX_MACHMGR( pGseCtx, false)
+  // recupera l'utensile sulla macchina della macchinata corrente in posizione indicata
+   return pGseCtx->m_pMachMgr->GetLoadedTool( sHead, nExit, sTool) ;
+}
+
+//-----------------------------------------------------------------------------
+bool
+ExeUnloadTool( const string& sHead, int nExit)
+{
+   GseContext* pGseCtx = GetCurrGseContext() ;
+   VERIFY_CTX_MACHMGR( pGseCtx, false)
+  // scaric l'utensile dalla posizione indicata della macchina della macchinata corrente
+   return pGseCtx->m_pMachMgr->UnloadTool( sHead, nExit) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeResetHeadSet( const string& sHead)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index e49eea0fca80d90fc1798b2e383011e2f155a5be..b91b1beb2e82bfe24366707c368c94d11f660a72 100644
GIT binary patch
delta 105
zcmZ1%y)JsgA2vp_%@@V4Gflq2nKwB}L}GFQr`YBKt{N7g_(8eLOp^}?BE$`p+!!}6
e64qk|YjR~q(%{Fqd6G0(;-H)(Lc&0)jvD~(JR=+c

delta 97
zcmZ1%y)JsgA2vpl%@@V4Gflq2na5}{Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0GazAOaK4?

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 706d0c7..be6eb60 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -2383,6 +2383,44 @@ LuaLoadTool( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaGetLoadedTool( lua_State* L)
+{
+  // 2 parametri : sHead, nExit
+   string sHead ;
+   LuaCheckParam( L, 1, sHead)
+   int nExit ;
+   LuaCheckParam( L, 2, nExit)
+   LuaClearStack( L) ;
+  // recupero l'utensile caricato su testa e uscita indicate
+   string sTool ;
+   bool bOk = ExeGetLoadedTool( sHead, nExit, sTool) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, sTool) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
+//-------------------------------------------------------------------------------
+static int
+LuaUnloadTool( lua_State* L)
+{
+  // 2 parametri : sHead, nExit
+   string sHead ;
+   LuaCheckParam( L, 1, sHead)
+   int nExit ;
+   LuaCheckParam( L, 2, nExit)
+   LuaClearStack( L) ;
+  // scarico l'utensile
+   bool bOk = ExeUnloadTool( sHead, nExit) ;
+  // restituisco il risultato
+   LuaSetParam( L, bOk) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaResetHeadSet( lua_State* L)
@@ -2545,6 +2583,8 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisHomePos", LuaGetAxisHomePos) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtResetAxisPos", LuaResetAxisPos) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtLoadTool", LuaLoadTool) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetLoadedTool", LuaGetLoadedTool) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtUnloadTool", LuaUnloadTool) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtResetHeadSet", LuaResetHeadSet) ;
    
    return bOk ;