diff --git a/EXE_CAvTool.cpp b/EXE_CAvTool.cpp index fddcad8..de70142 100644 --- a/EXE_CAvTool.cpp +++ b/EXE_CAvTool.cpp @@ -39,6 +39,15 @@ ExeCAvSetStdTool( double dToolLen, double dToolDiam, double dToolCornR) return s_pCAvTlStm->SetStdTool( dToolLen, dToolDiam / 2, dToolCornR) ; } +//---------------------------------------------------------------------------- +bool +ExeCAvSetAdvTool( double dToolLen, double dToolDiam, double dTipLen, double dTipDiam, double dToolCornR) +{ + if ( IsNull( s_pCAvTlStm)) + return false ; + return s_pCAvTlStm->SetAdvTool( dToolLen, dToolDiam / 2, dTipLen, dTipDiam / 2, dToolCornR) ; +} + //---------------------------------------------------------------------------- double ExeCAvToolPosStm( const Point3d& ptP, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, int nRefType) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 79450a6..064d7c0 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_CAvTool.cpp b/LUA_CAvTool.cpp index 424a64c..5e03db4 100644 --- a/LUA_CAvTool.cpp +++ b/LUA_CAvTool.cpp @@ -40,6 +40,29 @@ LuaCAvSetStdTool( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaCAvSetAdvTool( lua_State* L) +{ + // 5 parametri : dToolLen, dToolDiam, dToolCornR + double dToolLen ; + LuaCheckParam( L, 1, dToolLen) + double dToolDiam ; + LuaCheckParam( L, 2, dToolDiam) + double dTipLen ; + LuaCheckParam( L, 3, dTipLen) + double dTipDiam ; + LuaCheckParam( L, 4, dTipDiam) + double dToolCornR ; + LuaCheckParam( L, 5, dToolCornR) + LuaClearStack( L) ; + // assegno dati utensile avanzato per Collision Avoidance + bool bOk = ExeCAvSetAdvTool( dToolLen, dToolDiam, dTipLen, dTipDiam, dToolCornR) ; + // restituisco il risultato + LuaSetParam( L, bOk) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaCAvToolPosStm( lua_State* L) @@ -94,6 +117,7 @@ LuaInstallCAvTool( LuaMgr& luaMgr) { bool bOk = ( &luaMgr != nullptr) ; bOk = bOk && luaMgr.RegisterFunction( "EgtCAvSetStdTool", LuaCAvSetStdTool) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtCAvSetAdvTool", LuaCAvSetAdvTool) ; bOk = bOk && luaMgr.RegisterFunction( "EgtCAvToolPosStm", LuaCAvToolPosStm) ; bOk = bOk && luaMgr.RegisterFunction( "EgtCAvToolPathStm", LuaCAvToolPathStm) ; return bOk ;