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 0ea510a..db0c62b 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ 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