From 5314a1926bb2f674809a61eea5979d534cf91ad9 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 19 Mar 2026 19:31:36 +0100 Subject: [PATCH] EgtExecutor : - cambio nome di funzione exe/lua da EraseFins in RemoveFins - cambio nome di funzione exe/lua da UniformVolZmap a VolZmapMakeUniform. --- EXE_GdbCreateVol.cpp | 78 -------------------------------------------- EXE_GdbModifyVol.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++ LUA_GdbModifyVol.cpp | 12 +++---- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/EXE_GdbCreateVol.cpp b/EXE_GdbCreateVol.cpp index 8c81f32..a61cec5 100644 --- a/EXE_GdbCreateVol.cpp +++ b/EXE_GdbCreateVol.cpp @@ -188,81 +188,3 @@ ExeCreateVolZmapFromSurfTm( int nParentId, int nStmId, double dPrec, bool bTriDe // restituisco l'identificativo della nuova entità return nNewId ; } - -//------------------------------------------------------------------------------- -bool -ExeUpdateVolZmapByAddingSurfTm( int nVolZmapId, int nStmId) -{ - IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) - // recupero lo Zmap - IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nVolZmapId)) ; - bool bOk = ( pVZM != nullptr) ; - // recupero la trimesh - PtrOwner pStm( CloneSurfTriMesh( pGeomDB->GetGeoObj( nStmId))) ; - bOk = bOk && !IsNull( pStm) ; - // recupero il frame dello Zmap e della Trimesh - Frame3d frZmap, frStm ; - bOk = bOk && pGeomDB->GetGlobFrame( nVolZmapId, frZmap) && - pGeomDB->GetGlobFrame( nStmId, frStm) ; - // porto la Stm nel frame dello Zmap - bOk = bOk && pStm->LocToLoc( frStm, frZmap) ; - // aggiorno lo Zmap con la nuova superficie - bOk = bOk && pVZM->AddSurfTm( pStm) ; - ExeSetModified() ; - // se richiesto, salvo il comando Lua equivalente - if ( IsCmdLog()) { - string sLua = "EgtUpdateVolZmapByAddingSurfTm(" + ToString( nVolZmapId) + "," + - ToString( nStmId) + ")" - " -- bOk =" + ToString( bOk) ; - LOG_INFO( GetCmdLogger(), sLua.c_str()) ; - } - return bOk ; -} - -//------------------------------------------------------------------------------- -bool -ExeUniformVolZmap( int nVolZmapId, double dToler, bool bExtensionFirst, int nToolNum) -{ - IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, false) - // recupero lo Zmap - IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nVolZmapId)) ; - bool bOk = ( pVZM != nullptr) ; - // aggiorno lo Zmap - dToler = max( dToler, EPS_SMALL) ; - bOk = bOk && pVZM->MakeUniform( dToler, bExtensionFirst, nToolNum) ; - ExeSetModified() ; - // se richiesto, salvo il comando Lua equivalente - if ( IsCmdLog()) { - string sLua = "EgtUniformVolZmap(" + ToString( nVolZmapId) + "," + - ToString( dToler) + "," + - ( bExtensionFirst ? "true" : "false") + - ToString( nToolNum) + ")" - " -- bOk =" + ToString( bOk) ; - LOG_INFO( GetCmdLogger(), sLua.c_str()) ; - } - return bOk ; -} - -//-------------------------------------------------------------------------------- -bool -ExeVolZMapEraseFins( int nVolZMapId, const Vector3d& vtDir, double dThick) -{ - IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, false) ; - // Recupero lo ZMap - IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nVolZMapId)) ; - bool bOk = ( pVZM != nullptr) ; - // Aggiorno lo ZMap mediante rimozione delle alette - bOk = bOk && pVZM->EraseFins( vtDir, dThick) ; - // Se richiesto salvo il comando Lua equivalente - if ( IsCmdLog()) { - string sLua = "EgtVolZMapEraseFins(" + ToString( nVolZMapId) + "," + - ToString( vtDir) + "," + - ToString( dThick) + ")" - " -- bOk =" + ToString( bOk) ; - LOG_INFO( GetCmdLogger(), sLua.c_str()) ; - } - return bOk ; -} diff --git a/EXE_GdbModifyVol.cpp b/EXE_GdbModifyVol.cpp index eddf97d..422be63 100644 --- a/EXE_GdbModifyVol.cpp +++ b/EXE_GdbModifyVol.cpp @@ -561,3 +561,81 @@ ExeVolZMapOffset( int nId, double dDist, int nType) } return bOk ; } + +//------------------------------------------------------------------------------- +bool +ExeUpdateVolZmapByAddingSurfTm( int nVolZmapId, int nStmId) +{ + IGeomDB* pGeomDB = GetCurrGeomDB() ; + VERIFY_GEOMDB( pGeomDB, false) + // recupero lo Zmap + IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nVolZmapId)) ; + bool bOk = ( pVZM != nullptr) ; + // recupero la trimesh + PtrOwner pStm( CloneSurfTriMesh( pGeomDB->GetGeoObj( nStmId))) ; + bOk = bOk && !IsNull( pStm) ; + // recupero il frame dello Zmap e della Trimesh + Frame3d frZmap, frStm ; + bOk = bOk && pGeomDB->GetGlobFrame( nVolZmapId, frZmap) && + pGeomDB->GetGlobFrame( nStmId, frStm) ; + // porto la Stm nel frame dello Zmap + bOk = bOk && pStm->LocToLoc( frStm, frZmap) ; + // aggiorno lo Zmap con la nuova superficie + bOk = bOk && pVZM->AddSurfTm( pStm) ; + ExeSetModified() ; + // se richiesto, salvo il comando Lua equivalente + if ( IsCmdLog()) { + string sLua = "EgtUpdateVolZmapByAddingSurfTm(" + ToString( nVolZmapId) + "," + + ToString( nStmId) + ")" + " -- bOk =" + ToString( bOk) ; + LOG_INFO( GetCmdLogger(), sLua.c_str()) ; + } + return bOk ; +} + +//------------------------------------------------------------------------------- +bool +ExeVolZmapMakeUniform( int nVolZmapId, double dToler, bool bExtensionFirst, int nToolNum) +{ + IGeomDB* pGeomDB = GetCurrGeomDB() ; + VERIFY_GEOMDB( pGeomDB, false) + // recupero lo Zmap + IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nVolZmapId)) ; + bool bOk = ( pVZM != nullptr) ; + // aggiorno lo Zmap + dToler = max( dToler, EPS_SMALL) ; + bOk = bOk && pVZM->MakeUniform( dToler, bExtensionFirst, nToolNum) ; + ExeSetModified() ; + // se richiesto, salvo il comando Lua equivalente + if ( IsCmdLog()) { + string sLua = "EgtVolZmapMakeUniform(" + ToString( nVolZmapId) + "," + + ToString( dToler) + "," + + ( bExtensionFirst ? "true" : "false") + + ToString( nToolNum) + ")" + " -- bOk =" + ToString( bOk) ; + LOG_INFO( GetCmdLogger(), sLua.c_str()) ; + } + return bOk ; +} + +//-------------------------------------------------------------------------------- +bool +ExeVolZMapRemoveFins( int nVolZMapId, const Vector3d& vtDir, double dThick) +{ + IGeomDB* pGeomDB = GetCurrGeomDB() ; + VERIFY_GEOMDB( pGeomDB, false) ; + // Recupero lo ZMap + IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nVolZMapId)) ; + bool bOk = ( pVZM != nullptr) ; + // Aggiorno lo ZMap mediante rimozione delle alette + bOk = bOk && pVZM->RemoveFins( vtDir, dThick) ; + // Se richiesto salvo il comando Lua equivalente + if ( IsCmdLog()) { + string sLua = "EgtVolZMapRemoveFins(" + ToString( nVolZMapId) + "," + + ToString( vtDir) + "," + + ToString( dThick) + ")" + " -- bOk =" + ToString( bOk) ; + LOG_INFO( GetCmdLogger(), sLua.c_str()) ; + } + return bOk ; +} diff --git a/LUA_GdbModifyVol.cpp b/LUA_GdbModifyVol.cpp index 98eb838..c484120 100644 --- a/LUA_GdbModifyVol.cpp +++ b/LUA_GdbModifyVol.cpp @@ -402,7 +402,7 @@ LuaUpdateVolZmapByAddingSurfTm( lua_State* L) //------------------------------------------------------------------------------- static int -LuaUniformVolZmap( lua_State* L) +LuaVolZmapMakeUniform( lua_State* L) { // 2 o 3 o 4 parametri : nVolZmapId, dToler [, bExtensionFirst] [, nToolNum] int nVolZmapId ; @@ -414,7 +414,7 @@ LuaUniformVolZmap( lua_State* L) int nToolNum = 0 ; LuaGetParam( L, 4, nToolNum) ; LuaClearStack( L) ; - bool bOk = ExeUniformVolZmap( nVolZmapId, dToler, bExtensionFirst, nToolNum) ; + bool bOk = ExeVolZmapMakeUniform( nVolZmapId, dToler, bExtensionFirst, nToolNum) ; LuaSetParam( L, bOk) ; return 1 ; } @@ -439,7 +439,7 @@ LuaVolZmapOffset( lua_State* L) //------------------------------------------------------------------------------- static int -LuaVolZmapEraseFins( lua_State* L) +LuaVolZmapRemoveFins( lua_State* L) { // 3 parametri : Id, vtDir, dThick int nId ; @@ -450,7 +450,7 @@ LuaVolZmapEraseFins( lua_State* L) LuaCheckParam( L, 3, dThick) ; LuaClearStack( L) ; // Eseguo la rimozione delle alette - bool bOk = ExeVolZMapEraseFins( nId, vtDir, dThick) ; + bool bOk = ExeVolZMapRemoveFins( nId, vtDir, dThick) ; LuaSetParam( L, bOk) ; return 1 ; } @@ -476,8 +476,8 @@ 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( "EgtUniformVolZmap", LuaUniformVolZmap) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapMakeUniform", LuaVolZmapMakeUniform) ; bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapOffset", LuaVolZmapOffset) ; - bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapEraseFins", LuaVolZmapEraseFins) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtVolZmapRemoveFins", LuaVolZmapRemoveFins) ; return bOk ; } \ No newline at end of file