From 4b8f8ee87e4d37e338eabc63b75a8559a8e073e4 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 20 Mar 2026 09:02:56 +0100 Subject: [PATCH] EgtExecutor : - aggiunto parametro nRefType a funzione VolZMapRemoveFins. --- EXE_GdbModifyVol.cpp | 12 +++++++++--- LUA_GdbModifyVol.cpp | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/EXE_GdbModifyVol.cpp b/EXE_GdbModifyVol.cpp index 422be63..3866ea2 100644 --- a/EXE_GdbModifyVol.cpp +++ b/EXE_GdbModifyVol.cpp @@ -620,20 +620,26 @@ ExeVolZmapMakeUniform( int nVolZmapId, double dToler, bool bExtensionFirst, int //-------------------------------------------------------------------------------- bool -ExeVolZMapRemoveFins( int nVolZMapId, const Vector3d& vtDir, double dThick) +ExeVolZMapRemoveFins( int nVolZMapId, const Vector3d& vtDir, double dThick, int nRefType) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) ; // Recupero lo ZMap IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nVolZMapId)) ; bool bOk = ( pVZM != nullptr) ; + // recupero il riferimento locale + Frame3d frLoc ; + bOk = bOk && pGeomDB->GetGlobFrame( nVolZMapId, frLoc) ; + // porto in locale la normale al piano + Vector3d vtDirL = GetVectorLocal( pGeomDB, vtDir, nRefType, frLoc) ; // Aggiorno lo ZMap mediante rimozione delle alette - bOk = bOk && pVZM->RemoveFins( vtDir, dThick) ; + bOk = bOk && pVZM->RemoveFins( vtDirL, dThick) ; // Se richiesto salvo il comando Lua equivalente if ( IsCmdLog()) { string sLua = "EgtVolZMapRemoveFins(" + ToString( nVolZMapId) + "," + ToString( vtDir) + "," + - ToString( dThick) + ")" + ToString( dThick) + "," + + RefTypeToString( nRefType) + ")" + " -- bOk =" + ToString( bOk) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } diff --git a/LUA_GdbModifyVol.cpp b/LUA_GdbModifyVol.cpp index c484120..3ea1e93 100644 --- a/LUA_GdbModifyVol.cpp +++ b/LUA_GdbModifyVol.cpp @@ -448,9 +448,11 @@ LuaVolZmapRemoveFins( lua_State* L) LuaCheckParam( L, 2, vtDir) ; double dThick ; LuaCheckParam( L, 3, dThick) ; + int nRefType = RTY_DEFAULT ; + LuaGetParam( L, 4, nRefType) ; LuaClearStack( L) ; // Eseguo la rimozione delle alette - bool bOk = ExeVolZMapRemoveFins( nId, vtDir, dThick) ; + bool bOk = ExeVolZMapRemoveFins( nId, vtDir, dThick, nRefType) ; LuaSetParam( L, bOk) ; return 1 ; }