From 603e295dc1e4cf462f28a07a8b1a8c66bde78f2a Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 8 May 2018 16:45:14 +0000
Subject: [PATCH] EgtExecutor 1.9e3 : - aggiunta funzione Exe e Lua
 CAvSetAdvTool.

---
 EXE_CAvTool.cpp |   9 +++++++++
 EgtExecutor.rc  | Bin 16146 -> 16146 bytes
 LUA_CAvTool.cpp |  24 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

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 79450a60730035201a180a33c0fcb16b91490f44..064d7c047f2352044f64c2d3f3580ae34a13c1c0 100644
GIT binary patch
delta 79
zcmbPKH>qyJFE&Qw&A-`PnSqoe*K!sx?>N)s4T4pS#*-bnk~jAW*?>e(i-FY$N+HxV
MD8kglDQ%Gf0B7?X2><{9

delta 79
zcmbPKH>qyJFE&P_&A-`PnSqoe*K!sx?>N)s4T4pSMw1=6k~jAW*?>e(i-FY$N+HxV
MD8kglDQ%Gf0A{Bf0RR91

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 ;