From bbf5db64e2eaa94762c94e2ff6fd5818443db74f Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 13 Apr 2017 18:23:39 +0000 Subject: [PATCH] EgtExecutor 1.8d1 : - aggiunta funzione Exe e Lua GetAxisType. --- EXE_MachMgr.cpp | 10 ++++++++++ EgtExecutor.rc | Bin 15088 -> 15088 bytes LUA_MachMgr.cpp | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index d6a8101..52f55e5 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -2494,6 +2494,16 @@ ExeGetAxisToken( const string& sAxis, string& sToken) return pMachMgr->GetAxisToken( sAxis, sToken) ; } +//----------------------------------------------------------------------------- +bool +ExeGetAxisType( const string& sAxis, bool& bLinear) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero il tipo dell'asse + return pMachMgr->GetAxisType( sAxis, bLinear) ; +} + //----------------------------------------------------------------------------- bool ExeGetAllHeadsNames( STRVECTOR& vNames) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 0ea510a06eb4ead448d826b2f4476de2506d1f8f..db0c62bef95916ca493c5506dd60ee646613fca8 100644 GIT binary patch delta 103 zcmexR`k{2gH#Sxi1|0^&&A-{4nVD073`efTEO4>oOp`YVR)EAOJ8~s&?h~?r$(o>Ndf?UOCF5? delta 103 zcmexR`k{2gH#Syd1|0^A&A-{4nVFM;3`efTEO4>oOp`YVR)EAOJ8~s&?h~?r$(o>Ndf?d+aA3D diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 9fd6375..10b7609 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -2927,6 +2927,25 @@ LuaGetAxisToken( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaGetAxisType( lua_State* L) +{ + // 1 parametro : sAxis + string sAxis ; + LuaCheckParam( L, 1, sAxis) + LuaClearStack( L) ; + // recupero il tipo dell'asse + bool bLinear ; + bool bOk = ExeGetAxisType( sAxis, bLinear) ; + // restituisco il risultato + if ( bOk) + LuaSetParam( L, bLinear) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaGetAllHeadsNames( lua_State* L) @@ -3269,6 +3288,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtGetHeadId", LuaGetHeadId) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetHeadExitCount", LuaGetHeadExitCount) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisToken", LuaGetAxisToken) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisType", LuaGetAxisType) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetAllHeadsNames", LuaGetAllHeadsNames) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetAllTablesNames", LuaGetAllTablesNames) ; // Machine Calc