diff --git a/EGkGeoCollection.h b/EGkGeoCollection.h index e3d1ad7..a62a5c6 100644 --- a/EGkGeoCollection.h +++ b/EGkGeoCollection.h @@ -23,6 +23,12 @@ typedef std::vector PNTVECTOR ; // vettore di punti typedef std::list PNTLIST ; // lista di punti typedef std::vector PNTMATRIX ; // matrice di punti + +//---------------------------------------------------------------------------- +// Raccolte di coppie Point3d,int +typedef std::pair POINTI ; // coppia punto, intero +typedef std::vector PNTIVECTOR ; // vettore di coppie punto, intero +typedef std::list PNTILIST ; // lista di coppie punto, intero //---------------------------------------------------------------------------- // Raccolte di coppie Point3d,dU diff --git a/EGkPolyLine.h b/EGkPolyLine.h index 1c2caf9..216e95f 100644 --- a/EGkPolyLine.h +++ b/EGkPolyLine.h @@ -139,3 +139,4 @@ EGK_EXPORT bool IsPointInsidePolyLine( const Point3d& ptP, const PolyLine& plPol EGK_EXPORT bool GetPointParamOnPolyLine( const Point3d& ptP, const PolyLine& plPoly, double dToler, double& dPar) ; EGK_EXPORT bool ChangePolyLineStart( PolyLine& plPoly, const Point3d& ptNewStart, double dToler) ; EGK_EXPORT bool SplitPolyLineAtPoint( const PolyLine& plPoly, const Point3d& ptP, double dToler, PolyLine& plPoly1, PolyLine& plPoly2) ; +EGK_EXPORT bool AssociatePolyLinesMinDistPoints( const PolyLine& PL1, const PolyLine& PL2, PNTIVECTOR& vPnt1, PNTIVECTOR& vPnt2, bool& bCommonInternalPoints) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 643c6c6..8f9326b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -520,7 +520,8 @@ EXE_EXPORT bool ExeChangeClosedCurveStart( int nId, double dU) ; EXE_EXPORT bool ExeChangeClosedCurveStartPoint( int nId, const Point3d& ptP, int nRefType) ; EXE_EXPORT bool ExeModifyCurveStartPoint( int nId, const Point3d& ptP, int nRefType) ; EXE_EXPORT bool ExeModifyCurveEndPoint( int nId, const Point3d& ptP, int nRefType) ; -EXE_EXPORT bool ExeSpiralizeCurve( int nId, double dDelta) ; +EXE_EXPORT bool ExeSpiralizeCurveAlongExtrusion( int nId, double dDelta) ; +EXE_EXPORT bool ExeSpiralizeCurveAlongGuide( int nCrvId, int nGuideId, double dLinTol) ; EXE_EXPORT bool ExeModifyCurveExtrusion( const INTVECTOR& vIds, const Vector3d& vtExtr, int nRefType) ; EXE_EXPORT bool ExeModifyCurveThickness( const INTVECTOR& vIds, double dThick) ; EXE_EXPORT bool ExeTrimCurveStartAtLen( int nId, double dLen) ;