From 7118ebb1969ac03afb13978dd1381dcd3a95be69 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 14 May 2014 07:11:50 +0000 Subject: [PATCH] Include : - modifiche a interfacce di GeomKernel. --- EgkCurveArc.h | 15 ++++++++++++--- EgkCurveLine.h | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/EgkCurveArc.h b/EgkCurveArc.h index 6a1033c..4ffc9da 100644 --- a/EgkCurveArc.h +++ b/EgkCurveArc.h @@ -22,10 +22,14 @@ class __declspec( novtable) ICurveArc : public ICurve virtual bool Copy( const IGeoObj* pGObjSrc) = 0 ; virtual bool Set( const Point3d& ptCen, const Vector3d& vtN, double dRad, const Vector3d& vtS, double dAngCenDeg, double dDeltaN) = 0 ; - virtual bool Set( const Point3d& ptIni, const Point3d& ptFin, const Vector3d& vtN, double dBulge) = 0 ; - virtual bool Set( const Point3d& ptCen, double dRad, double dAngIniDeg, double dAngCenDeg, double dDeltaZ) = 0 ; virtual bool Set( const Point3d& ptCen, const Vector3d& vtN, double dRad) = 0 ; - virtual bool Set( const Point3d& ptCen, double dRad) = 0 ; + virtual bool SetXY( const Point3d& ptCen, double dRad, double dAngIniDeg, double dAngCenDeg, double dDeltaZ) = 0 ; + virtual bool SetXY( const Point3d& ptCen, double dRad) = 0 ; + virtual bool Set3P( const Point3d& ptStart, const Point3d& ptOther, const Point3d& ptEnd, bool bCirc = false) = 0 ; + virtual bool Set2PNB( const Point3d& ptIni, const Point3d& ptFin, const Vector3d& vtN, double dBulge) = 0 ; + virtual bool Set2PD( const Point3d& ptStart, const Point3d& ptEnd, double dDirStartDeg) = 0 ; + virtual bool Set2PRS( const Point3d& ptStart, const Point3d& ptEnd, double dRad, bool bCCW = true) = 0 ; + virtual bool SetC2P( const Point3d& ptCen, const Point3d& ptStart, const Point3d& ptNearEnd) = 0 ; virtual bool IsFlat( void) const = 0 ; virtual bool IsACircle( void) const = 0 ; virtual bool IsInPlaneXY( void) const = 0 ; @@ -35,6 +39,11 @@ class __declspec( novtable) ICurveArc : public ICurve virtual double GetRadius( void) const = 0 ; virtual double GetAngCenter( void) const = 0 ; virtual double GetDeltaN( void) const = 0 ; + virtual bool InvertN( void) = 0 ; + virtual bool ChangeRadius( double dNewRadius) = 0 ; + virtual bool ChangeDeltaN( double dNewDeltaN) = 0 ; + virtual bool ToAdditional( void) = 0 ; + virtual bool Flip( void) = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EgkCurveLine.h b/EgkCurveLine.h index cec25a7..73d0155 100644 --- a/EgkCurveLine.h +++ b/EgkCurveLine.h @@ -21,8 +21,8 @@ class __declspec( novtable) ICurveLine : public ICurve public : virtual bool Copy( const IGeoObj* pGObjSrc) = 0 ; virtual bool Set( const Point3d& ptStart, const Point3d& ptEnd) = 0 ; - virtual bool Set( const Point3d& ptStart, const Vector3d& vtDir, double dLen) = 0 ; - virtual bool Set( const Point3d& ptStart, double dDirAngDeg, double dLen) = 0 ; + virtual bool SetPVL( const Point3d& ptStart, const Vector3d& vtDir, double dLen) = 0 ; + virtual bool SetPDL( const Point3d& ptStart, double dDirAngDeg, double dLen) = 0 ; virtual const Point3d& GetStart( void) const = 0 ; virtual const Point3d& GetEnd( void) const = 0 ; } ;