From 853ee94ca91ed569b0ac8a579237fab9a93d5cd6 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 16 Nov 2016 18:45:39 +0000
Subject: [PATCH] EgtExecutor 1.6w4 : - aggiunta a EXE e LUA GetAxisToken.

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

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index ef876b8..127f1a1 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -2291,6 +2291,16 @@ ExeGetHeadId( const string& sHead)
    return pMachMgr->GetHeadId( sHead) ;
 }
 
+//-----------------------------------------------------------------------------
+bool
+ExeGetAxisToken( const string& sAxis, string& sToken)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, false)
+  // recupero il token dell'asse
+   return pMachMgr->GetAxisToken( sAxis, sToken) ;
+}
+
 //-----------------------------------------------------------------------------
 bool
 ExeSetAxisPos( const string& sAxis, double dVal)
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 05192cd62211680b738fd7c443eaba8d3ee25311..e749188754ae3f718840a0d8235273321f6905a0 100644
GIT binary patch
delta 97
zcmZ1%y)JsgA2vpl%@@V4Gflq2na5}{Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0GazAOaK4?

delta 97
zcmZ1%y)JsgA2vqg%@@V4Gflq2na5~6Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21<3@0GM?jL;wH)

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index e9de761..5d4895b 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -2646,6 +2646,25 @@ LuaGetHeadId( lua_State* L)
    return 1 ;
 }
 
+//-------------------------------------------------------------------------------
+static int
+LuaGetAxisToken( lua_State* L)
+{
+  // 1 parametro : sAxis
+   string sAxis ;
+   LuaCheckParam( L, 1, sAxis)
+   LuaClearStack( L) ;
+  // recupero il token dell'asse
+   string sToken ;
+   bool bOk = ExeGetAxisToken( sAxis, sToken) ;
+  // restituisco il risultato
+   if ( bOk)
+      LuaSetParam( L, sToken) ;
+   else
+      LuaSetParam( L) ;
+   return 1 ;
+}
+
 //-------------------------------------------------------------------------------
 static int
 LuaSetAxisPos( lua_State* L)
@@ -2940,6 +2959,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableId", LuaGetTableId) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisId", LuaGetAxisId) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetHeadId", LuaGetHeadId) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisToken", LuaGetAxisToken) ;
    // Machine Calc
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTable", LuaSetCalcTable) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTool", LuaSetCalcTool) ;