From edb2a82012d58d1911f8fb61f6a7848bd2001bcc Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 15 Apr 2020 09:46:20 +0000
Subject: [PATCH] EgtExecutor : - aggiunto parametro altezza tagliente a
 definizione utensili per Virtual Milling.

---
 EXE_GdbModifyVol.cpp | 11 +++++++----
 LUA_GdbModifyVol.cpp | 16 ++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/EXE_GdbModifyVol.cpp b/EXE_GdbModifyVol.cpp
index 833a212..16d9515 100644
--- a/EXE_GdbModifyVol.cpp
+++ b/EXE_GdbModifyVol.cpp
@@ -193,7 +193,8 @@ ExeRemoveVolZmapPart( int nId, int nPart)
 
 //----------------------------------------------------------------------------
 bool
-ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLen, double dDiam, double dCornR, int nFlag)
+ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName,
+                      double dLen, double dDiam, double dCornR, double dCutterH, int nFlag)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -201,7 +202,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLe
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr  &&  pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, nFlag)) && bOk ;
+      bOk = ( pVZM != nullptr  &&  pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, dCutterH, nFlag)) && bOk ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -210,6 +211,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLe
                                                ToString( dLen) + "," +
                                                ToString( dDiam) + "," +
                                                ToString( dCornR) + "," +
+                                               ToString( dCutterH) + "," +
                                                ToString( nFlag) + ")" +
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -221,7 +223,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLe
 //----------------------------------------------------------------------------
 bool
 ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
-                      double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, int nFlag)
+                      double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, double dCutterH, int nFlag)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, false)
@@ -229,7 +231,7 @@ ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
    bool bOk = true ;
    for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
       IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
-      bOk = ( pVZM != nullptr  &&  pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, nFlag)) && bOk ;
+      bOk = ( pVZM != nullptr  &&  pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, dCutterH, nFlag)) && bOk ;
    }
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
@@ -240,6 +242,7 @@ ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
                                                ToString( dTipLen) + "," +
                                                ToString( dTipDiam) + "," +
                                                ToString( dCornR) + "," +
+                                               ToString( dCutterH) + "," +
                                                ToString( nFlag) + ")" +
                     " -- Ok=" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
diff --git a/LUA_GdbModifyVol.cpp b/LUA_GdbModifyVol.cpp
index 41a43cd..56e6953 100644
--- a/LUA_GdbModifyVol.cpp
+++ b/LUA_GdbModifyVol.cpp
@@ -60,7 +60,7 @@ LuaRemoveVolZmapPart( lua_State* L)
 static int
 LuaVolZmapSetStdTool( lua_State* L)
 {
-  // 5 o 6 parametri : vIds, sToolName, dLen, dDiam, dCornR, nFlag
+  // 6 o 7 parametri : vIds, sToolName, dLen, dDiam, dCornR, dCutterH [, nFlag]
    INTVECTOR vIds ;
    LuaCheckParam( L, 1, vIds)
    string sToolName ;
@@ -71,11 +71,13 @@ LuaVolZmapSetStdTool( lua_State* L)
    LuaCheckParam( L, 4, dDiam)
    double dCornR ;
    LuaCheckParam( L, 5, dCornR)
+   double dCutterH ;
+   LuaCheckParam( L, 6, dCutterH)
    int nFlag = 1 ;
-   LuaGetParam( L, 6, nFlag) ;
+   LuaGetParam( L, 7, nFlag) ;
    LuaClearStack( L) ;
   // imposto utensile standard a Zmap indicati
-   bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, nFlag) ;
+   bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, dCutterH, nFlag) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;
@@ -85,7 +87,7 @@ LuaVolZmapSetStdTool( lua_State* L)
 static int
 LuaVolZmapSetAdvTool( lua_State* L)
 {
-  // 7 o 8 parametri : vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, nFlag
+  // 8 o 9 parametri : vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH [, nFlag]
    INTVECTOR vIds ;
    LuaCheckParam( L, 1, vIds)
    string sToolName ;
@@ -100,11 +102,13 @@ LuaVolZmapSetAdvTool( lua_State* L)
    LuaCheckParam( L, 6, dTipDiam)
    double dCornR ;
    LuaCheckParam( L, 7, dCornR)
+   double dCutterH ;
+   LuaCheckParam( L, 8, dCutterH)
    int nFlag = 1 ;
-   LuaGetParam( L, 8, nFlag) ;
+   LuaGetParam( L, 9, nFlag) ;
    LuaClearStack( L) ;
   // imposto utensile avanzato a Zmap indicati
-   bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, nFlag) ;
+   bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH, nFlag) ;
   // restituisco il risultato
    LuaSetParam( L, bOk) ;
    return 1 ;