From b2f7fa94f7cff6fddb67ca2fe2159f1b2a344868 Mon Sep 17 00:00:00 2001 From: DarioS Date: Mon, 24 Jan 2022 08:19:39 +0100 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkCurveComposite.h | 7 +++++-- EXeExecutor.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index ccc3c49..ecd1d2b 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -1,13 +1,14 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2021 +// EgalTech 2013-2022 //---------------------------------------------------------------------------- -// File : EgkCurveComposite.h Data : 03.04.21 Versione : 2.3g2 +// File : EgkCurveComposite.h Data : 23.01.22 Versione : 2.4a4 // Contenuto : Dichiarazione della interfaccia ICurveComposite. // // // // Modifiche : 22.11.13 DS Creazione modulo. // 21.07.21 LM Aggiunto parametro opzionale a Set/GetCurveTempProp. +// 23.01.22 DS Aggiunti metodi IsARectangle e IsATrapezoid. // //---------------------------------------------------------------------------- @@ -58,6 +59,8 @@ class __declspec( novtable) ICurveComposite : public ICurve virtual bool IsAPoint( void) const = 0 ; virtual bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const = 0 ; virtual bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const = 0 ; + virtual bool IsARectangle( double dLinTol, Point3d& ptP, Vector3d& vtL1, Vector3d& vtL2) const = 0 ; + virtual bool IsATrapezoid( double dLinTol, Point3d& ptP, Vector3d& vtB1, Vector3d& vtL1, Vector3d& vtB2) const = 0 ; virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropInd = 0) = 0 ; virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropInd = 0) const = 0 ; } ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 5613a15..35fb550 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -605,6 +605,8 @@ EXE_EXPORT bool ExeCurveLengthAtPoint( int nId, const Point3d& ptOn, double dExt EXE_EXPORT bool ExeCurveIsClosed( int nId) ; EXE_EXPORT bool ExeCurveIsFlat( int nId, Plane3d& Plane, bool bUseExtrusion = true, double dToler = EPS_SMALL) ; EXE_EXPORT bool ExeCurveIsACircle( int nId, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW, double dToler = EPS_SMALL) ; +EXE_EXPORT bool ExeCurveIsARectangle( int nId, Point3d& ptP, Vector3d& vtL1, Vector3d& vtL2, double dToler = EPS_SMALL) ; +EXE_EXPORT bool ExeCurveIsATrapezoid( int nId, Point3d& ptP, Vector3d& vtB1, Vector3d& vtL1, Vector3d& vtB2, double dToler = EPS_SMALL) ; EXE_EXPORT bool ExeCurveAreaXY( int nId, double& dArea) ; EXE_EXPORT bool ExeCurveArea( int nId, Plane3d& Plane, double& dArea) ; EXE_EXPORT bool ExeCurveNearestExtremityToPoint( int nId, const Point3d& ptP, bool& bStart) ;