From 458935858802bbb9b50e5dfadaacc9acd6955dc6 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 3 Feb 2026 17:14:18 +0100 Subject: [PATCH] Include : - in Trimming aggiunte funzioni per riconoscimento Fori e Asole. - in Trimming pulizia codice. --- EGkTrimming.h | 9 ++++----- EXeExecutor.h | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/EGkTrimming.h b/EGkTrimming.h index e9f44d2..68c9917 100644 --- a/EGkTrimming.h +++ b/EGkTrimming.h @@ -31,7 +31,7 @@ typedef std::vector ISURFPOMATRIX ; typedef std::vector ICRVCOMPOPOMATRIX ; //----------------------------------------------------------------------------- -EGK_EXPORT bool GetTrimmingStmAdjTria( const ISurfTriMesh* pStm, const INTVECTOR& vTria, const PNTVECTOR& vPts, +EGK_EXPORT bool GetTrimmingStmAdjTria( const ISurfTriMesh* pStm, int nStartTria, const Point3d& ptStartTria, double dAngTol, double dSize, double dSizeTol, ISurfTriMesh* pStmAdjTria) ; EGK_EXPORT bool GetTrimmingAdjSurfs( const CISURFPVECTOR& vSurf, const CISURFPVECTOR& vOtherSurf, double dLinTol, double dAngTol, double dFaceAngTol, @@ -50,7 +50,6 @@ EGK_EXPORT ISurfBezier* GetTrimmingRuledBezier( const CISURFPVECTOR& vSurf, cons double dLinTol, const BIPNTVECTOR& vSyncPoints) ; EGK_EXPORT bool GetTrimmingSurfBzSyncPoints( const ICurve* pCrvEdge1, const ICurve* pCrvEdge2, double dLinTol, BIPNTVECTOR& vSyncPoints) ; -EGK_EXPORT bool GetTrimmingAutoEntities( const CISURFPVECTOR& vSurf, double dShapeLinTol, double dShapeAngTol, - double dLinTol, double dEdgeLinTol, double dAngTol, double dAngFaceTol, - const STRVECTOR& vsShapes, ISURFPOMATRIX& matSelSurfMatrix, - ICRVCOMPOPOMATRIX& matCompoBorders, ISURFBEZPOVECTOR& vSurfBz) ; +EGK_EXPORT bool GetTrimmingHoleBorders( const CISURFPVECTOR& vpSurf, const Point3d& ptRef, double dSurfLinTol, + double dSurfAngTol, double dEdgeLinTol, double dEdgeAngTol, + double dEdgeThick, ICRVCOMPOPOVECTOR& vHoleBorders) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 41b7945..8964114 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1501,7 +1501,7 @@ EXE_EXPORT bool ExeBase64Encode( const std::string& sFile, std::string& sB64Dest EXE_EXPORT bool ExeBase64Decode( const std::string& sB64Sou, const std::string& sFile) ; // Trimming -EXE_EXPORT int ExeTrimmingGetSurfTmFaceAdj( int nParentId, int nSurfId, const INTVECTOR& vTria, const PNTVECTOR& vPts, +EXE_EXPORT int ExeTrimmingGetSurfTmFaceAdj( int nParentId, int nSurfId, int nTria, const Point3d& vPts, double dAngTol, double dSize, double dSizeTol) ; EXE_EXPORT int ExeTrimmingGetSurfTmFromStmFaces( int nParentId, int nSurfId, const INTVECTOR& vFaces) ; EXE_EXPORT bool ExeTrimmingGetAdjSurfs( const INTVECTOR& vSurfId, const INTVECTOR& vOtherSurfId, double dLinTol, @@ -1510,7 +1510,7 @@ EXE_EXPORT bool ExeTrimmingGetBorders( int nParentId, const SELVECTOR& vIds, dou double dLinTol, double dAngTol, int& nFirstId, int& nCount) ; EXE_EXPORT bool ExeTrimmingGetBordersByNormals( int nParentId, const SELVECTOR& vIds, double dSurfLinTol, double dSurfAngTol, double dLinTol, double dAngTol, - double dThick, Point3d& ptNear, int& nFirstId, int& nCount) ; + double dThick, int& nFirstId, int& nCount) ; EXE_EXPORT bool ExeTrimmingGetFinalBorders( int nParentId, const INTVECTOR& vCrvBezierId, double dLinTol, double dAngTol, const PNTVECTOR& vBreakingPts, double dThick, double dThickTol, int& nFirstId, int& nCount) ; @@ -1519,6 +1519,6 @@ EXE_EXPORT int ExeTrimmingGetRuledBezier( int nParentId, const INTVECTOR& vIds, EXE_EXPORT bool ExeTrimmingGetSurfBzSyncPoints( int nParentId, int nEdge1Id, int nEdge2Id, double dLinTol, double dAngTol, int nLineNbr, bool bShowOnCorners, int& nFirstId, int& nCount) ; -EXE_EXPORT bool ExeTrimmingAutoSearch( int nParentId, int nSurfLayerId, double dShapeLinTol, double dShapeAngTol, - double dLinTol, double dEdgeLinTol, double dAngTol, double dAngFaceTol, - const STRVECTOR& vsShapes) ; +EXE_EXPORT bool ExeTrimmingGetHoleBorder( int nParentId, const INTVECTOR& vSurfIds, const INTVECTOR& vOtherSurfIds, + double dSurfLinTol, double dSurfAngTol, double dEdgeLinTol, double dEdgeAngTol, + double dEdgeThick, int& nFirstId, int& nCount) ;