From 3c02ee2dc0639266f0c4d896b6e57322dbf3e69c Mon Sep 17 00:00:00 2001 From: SaraP Date: Thu, 19 Sep 2024 16:29:04 +0200 Subject: [PATCH] Include : - aggiunti e modificati prototipi. --- EGkCurveAux.h | 6 ++++-- EXeExecutor.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/EGkCurveAux.h b/EGkCurveAux.h index 2f21d6e..0c625dc 100644 --- a/EGkCurveAux.h +++ b/EGkCurveAux.h @@ -122,16 +122,18 @@ EGK_EXPORT ICurve* ProjectCurveOnPlane( const ICurve& crCrv, const Plane3d& plPl EGK_EXPORT bool AdjustCurveSlope( ICurveComposite* pCrv, double dNini, double dNfin) ; //---------------------------------------------------------------------------- -//! Calcolo del diagramma di Voronoi della curva, nei TempParam dei risultati la distanza +//! Calcolo del diagramma di Voronoi della curva/e, nei TempParam dei risultati la distanza //! Per nBound tenere valore di default. EGK_EXPORT bool CalcCurveVoronoiDiagram( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, int nBound = 3) ; +EGK_EXPORT bool CalcCurvesVoronoiDiagram( const CICURVEPVECTOR& vCrvC, ICURVEPOVECTOR& vCrvs, int nBound = 3) ; //---------------------------------------------------------------------------- -//! Calcolo del Medial Axis della curva (sottoinsieme del diagramma di Voronoi), nei TempParam dei risultati la distanza +//! Calcolo del Medial Axis della curva/e (sottoinsieme del diagramma di Voronoi), nei TempParam dei risultati la distanza const int WMAT_BOTHSIDES = 0 ; const int WMAT_LEFT = 1 ; const int WMAT_RIGHT = 2 ; EGK_EXPORT bool CalcCurveMedialAxis( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, int nSide) ; +EGK_EXPORT bool CalcCurvesMedialAxis( const CICURVEPVECTOR& vCrvC, ICURVEPOVECTOR& vCrvs, int nSide) ; //---------------------------------------------------------------------------- //! Calcola l'offset completo di una curva diff --git a/EXeExecutor.h b/EXeExecutor.h index 6e7ac5e..18cc977 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -632,8 +632,8 @@ EXE_EXPORT bool ExeProjectCurveOnSurfBz( int nCurveId, int nSurfBzId, const Vect double dLinTol, double dMaxSegmLen, int nRefType) ; EXE_EXPORT bool ExeProjectCurveOnSurfBzExt( int nCurveId, int nSurfBzId, int nGuideId, int nDestGrpId, double dLinTol, double dMaxSegmLen, bool bDirFromGuide) ; -EXE_EXPORT int ExeCurveGetVoronoi( int nId, int nDestGrpId, int nBound, int* pnCount) ; -EXE_EXPORT int ExeCurveGetMedialAxis( int nId, int nDestGrpId, int nSide, int* pnCount) ; +EXE_EXPORT int ExeCurveGetVoronoi( const INTVECTOR& vIds, int nDestGrpId, int nBound, int* pnCount) ; +EXE_EXPORT int ExeCurveGetMedialAxis( const INTVECTOR& vIds, int nDestGrpId, int nSide, int* pnCount) ; EXE_EXPORT int ExeCurveGetFatCurve( int nId, int nDestGrpId, double dRad, bool bSquareEnds, bool bSquareMids, int* pnCount) ; EXE_EXPORT bool ExeCurveBezierIncreaseDegree( int nCrvId) ; EXE_EXPORT bool ExeCurveBezierDecreaseDegree( int nCrvId, double dTol = 100) ;