From 4b95b19e9ced9ca80a878fd847d20657eea6252b Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 1 Nov 2016 19:06:36 +0000
Subject: [PATCH] EgtExecutor 1.6w1 : - in Exe e Lua aggiunto parametro per
 tipo asse a SimGetAxisInfoPos.

---
 EXE_MachMgr.cpp |   6 +++---
 EgtExecutor.rc  | Bin 11694 -> 11694 bytes
 LUA_MachMgr.cpp |  11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 8852f20..9bae9a1 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -2075,12 +2075,12 @@ ExeSimHome( void)
 
 //-----------------------------------------------------------------------------
 bool
-ExeSimGetAxisInfoPos( int nI, string& sName, double& dVal)
+ExeSimGetAxisInfoPos( int nI, string& sToken, bool& bLinear, double& dVal)
 {
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
    VERIFY_MACHMGR( pMachMgr, false)
-  // recupero stringa con quote degli assi attivi
-   return pMachMgr->SimGetAxisInfoPos( nI, sName, dVal) ;
+  // recupero stringa con info asse di simulazione
+   return pMachMgr->SimGetAxisInfoPos( nI, sToken, bLinear, dVal) ;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 31f5bbfc1e49ce4a94b2febaeb36a9f2c08e3851..e6cb12ef48e4c11f4c136701558b12730a9c266d 100644
GIT binary patch
delta 121
zcmZ1%y)Jsg4>nd~1|0^&%@@V4Gflq2nZsPpU^qFDTX%B-R|N}H?x5UdrpX5c5po7f
iZj75332QOKH9IpSY4l^<JV_cZc~H(CA!(pg#|;4Kha!vs

delta 121
zcmZ1%y)Jsg4>ndK1|0^A%@@V4Gflq2nZsPhU@<w6TX%B-R|N}H?x5UdrpX5c5po7f
iZj75332QOKH9IpSY4l^<JV_cZc~H(CA!(pg#|;4Vb0WL|

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 5a0cc51..e9de761 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -2245,19 +2245,22 @@ LuaSimGetAxisInfoPos( lua_State* L)
    LuaCheckParam( L, 1, nInd)
    LuaClearStack( L) ;
   // calcolo nome e posizione dell'asse
-   string sName ;
+   string sToken ;
+   bool bLinear ;
    double dVal ;
-   bool bOk = ExeSimGetAxisInfoPos( nInd, sName, dVal) ;
+   bool bOk = ExeSimGetAxisInfoPos( nInd, sToken, bLinear, dVal) ;
   // restituisco il risultato
    if ( bOk) {
-      LuaSetParam( L, sName) ;
+      LuaSetParam( L, sToken) ;
+      LuaSetParam( L, bLinear) ;
       LuaSetParam( L, dVal) ;
    }
    else {
       LuaSetParam( L) ;
       LuaSetParam( L) ;
+      LuaSetParam( L) ;
    }
-   return 2 ;
+   return 3 ;
 }
 
 //-------------------------------------------------------------------------------