From 06d5915cd056b916bd9754710570d6d3db9ce21c Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 11 Apr 2018 06:02:03 +0000 Subject: [PATCH] Include : - rinominato POCRVVECTOR in ICURVEPOVECTOR - aggiunte raccolte di puntatori a ICurveComposite. --- EGkCurve.h | 8 ++++---- EGkCurveComposite.h | 8 ++++++++ EGkVolZmap.h | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/EGkCurve.h b/EGkCurve.h index 33ae3de..39a0438 100644 --- a/EGkCurve.h +++ b/EGkCurve.h @@ -105,7 +105,7 @@ inline ICurve* GetCurve( IGeoObj* pGObj) //---------------------------------------------------------------------------- // Raccolte di puntatori a ICurve -typedef std::vector CICURVEPVECTOR ; // vettore di puntatori a const ICurve -typedef std::vector ICURVEPVECTOR ; // vettore di puntatori a ICurve -typedef std::list ICURVEPLIST ; // lista di puntatori a ICurve -typedef std::vector> POCRVVECTOR ; // vettore di puntatori esclusivi a ICurve +typedef std::vector CICURVEPVECTOR ; // vettore di puntatori a const ICurve +typedef std::vector ICURVEPVECTOR ; // vettore di puntatori a ICurve +typedef std::list ICURVEPLIST ; // lista di puntatori a ICurve +typedef std::vector> ICURVEPOVECTOR ; // vettore di puntatori esclusivi a ICurve diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index 30a0e93..829cd26 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -41,6 +41,7 @@ class __declspec( novtable) ICurveComposite : public ICurve virtual bool IsParamAtJoint( double dU) const = 0 ; virtual ICurve* RemoveFirstOrLastCurve( bool bLast = true) = 0 ; virtual bool ChangeStartPoint( double dU) = 0 ; + virtual bool AddPoint( const Point3d& ptStart) = 0 ; virtual bool AddLine( const Point3d& ptNew, bool bEndOrStart = true) = 0 ; virtual bool AddArcTg( const Point3d& ptNew, bool bEndOrStart = true) = 0 ; virtual bool AddArc2P( const Point3d& ptOther, const Point3d& ptNew, bool bEndOrStart = true) = 0 ; @@ -69,3 +70,10 @@ inline ICurveComposite* GetCurveComposite( IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_COMPO) return nullptr ; return (static_cast(pGObj)) ; } + +//---------------------------------------------------------------------------- +// Raccolte di puntatori a ICurveComposite +typedef std::vector CICRVCOMPOVECTOR ; // vettore di puntatori a const ICurveComposite +typedef std::vector ICRVCOMPOPVECTOR ; // vettore di puntatori a ICurveComposite +typedef std::list ICRVCOMPOPLIST ; // lista di puntatori a ICurveComposite +typedef std::vector> ICRVCOMPOPOVECTOR ; // vettore di puntatori esclusivi a ICurveComposite diff --git a/EGkVolZmap.h b/EGkVolZmap.h index e3f0789..a79fac4 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -48,7 +48,7 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual bool MillingStep( const Point3d& ptPs, const Vector3d& vtDs, const Vector3d& vtAs, const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe) = 0 ; virtual bool GetDepth( const Point3d& ptP, const Vector3d& vtDir, double& dInLength, double& dOutLength, bool bExact) const = 0 ; - virtual bool GetPlaneIntersection( const Plane3d& plPlane, POCRVVECTOR& vpLoop) const = 0 ; + virtual bool GetPlaneIntersection( const Plane3d& plPlane, ICURVEPOVECTOR& vpLoop) const = 0 ; virtual bool AvoidBox( const Frame3d& frBox, const Vector3d& vtDiag) const = 0 ; virtual bool AvoidSphere( const Point3d& ptCenter, double dRad) const = 0 ; virtual bool AvoidCylinder( const Frame3d& frCyl, double dL, double dR) const = 0 ;