From 247ada06a3c19a621af9c7efafbb423c1e759252 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 26 Mar 2014 18:29:20 +0000 Subject: [PATCH] Include : - modifiche a interfacce di oggetti Geo. --- EGkGeoFrame3d.h | 5 +---- EGkGeoPoint3d.h | 5 +---- EGkGeoVector3d.h | 5 +---- EgkCurveArc.h | 8 +------- EgkCurveBezier.h | 19 +------------------ EgkCurveComposite.h | 13 +------------ EgkCurveLine.h | 7 +------ 7 files changed, 7 insertions(+), 55 deletions(-) diff --git a/EGkGeoFrame3d.h b/EGkGeoFrame3d.h index 798a816..0d3476a 100644 --- a/EGkGeoFrame3d.h +++ b/EGkGeoFrame3d.h @@ -21,6 +21,7 @@ class PolyLine ; class __declspec( novtable) IGeoFrame3d : public IGeoObj { public : + virtual bool Copy( const IGeoObj* pGObjSrc) = 0 ; virtual bool Set( const Point3d& ptOrig, const Vector3d& vtDirX, const Vector3d& vtDirY, const Vector3d& vtDirZ) = 0 ; virtual bool Set( const Frame3d& frF) = 0 ; @@ -36,10 +37,6 @@ inline IGeoFrame3d* CloneGeoFrame3d( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != GEO_FRAME3D) return nullptr ; return (static_cast(pGObj->Clone())) ; } -inline bool CopyGeoFrame3d( const IGeoFrame3d* pGFSou, IGeoFrame3d* pGFDest) - { if ( pGFSou == nullptr || pGFDest == nullptr) - return false ; - return pGFDest->Set( pGFSou->GetFrame()) ; } inline const IGeoFrame3d* GetGeoFrame3d( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != GEO_FRAME3D) return nullptr ; diff --git a/EGkGeoPoint3d.h b/EGkGeoPoint3d.h index e2dac81..708b799 100644 --- a/EGkGeoPoint3d.h +++ b/EGkGeoPoint3d.h @@ -19,6 +19,7 @@ class __declspec( novtable) IGeoPoint3d : public IGeoObj { public : + virtual bool Copy( const IGeoObj* pGObjSrc) = 0 ; virtual bool Set( const Point3d& ptP) = 0 ; virtual const Point3d& GetPoint( void) const = 0 ; } ; @@ -30,10 +31,6 @@ inline IGeoPoint3d* CloneGeoPoint3d( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != GEO_PNT3D) return nullptr ; return (static_cast(pGObj->Clone())) ; } -inline bool CopyGeoPoint3d( const IGeoPoint3d* pGPSou, IGeoPoint3d* pGPDest) - { if ( pGPSou == nullptr || pGPDest == nullptr) - return false ; - return pGPDest->Set( pGPSou->GetPoint()) ; } inline const IGeoPoint3d* GetGeoPoint3d( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != GEO_PNT3D) return nullptr ; diff --git a/EGkGeoVector3d.h b/EGkGeoVector3d.h index c392183..2754b45 100644 --- a/EGkGeoVector3d.h +++ b/EGkGeoVector3d.h @@ -21,6 +21,7 @@ class PolyLine ; class __declspec( novtable) IGeoVector3d : public IGeoObj { public : + virtual bool Copy( const IGeoObj* pGObjSrc) = 0 ; virtual bool Set( const Vector3d& vtV) = 0 ; virtual const Vector3d& GetVector( void) const = 0 ; virtual bool GetDrawWithArrowHead( double dFrazLenAH, PolyLine& PL) const = 0 ; @@ -33,10 +34,6 @@ inline IGeoVector3d* CloneGeoVector3d( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != GEO_VECT3D) return nullptr ; return (static_cast(pGObj->Clone())) ; } -inline bool CopyGeoVector3d( const IGeoVector3d* pGVSou, IGeoVector3d* pGVDest) - { if ( pGVSou == nullptr || pGVDest == nullptr) - return false ; - return pGVDest->Set( pGVSou->GetVector()) ; } inline const IGeoVector3d* GetGeoVector3d( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != GEO_VECT3D) return nullptr ; diff --git a/EgkCurveArc.h b/EgkCurveArc.h index b4eac50..ed39246 100644 --- a/EgkCurveArc.h +++ b/EgkCurveArc.h @@ -19,6 +19,7 @@ class __declspec( novtable) ICurveArc : public ICurve { public : + 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& ptCen, double dRad, double dAngIniDeg, double dAngCenDeg, double dDeltaZ) = 0 ; @@ -41,13 +42,6 @@ inline ICurveArc* CloneCurveArc( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_ARC) return nullptr ; return (static_cast(pGObj->Clone())) ; } -inline bool CopyCurveArc( const ICurveArc* pCASou, ICurveArc* pCADest) - { if ( pCASou == nullptr || pCADest == nullptr || ! pCASou->IsValid()) - return false ; - if ( pCASou == pCADest) - return true ; - return pCADest->Set( pCASou->GetCenter(), pCASou->GetNormVersor(), pCASou->GetRadius(), - pCASou->GetStartVersor(), pCASou->GetAngCenter(), pCASou->GetDeltaN()) ; } inline const ICurveArc* GetCurveArc( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_ARC) return nullptr ; diff --git a/EgkCurveBezier.h b/EgkCurveBezier.h index 6a5e7f1..5e2a3ae 100644 --- a/EgkCurveBezier.h +++ b/EgkCurveBezier.h @@ -21,6 +21,7 @@ class ICurveArc ; class __declspec( novtable) ICurveBezier : public ICurve { public : + virtual bool Copy( const IGeoObj* pGObjSrc) = 0 ; virtual bool Init( int nDeg, bool bIsRational) = 0 ; virtual bool SetControlPoint( int nInd, const Point3d& ptCtrl) = 0 ; virtual bool SetControlPoint( int nInd, const Point3d& ptCtrl, double dW) = 0 ; @@ -40,24 +41,6 @@ inline ICurveBezier* CloneCurveBezier( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_BEZ) return nullptr ; return (static_cast(pGObj->Clone())) ; } -inline bool CopyCurveBezier( const ICurveBezier* pCBSou, ICurveBezier* pCBDest) - { if ( pCBSou == nullptr || pCBDest == nullptr || ! pCBSou->IsValid()) - return false ; - if ( pCBSou == pCBDest) - return true ; - int nDeg = pCBSou->GetDegree() ; - bool bRat = pCBSou->IsRational() ; - if ( ! pCBDest->Init( nDeg, bRat)) - return false ; - if ( bRat) { - for ( int i = 0 ; i <= nDeg ; ++ i) - pCBDest->SetControlPoint( i, pCBSou->GetControlPoint( i), pCBSou->GetControlWeight( i)) ; - } - else { - for ( int i = 0 ; i <= nDeg ; ++ i) - pCBDest->SetControlPoint( i, pCBSou->GetControlPoint( i)) ; - } - return true ; } inline const ICurveBezier* GetCurveBezier( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_BEZ) return nullptr ; diff --git a/EgkCurveComposite.h b/EgkCurveComposite.h index 1f59564..dd6ec62 100644 --- a/EgkCurveComposite.h +++ b/EgkCurveComposite.h @@ -19,6 +19,7 @@ class __declspec( novtable) ICurveComposite : public ICurve { public : + virtual bool Copy( const IGeoObj* pGObjSrc) = 0 ; virtual bool Clear( void) = 0 ; virtual bool AddCurve( const ICurve& cCrv) = 0 ; virtual bool FromSplit( const ICurve& cCrv, int nParts) = 0 ; @@ -36,18 +37,6 @@ inline ICurveComposite* CloneCurveComposite( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_COMPO) return nullptr ; return (static_cast(pGObj->Clone())) ; } -inline bool CopyCurveComposite( const ICurveComposite* pCCSou, ICurveComposite* pCCDest) - { if ( pCCSou == nullptr || pCCDest == nullptr || ! pCCSou->IsValid()) - return false ; - if ( pCCSou == pCCDest) - return true ; - pCCDest->Clear() ; - const ICurve* pCrv = pCCSou->GetFirstCurve() ; - while ( pCrv != nullptr) { - pCCDest->AddCurve( *pCrv) ; - pCrv = pCCSou->GetNextCurve() ; - } - return true ; } inline const ICurveComposite* GetCurveComposite( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_COMPO) return nullptr ; diff --git a/EgkCurveLine.h b/EgkCurveLine.h index f90b2ac..7c10223 100644 --- a/EgkCurveLine.h +++ b/EgkCurveLine.h @@ -19,6 +19,7 @@ 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 const Point3d& GetStart( void) const = 0 ; virtual const Point3d& GetEnd( void) const = 0 ; @@ -31,12 +32,6 @@ inline ICurveLine* CloneCurveLine( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_LINE) return nullptr ; return (static_cast(pGObj->Clone())) ; } -inline bool CopyCurveLine( const ICurveLine* pCLSou, ICurveLine* pCLDest) - { if ( pCLSou == nullptr || pCLDest == nullptr || ! pCLSou->IsValid()) - return false ; - if ( pCLSou == pCLDest) - return true ; - return pCLDest->Set( pCLSou->GetStart(), pCLSou->GetEnd()) ; } inline const ICurveLine* GetCurveLine( const IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_LINE) return nullptr ;