diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index f6db74d..9cc460c 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -2310,6 +2310,16 @@ ExeSetRotAxisBlock( const string& sAxis, double dVal) return pMachMgr->SetRotAxisBlock( sAxis, dVal) ; } +//---------------------------------------------------------------------------- +bool +ExeGetRotAxisBlocked( int nInd, string& sAxis, double& dVal) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero dati bloccaggio asse in posizione nInd (0-based) + return pMachMgr->GetRotAxisBlocked( nInd, sAxis, dVal) ; +} + //----------------------------------------------------------------------------- bool ExeGetCalcTool( string& sTool) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 87fcb21..099fc55 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 8aa51c2..aecb24d 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -2605,6 +2605,30 @@ LuaSetRotAxisBlock( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaGetRotAxisBlocked( lua_State* L) +{ + // 1 parametro : nInd ( 0-based) + int nInd ; + LuaCheckParam( L, 1, nInd) + LuaClearStack( L) ; + // recupero dati bloccaggio asse in posizione nInd + string sAxis ; + double dVal ; + bool bOk = ExeGetRotAxisBlocked( nInd, sAxis, dVal) ; + // restituisco il risultato + if ( bOk) { + LuaSetParam( L, sAxis) ; + LuaSetParam( L, dVal) ; + } + else { + LuaSetParam( L) ; + LuaSetParam( L) ; + } + return 2 ; +} + //------------------------------------------------------------------------------- static int LuaGetCalcTool( lua_State* L) @@ -3200,6 +3224,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTable", LuaSetCalcTable) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTool", LuaSetCalcTool) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSetRotAxisBlock", LuaSetRotAxisBlock) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtGetRotAxisBlocked", LuaGetRotAxisBlocked) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcTool", LuaGetCalcTool) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcAngles", LuaGetCalcAngles) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcPositions", LuaGetCalcPositions) ;