diff --git a/EGkBiArcs.h b/EGkBiArcs.h index ad8a3c0..f25d7bb 100644 --- a/EGkBiArcs.h +++ b/EGkBiArcs.h @@ -25,5 +25,4 @@ //----------------------------------------------------------------------------- EGK_EXPORT ICurve* GetBiArc( const Point3d& ptP0, double dDir0Deg, const Point3d& ptP1, double dDir1Deg, double dU) ; -EGK_EXPORT ICurve* GetBiArc( const PolyLine& PL, double dU0, double dDir0Deg, double dU1, double dDir1Deg) ; diff --git a/EGkPolyArc.h b/EGkPolyArc.h index 7bd6ef3..8b91847 100644 --- a/EGkPolyArc.h +++ b/EGkPolyArc.h @@ -53,7 +53,8 @@ class PolyArc EGK_EXPORT bool ToGlob( const Frame3d& frRef) ; EGK_EXPORT bool ToLoc( const Frame3d& frRef) ; EGK_EXPORT bool LocToLoc( const Frame3d& frOri, const Frame3d& frDest) ; - EGK_EXPORT bool Splice( PolyArc& PA) ; + EGK_EXPORT bool Join( PolyArc& PA, double dOffsetPar = 0) ; + EGK_EXPORT bool Split( double dU, PolyArc& PA) ; EGK_EXPORT const Vector3d& GetExtrusion(void) const { return m_vtExtr ; } EGK_EXPORT int GetRejectedNbr( void) const diff --git a/EGkPolyLine.h b/EGkPolyLine.h index 9829d8c..ce31ebd 100644 --- a/EGkPolyLine.h +++ b/EGkPolyLine.h @@ -49,7 +49,8 @@ class PolyLine EGK_EXPORT bool ToGlob( const Frame3d& frRef) ; EGK_EXPORT bool ToLoc( const Frame3d& frRef) ; EGK_EXPORT bool LocToLoc( const Frame3d& frOri, const Frame3d& frDest) ; - EGK_EXPORT bool Splice( PolyLine& PL) ; + EGK_EXPORT bool Join( PolyLine& PL, double dOffsetPar = 0) ; + EGK_EXPORT bool Split( double dU, PolyLine& PL) ; EGK_EXPORT bool IsClosed( void) const ; EGK_EXPORT int GetRejectedNbr( void) const { return m_nRejected ; } diff --git a/EgkCurveBezier.h b/EgkCurveBezier.h index 71fb356..b7438cd 100644 --- a/EgkCurveBezier.h +++ b/EgkCurveBezier.h @@ -28,6 +28,7 @@ class __declspec( novtable) ICurveBezier : public ICurve virtual bool FromArc( const ICurveArc& crArc) = 0 ; virtual int GetDegree( void) const = 0 ; virtual bool IsRational( void) const = 0 ; + virtual bool IsAPoint( void) const = 0 ; virtual const Point3d& GetControlPoint( int nInd, bool* pbOk = NULL) const = 0 ; virtual double GetControlWeight( int nInd, bool* pbOk = NULL) const = 0 ; virtual bool GetControlPolygonLength( double& dLen) const = 0 ; diff --git a/EgtPointerOwner.h b/EgtPointerOwner.h index 497afc9..c5e2197 100644 --- a/EgtPointerOwner.h +++ b/EgtPointerOwner.h @@ -30,7 +30,7 @@ class PtrOwner private : T* m_pT ; - template friend bool IsValid( PtrOwner& RPT) ; + template friend bool IsNull( PtrOwner& RPT) ; template friend T* Get( PtrOwner& RPT) ; template friend T* Release( PtrOwner& RPT) ; } ; @@ -38,9 +38,9 @@ class PtrOwner //---------------------------------------------------------------------------- template bool -IsValid( PtrOwner& RPT) +IsNull( PtrOwner& RPT) { - return ( RPT.m_pT != nullptr) ; + return ( RPT.m_pT == nullptr) ; } //----------------------------------------------------------------------------