Include :

- modifiche a interfacce di oggetti Geo.
This commit is contained in:
Dario Sassi
2014-03-26 18:29:20 +00:00
parent caaf692a08
commit 247ada06a3
7 changed files with 7 additions and 55 deletions
+1 -4
View File
@@ -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<IGeoFrame3d*>(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 ;
+1 -4
View File
@@ -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<IGeoPoint3d*>(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 ;
+1 -4
View File
@@ -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<IGeoVector3d*>(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 ;
+1 -7
View File
@@ -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<ICurveArc*>(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 ;
+1 -18
View File
@@ -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<ICurveBezier*>(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 ;
+1 -12
View File
@@ -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<ICurveComposite*>(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 ;
+1 -6
View File
@@ -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<ICurveLine*>(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 ;