From fb188d566e94b6e7c9523aff8df78051d58294e7 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 7 Jan 2026 09:23:32 +0100 Subject: [PATCH] EgtExecutor : - piccole correzioni. --- EXE_Trimming.cpp | 43 +++++++++++++++++++++++-------------------- Lua_Trimming.cpp | 5 +++-- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/EXE_Trimming.cpp b/EXE_Trimming.cpp index c7f3cea..ca78893 100644 --- a/EXE_Trimming.cpp +++ b/EXE_Trimming.cpp @@ -40,7 +40,7 @@ ExeTrimmingAutoSearch( int nParentId, int nSurfLayerId, double dShapeLinTol, dou { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Se non ho geometrie da ricercare, non faccio nulla if ( vsShapes.empty()) @@ -147,7 +147,7 @@ ExeTrimmingGetSurfTmFaceAdj( int nSurfId, const INTVECTOR& vTria, const PNTVECTO { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Recupero la superficie TriMesh const ISurfTriMesh* pStm = GetSurfTriMesh( pGeomDB->GetGeoObj( nSurfId)) ; @@ -248,7 +248,7 @@ ExeTrimmingGetAdjSurfs( const INTVECTOR& vSurfId, const INTVECTOR& vOtherSurfId, { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Recupero le superfici di Riferimento CISURFPVECTOR vRefSurf ; vRefSurf.reserve( vSurfId.size()) ; @@ -282,9 +282,9 @@ ExeTrimmingGetAdjSurfs( const INTVECTOR& vSurfId, const INTVECTOR& vOtherSurfId, ExeSetModified() ; // Se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtTrimmingGetAdjSurf(" + ToString( vSurfId) + "," + - ToString( vOtherSurfId) + "," + - ToString( dAngTol) + ")" + + string sLua = "EgtTrimmingGetAdjSurfs(" + ToString( vSurfId) + "," + + ToString( vOtherSurfId) + "," + + ToString( dAngTol) + ")" + " -- bOk=" + ToString( bOk) + ",vResId=" + ToString( vResId) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } @@ -299,7 +299,7 @@ ExeTrimmingGetBorders( int nParentId, const SELVECTOR& vIds, double dLinTol, dou { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Parametri da restituire nFirstId = GDB_ID_NULL ; @@ -331,7 +331,7 @@ ExeTrimmingGetBorders( int nParentId, const SELVECTOR& vIds, double dLinTol, dou ++ nSurf ; } // Recupero il vettore di Selezione associato non pił agli Id delle superficie ma alle loro posizioni nel vettore - vector vFaces ; vFaces.reserve( vIds.size()) ; + SELVECTOR vFaces ; vFaces.reserve( vIds.size()) ; for ( int i = 0 ; bOk && i < int( vIds.size()) ; ++ i) vFaces.emplace_back( uMapPos[vIds[i].nId], vIds[i].nSub) ; @@ -377,7 +377,7 @@ ExeTrimmingGetBordersByNormals( int nParentId, const SELVECTOR& vIds, double dLi { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Parametri da restituire nFirstId = GDB_ID_NULL ; @@ -409,7 +409,7 @@ ExeTrimmingGetBordersByNormals( int nParentId, const SELVECTOR& vIds, double dLi ++ nSurf ; } // Recupero il vettore di Selezione associato non pił agli Id delle superficie ma alle loro posizioni nel vettore - vector vFaces ; vFaces.reserve( vIds.size()) ; + SELVECTOR vFaces ; vFaces.reserve( vIds.size()) ; for ( int i = 0 ; bOk && i < int( vIds.size()) ; ++ i) vFaces.emplace_back( uMapPos[vIds[i].nId], vIds[i].nSub) ; @@ -476,9 +476,9 @@ ExeTrimmingGetBordersByNormals( int nParentId, const SELVECTOR& vIds, double dLi ExeSetModified() ; // Se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtTrimmingGetBorders(" + IdToString( nParentId) + "," + - ToString( dLinTol) + "," + - ToString( dAngTol) + ")" ; + string sLua = "EgtTrimmingGetBordersByNormals(" + IdToString( nParentId) + "," + + ToString( dLinTol) + "," + + ToString( dAngTol) + ")" ; sLua += " -- bOk=" + ToString( bOk) + " -- FirstId=" + ToString( nFirstId) + " CurveCount=" + ToString( nCount) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; @@ -495,7 +495,7 @@ ExeTrimmingGetFinalBorders( int nParentId, const INTVECTOR& vCrvBezierId, double { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Parametri da restituire nFirstId = GDB_ID_NULL ; @@ -542,10 +542,10 @@ ExeTrimmingGetFinalBorders( int nParentId, const INTVECTOR& vCrvBezierId, double // Se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtTrimmingGetFinalEdges(" + IdToString( nParentId) + "," + - ToString( vCrvBezierId) + "," + - ToString( dLinTol) + "," + - ToString( dAngTol) + "," ; + string sLua = "EgtTrimmingGetFinalBorders(" + IdToString( nParentId) + "," + + ToString( vCrvBezierId) + "," + + ToString( dLinTol) + "," + + ToString( dAngTol) + "," ; sLua += "{" ; for ( int nP = 0 ; nP < int( vBrkPts.size()) ; ++ nP) { sLua += "(" + ToString( vBrkPts[nP].x) + ", " + ToString( vBrkPts[nP].y) + ", " + ToString( vBrkPts[nP].z) + ")" + @@ -667,7 +667,7 @@ ExeTrimmingGetSurfBzSyncPoints( int nParentId, int nEdge1Id, int nEdge2Id, doubl { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Se necessario aggiusto le tolleranze double dMyLinTol = Clamp( dLinTol, EPS_SMALL, 1e5 * EPS_SMALL) ; @@ -727,7 +727,7 @@ ExeTrimmingSkimSyncPoints( int nEdge1Id, int nEdge2Id, const INTVECTOR& vnLineId { // Verifica database geometrico IGeomDB* pGeomDB = GetCurrGeomDB() ; - VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + VERIFY_GEOMDB( pGeomDB, false) // Se necessario aggiusto le tolleranze double dMyLinTol = Clamp( dLinTol, EPS_SMALL, 1e5 * EPS_SMALL) ; @@ -793,5 +793,8 @@ ExeTrimmingSkimSyncPoints( int nEdge1Id, int nEdge2Id, const INTVECTOR& vnLineId } } + // Se richiesto, salvo il comando Lua equivalente + // ????????????? + return bOk ; } diff --git a/Lua_Trimming.cpp b/Lua_Trimming.cpp index 60cf332..fa2199e 100644 --- a/Lua_Trimming.cpp +++ b/Lua_Trimming.cpp @@ -92,6 +92,7 @@ LuaTrimmingGetSurfTmFromStmFaces( lua_State* L) INTVECTOR vFaces ; LuaCheckParam( L, 3, vFaces) LuaClearStack( L) ; + // Eseguo int nNewSurfId = ExeTrimmingGetSurfTmFromStmFaces( nParentId, nSurfId, vFaces) ; LuaSetParam( L, nNewSurfId) ; return 1 ; @@ -178,7 +179,7 @@ LuaTrimmingGetBordersByNormals( lua_State* L) static int LuaTrimmingGetFinalBorders( lua_State* L) { - // 4 o 5 o 6 o 7 parametri : nParentId, vCrvBezierId, dLinTol, dAngTol [,vBreakingPts] [,dThick] [,dThickTol] + // 4 o 5 o 6 o 7 parametri : nParentId, vCrvBezierId, dLinTol, dAngTol [,vBreakingPts] [,dThick [,dThickTol]] int nParentId ; LuaCheckParam( L, 1, nParentId) INTVECTOR vCrvBezierId ; @@ -188,10 +189,10 @@ LuaTrimmingGetFinalBorders( lua_State* L) double dAngTol ; LuaCheckParam( L, 4, dAngTol) PNTVECTOR vBreakingPts ; - double dThick = 0., dThickTol = EPS_SMALL ; int nInd = 5 ; if ( LuaGetParam( L, nInd, vBreakingPts)) ++ nInd ; + double dThick = 0., dThickTol = EPS_SMALL ; if ( LuaGetParam( L, nInd, dThick)) { if ( ! LuaGetParam( L, nInd + 1, dThickTol)) { LuaClearStack( L) ;