From 06c5d68d8b6904a8222378b022351c79e6ada5db Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 10 Oct 2023 13:36:28 +0200 Subject: [PATCH] EgtExecutor : - rimozione parametro da ExeSurfTmSubtractProjectedFacesOnFace. --- EXE_GdbModifySurf.cpp | 8 ++------ LUA_GdbModifySurf.cpp | 15 ++++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/EXE_GdbModifySurf.cpp b/EXE_GdbModifySurf.cpp index 1fda080..41ece7f 100644 --- a/EXE_GdbModifySurf.cpp +++ b/EXE_GdbModifySurf.cpp @@ -930,14 +930,11 @@ ExeSurfTmCut( int nId, int nCutterId, bool bInVsOut, bool bSaveOnEq) //---------------------------------------------------------------------------- bool ExeSurfTmSubtractProjectedFacesOnFace( int nSurfId, int nFaceInd, int nDestGrpId, - INTVECTOR vSurfsId, INTVECTOR vSurfFacesInd, bool bOCFlag, + INTVECTOR vSurfsId, bool bOCFlag, bool& bExistProjection, int& nNewId, int& nNewFaceNbr) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) - // controllo dimensione dei vettori passati come parametri - if ( int( vSurfsId.size()) != int( vSurfFacesInd.size())) - return false ; // recupero la superficie TriMesh su cui proiettare ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nSurfId)) ; if ( pStm == nullptr) @@ -963,7 +960,7 @@ ExeSurfTmSubtractProjectedFacesOnFace( int nSurfId, int nFaceInd, int nDestGrpId } // eseguo la proiezione ISurfTriMesh* pStmRes = nullptr ; - bool bOk = SubtractProjectedFacesOnStmFace( *pStm, nFaceInd, vpStmOthers, vSurfFacesInd, bOCFlag, + bool bOk = SubtractProjectedFacesOnStmFace( *pStm, nFaceInd, vpStmOthers, bOCFlag, bExistProjection, pStmRes, nNewFaceNbr) ; if ( ! bOk) { delete( pStmRes) ; @@ -986,7 +983,6 @@ ExeSurfTmSubtractProjectedFacesOnFace( int nSurfId, int nFaceInd, int nDestGrpId ToString( nFaceInd) + "," + ToString( nDestGrpId) + "," + ToString( vSurfsId) + "," + - ToString( vSurfFacesInd) + "," + ToString( bOCFlag) + ")" + " -- Ok=" + ToString( bOk) + " Id=" + ToString( nNewId) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; diff --git a/LUA_GdbModifySurf.cpp b/LUA_GdbModifySurf.cpp index 4717ab6..b4139a3 100644 --- a/LUA_GdbModifySurf.cpp +++ b/LUA_GdbModifySurf.cpp @@ -392,28 +392,25 @@ LuaSurfTmCut( lua_State* L) static int LuaSubtractProjectedFacesOnStmFace( lua_State* L) { - // 3 o 4 o 5 o 6 parametri : nSurfId, nFaceInd, nDestGrpId [, vSurfsId, vSurfFacesInd] [, bOCFlag] + // 3 o 4 o 5 parametri : nSurfId, nFaceInd, nDestGrpId [, vSurfsId] [, bOCFlag] int nSurfId ; LuaCheckParam( L, 1, nSurfId) ; int nFaceInd ; LuaCheckParam( L, 2, nFaceInd) ; int nDestGrpId ; LuaCheckParam( L, 3, nDestGrpId) ; - INTVECTOR vSurfsId ; - INTVECTOR vSurfFacesInd ; + INTVECTOR vSurfsId ; bool bOCFlag = true ; - if ( LuaGetParam( L, 4, vSurfsId)) { - LuaCheckParam( L, 5, vSurfFacesInd) - LuaGetParam( L, 6, bOCFlag) ; - } + if ( LuaGetParam( L, 4, vSurfsId)) + LuaGetParam( L, 5, bOCFlag) ; else LuaGetParam( L, 4, bOCFlag) ; LuaClearStack( L) ; - // sottraggo alla faccia scelta la proiezione delle altre + // sottraggo alla faccia scelta la proiezione delle altre TriMesh int nNewId = GDB_ID_NULL; bool bExistProjection = false ; int nNewFaceNbr = 0 ; - bool bOk = ExeSurfTmSubtractProjectedFacesOnFace( nSurfId, nFaceInd, nDestGrpId, vSurfsId, vSurfFacesInd, + bool bOk = ExeSurfTmSubtractProjectedFacesOnFace( nSurfId, nFaceInd, nDestGrpId, vSurfsId, bOCFlag, bExistProjection, nNewId, nNewFaceNbr) ; LuaSetParam( L, bOk) ; LuaSetParam( L, bExistProjection) ;