From 4c7de36ba0abf6a5709af3d1658d9a2baef65023 Mon Sep 17 00:00:00 2001
From: Riccardo Elitropi <riccardo.elitropi@egalware.com>
Date: Thu, 9 Oct 2025 09:38:55 +0200
Subject: [PATCH] EgtExecutor : - Correzione e miglioramento della funzione per
 uniformare un VolZMap.

---
 EXE_GdbCreateVol.cpp | 10 ++++++----
 LUA_GdbModifyVol.cpp | 14 +++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/EXE_GdbCreateVol.cpp b/EXE_GdbCreateVol.cpp
index c596c11..fdebb51 100644
--- a/EXE_GdbCreateVol.cpp
+++ b/EXE_GdbCreateVol.cpp
@@ -222,7 +222,7 @@ ExeUpdateVolZmapByAddingSurfTm( int nVolZmapId, int nStmId)
 
 //-------------------------------------------------------------------------------
 bool
-ExeUniformVolZmap( int nVolZmapId, double dToler)
+ExeUniformVolZmap( int nVolZmapId, double dToler, bool bExtensionFirst, int nToolNum)
 {
    IGeomDB* pGeomDB = GetCurrGeomDB() ;
    VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -231,12 +231,14 @@ ExeUniformVolZmap( int nVolZmapId, double dToler)
    bool bOk = ( pVZM != nullptr) ;
   // aggiorno lo Zmap
    dToler = max( dToler, EPS_SMALL) ;
-   bOk = bOk && pVZM->MakeUniform( dToler) ;
+   bOk = bOk && pVZM->MakeUniform( dToler, bExtensionFirst, nToolNum) ;
    ExeSetModified() ;
   // se richiesto, salvo il comando Lua equivalente
    if ( IsCmdLog()) {
-      string sLua = "EgtUniformZmap(" + ToString( nVolZmapId) + "," +
-                                        ToString( dToler) + ")"
+      string sLua = "EgtUniformVolZmap(" + ToString( nVolZmapId) + "," +
+                                           ToString( dToler) + "," +
+                                           ( bExtensionFirst ? "true" : "false") +
+                                           ToString( nToolNum) + ")"
                     " -- bOk =" + ToString( bOk) ;
       LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
    }
diff --git a/LUA_GdbModifyVol.cpp b/LUA_GdbModifyVol.cpp
index 7332437..f12d443 100644
--- a/LUA_GdbModifyVol.cpp
+++ b/LUA_GdbModifyVol.cpp
@@ -404,13 +404,17 @@ LuaUpdateVolZmapByAddingSurfTm( lua_State* L)
 static int
 LuaUniformVolZmap( lua_State* L)
 {
-  // 1 o 2 parametri : nVolZmapId [, dToler]
+  // 2 o 3 o 4 parametri : nVolZmapId, dToler [, bExtensionFirst] [, nToolNum]
    int nVolZmapId ;
    LuaCheckParam( L, 1, nVolZmapId) ;
-   double dToler = EPS_SMALL ;
-   LuaGetParam( L, 2, dToler) ;
+   double dToler ;
+   LuaCheckParam( L, 2, dToler) ;
+   bool bExtensionFirst = true ;
+   LuaGetParam( L, 3, bExtensionFirst) ;
+   int nToolNum = 0 ;
+   LuaGetParam( L, 4, nToolNum) ;
    LuaClearStack( L) ;
-   bool bOk = ExeUniformVolZmap( nVolZmapId, dToler) ;
+   bool bOk = ExeUniformVolZmap( nVolZmapId, dToler, bExtensionFirst, nToolNum) ;
    LuaSetParam( L, bOk) ;
    return 1 ;
 }
@@ -454,7 +458,7 @@ LuaInstallGdbModifyVol( LuaMgr& luaMgr)
    bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapMillingStep", LuaVolZmapMillingStep) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtCutVolZmapPlane", LuaCutVolZmapPlane) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtUpdateVolZmapByAddingSurfTm", LuaUpdateVolZmapByAddingSurfTm ) ;
-   bOk = bOk && luaMgr.RegisterFunction( "EgtUniformZmap", LuaUniformVolZmap) ;
+   bOk = bOk && luaMgr.RegisterFunction( "EgtUniformVolZmap", LuaUniformVolZmap) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapOffset", LuaVolZmapOffset) ;
    return bOk ;
 }
\ No newline at end of file