1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00

0028966: Coding Rules - remove Adaptor2d_HCurve2d, Adaptor3d_HCurve and Adaptor3d_HSurface classes

Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface now inherit Standard_Transient.
Interfaces Adaptor2d_HCurve2d, Adaptor3d_HCurve, Adaptor3d_HSurface and their subclasses
are now aliases to Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface.
Removed numerous unsafe reinterpret casts.

Generic classes Adaptor3d_GenHCurve, Adaptor3d_GenHSurface, Adaptor2d_GenHCurve2d have been removed.
Several redundant .lxx files have been merged into .hxx.

Removed obsolete adaptor classes with H suffix.
This commit is contained in:
kgv
2020-12-03 17:36:19 +03:00
committed by bugmaster
parent 266877a7c3
commit c22b52d60e
710 changed files with 6144 additions and 14175 deletions

View File

@@ -2,8 +2,3 @@ Geom2dAdaptor.cxx
Geom2dAdaptor.hxx
Geom2dAdaptor_Curve.cxx
Geom2dAdaptor_Curve.hxx
Geom2dAdaptor_Curve.lxx
Geom2dAdaptor_GHCurve.hxx
Geom2dAdaptor_GHCurve_0.cxx
Geom2dAdaptor_HCurve.cxx
Geom2dAdaptor_HCurve.hxx

View File

@@ -23,10 +23,6 @@
class Geom2d_Curve;
class Adaptor2d_Curve2d;
class Geom2dAdaptor_Curve;
class Geom2dAdaptor_GHCurve;
class Geom2dAdaptor_HCurve;
//! this package contains the geometric definition of
//! 2d curves compatible with the Adaptor package
@@ -44,30 +40,6 @@ public:
//! cannot process the OtherCurves.
Standard_EXPORT static Handle(Geom2d_Curve) MakeCurve (const Adaptor2d_Curve2d& HC);
protected:
private:
friend class Geom2dAdaptor_Curve;
friend class Geom2dAdaptor_GHCurve;
friend class Geom2dAdaptor_HCurve;
};
#endif // _Geom2dAdaptor_HeaderFile

View File

@@ -21,8 +21,9 @@
#define No_Standard_RangeError
#define No_Standard_OutOfRange
#include <Geom2dAdaptor_Curve.hxx>
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <BSplCLib.hxx>
#include <BSplCLib_Cache.hxx>
#include <Geom2d_BezierCurve.hxx>
@@ -37,8 +38,6 @@
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2d_UndefinedDerivative.hxx>
#include <Geom2d_UndefinedValue.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dEvaluator_OffsetCurve.hxx>
#include <GeomAbs_Shape.hxx>
#include <gp.hxx>
@@ -64,6 +63,7 @@
//#include <Geom2dConvert_BSplineCurveKnotSplitting.hxx>
static const Standard_Real PosTol = Precision::PConfusion() / 2;
IMPLEMENT_STANDARD_RTTIEXT(Geom2dAdaptor_Curve, Adaptor2d_Curve2d)
//=======================================================================
//function : LocalContinuity
@@ -233,7 +233,7 @@ void Geom2dAdaptor_Curve::load(const Handle(Geom2d_Curve)& C,
Handle(Geom2d_OffsetCurve) anOffsetCurve = Handle(Geom2d_OffsetCurve)::DownCast(myCurve);
// Create nested adaptor for base curve
Handle(Geom2d_Curve) aBaseCurve = anOffsetCurve->BasisCurve();
Handle(Geom2dAdaptor_HCurve) aBaseAdaptor = new Geom2dAdaptor_HCurve(aBaseCurve);
Handle(Geom2dAdaptor_Curve) aBaseAdaptor = new Geom2dAdaptor_Curve(aBaseCurve);
myNestedEvaluator = new Geom2dEvaluator_OffsetCurve(aBaseAdaptor, anOffsetCurve->Offset());
}
else {
@@ -508,13 +508,13 @@ void Geom2dAdaptor_Curve::Intervals(TColStd_Array1OfReal& T,
//purpose :
//=======================================================================
Handle(Adaptor2d_HCurve2d) Geom2dAdaptor_Curve::Trim
Handle(Adaptor2d_Curve2d) Geom2dAdaptor_Curve::Trim
(const Standard_Real First,
const Standard_Real Last,
// const Standard_Real Tol) const
const Standard_Real ) const
{
Handle(Geom2dAdaptor_HCurve) HE = new Geom2dAdaptor_HCurve(myCurve,First,Last);
Handle(Geom2dAdaptor_Curve) HE = new Geom2dAdaptor_Curve(myCurve,First,Last);
return HE;
}

View File

@@ -17,27 +17,19 @@
#ifndef _Geom2dAdaptor_Curve_HeaderFile
#define _Geom2dAdaptor_Curve_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <GeomAbs_CurveType.hxx>
#include <Standard_Real.hxx>
#include <BSplCLib_Cache.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <GeomAbs_Shape.hxx>
#include <Standard_Integer.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <Standard_Boolean.hxx>
#include <BSplCLib_Cache.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom2dEvaluator_Curve.hxx>
#include <GeomAbs_CurveType.hxx>
#include <GeomAbs_Shape.hxx>
#include <gp_Pnt2d.hxx>
#include <Standard_NoSuchObject.hxx>
#include <Standard_NullObject.hxx>
#include <TColStd_Array1OfReal.hxx>
class Geom2d_Curve;
class Adaptor2d_HCurve2d;
class Standard_NoSuchObject;
class Standard_ConstructionError;
class Standard_OutOfRange;
class Standard_DomainError;
class gp_Pnt2d;
class gp_Vec2d;
class gp_Lin2d;
class gp_Circ2d;
@@ -47,7 +39,6 @@ class gp_Parab2d;
class Geom2d_BezierCurve;
class Geom2d_BSplineCurve;
//! An interface between the services provided by any
//! curve from the package Geom2d and those required
//! of the curve by algorithms which use it.
@@ -57,32 +48,39 @@ class Geom2d_BSplineCurve;
//! thread-safe and parallel evaluations need to be prevented.
class Geom2dAdaptor_Curve : public Adaptor2d_Curve2d
{
DEFINE_STANDARD_RTTIEXT(Geom2dAdaptor_Curve, Adaptor2d_Curve2d)
public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT Geom2dAdaptor_Curve();
Standard_EXPORT Geom2dAdaptor_Curve(const Handle(Geom2d_Curve)& C);
//! ConstructionError is raised if Ufirst>Ulast
//! Standard_ConstructionError is raised if Ufirst>Ulast
Standard_EXPORT Geom2dAdaptor_Curve(const Handle(Geom2d_Curve)& C, const Standard_Real UFirst, const Standard_Real ULast);
//! Reset currently loaded curve (undone Load()).
Standard_EXPORT void Reset();
void Load (const Handle(Geom2d_Curve)& C);
//! ConstructionError is raised if Ufirst>Ulast
void Load (const Handle(Geom2d_Curve)& C, const Standard_Real UFirst, const Standard_Real ULast);
const Handle(Geom2d_Curve)& Curve() const;
Standard_Real FirstParameter() const Standard_OVERRIDE;
Standard_Real LastParameter() const Standard_OVERRIDE;
void Load (const Handle(Geom2d_Curve)& theCurve)
{
if (theCurve.IsNull()) { throw Standard_NullObject(); }
load (theCurve, theCurve->FirstParameter(), theCurve->LastParameter());
}
//! Standard_ConstructionError is raised if theUFirst>theULast
void Load (const Handle(Geom2d_Curve)& theCurve, const Standard_Real theUFirst, const Standard_Real theULast)
{
if (theCurve.IsNull()) { throw Standard_NullObject(); }
if (theUFirst > theULast) { throw Standard_ConstructionError(); }
load (theCurve, theUFirst, theULast);
}
const Handle(Geom2d_Curve)& Curve() const { return myCurve; }
virtual Standard_Real FirstParameter() const Standard_OVERRIDE { return myFirst; }
virtual Standard_Real LastParameter() const Standard_OVERRIDE { return myLast; }
Standard_EXPORT GeomAbs_Shape Continuity() const Standard_OVERRIDE;
//! If necessary, breaks the curve in intervals of
@@ -101,7 +99,7 @@ public:
//! parameters <First> and <Last>. <Tol> is used to
//! test for 3d points confusion.
//! If <First> >= <Last>
Standard_EXPORT Handle(Adaptor2d_HCurve2d) Trim (const Standard_Real First, const Standard_Real Last, const Standard_Real Tol) const Standard_OVERRIDE;
Standard_EXPORT Handle(Adaptor2d_Curve2d) Trim (const Standard_Real First, const Standard_Real Last, const Standard_Real Tol) const Standard_OVERRIDE;
Standard_EXPORT Standard_Boolean IsClosed() const Standard_OVERRIDE;
@@ -145,9 +143,9 @@ public:
//! returns the parametric resolution
Standard_EXPORT Standard_Real Resolution (const Standard_Real Ruv) const Standard_OVERRIDE;
GeomAbs_CurveType GetType() const Standard_OVERRIDE;
virtual GeomAbs_CurveType GetType() const Standard_OVERRIDE { return myTypeCurve; }
Standard_EXPORT gp_Lin2d Line() const Standard_OVERRIDE;
Standard_EXPORT gp_Circ2d Circle() const Standard_OVERRIDE;
@@ -172,15 +170,6 @@ public:
Standard_EXPORT Handle(Geom2d_BSplineCurve) BSpline() const Standard_OVERRIDE;
protected:
private:
Standard_EXPORT GeomAbs_Shape LocalContinuity (const Standard_Real U1, const Standard_Real U2) const;
@@ -194,6 +183,7 @@ private:
//! \param theParameter the value on the knot axis which identifies the caching span
void RebuildCache (const Standard_Real theParameter) const;
private:
Handle(Geom2d_Curve) myCurve;
GeomAbs_CurveType myTypeCurve;
@@ -204,14 +194,8 @@ private:
mutable Handle(BSplCLib_Cache) myCurveCache; ///< Cached data for B-spline or Bezier curve
Handle(Geom2dEvaluator_Curve) myNestedEvaluator; ///< Calculates value of offset curve
};
#include <Geom2dAdaptor_Curve.lxx>
DEFINE_STANDARD_HANDLE(Geom2dAdaptor_Curve, Adaptor2d_Curve2d)
#endif // _Geom2dAdaptor_Curve_HeaderFile

View File

@@ -1,88 +0,0 @@
// Created on: 1993-06-04
// Created by: Bruno DUMORTIER
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <gp_Pnt2d.hxx>
#include <Geom2d_Curve.hxx>
#include <Standard_NoSuchObject.hxx>
#include <Standard_NullObject.hxx>
//=======================================================================
//function : FirstParameter
//purpose :
//=======================================================================
inline Standard_Real Geom2dAdaptor_Curve::FirstParameter() const
{
return myFirst;
}
//=======================================================================
//function : LastParameter
//purpose :
//=======================================================================
inline Standard_Real Geom2dAdaptor_Curve::LastParameter() const
{
return myLast;
}
//=======================================================================
//function : Curve
//purpose :
//=======================================================================
inline const Handle(Geom2d_Curve)& Geom2dAdaptor_Curve::Curve() const
{
return myCurve;
}
//=======================================================================
//function : GetType
//purpose :
//=======================================================================
inline GeomAbs_CurveType Geom2dAdaptor_Curve::GetType() const
{
return myTypeCurve;
}
//=======================================================================
//function : Load
//purpose :
//=======================================================================
inline void Geom2dAdaptor_Curve::Load(const Handle(Geom2d_Curve)& C)
{
if ( C.IsNull()) throw Standard_NullObject();
load(C,C->FirstParameter(),C->LastParameter());
}
//=======================================================================
//function : Load
//purpose :
//=======================================================================
inline void Geom2dAdaptor_Curve::Load(const Handle(Geom2d_Curve)& C,
const Standard_Real UFirst,
const Standard_Real ULast)
{
if ( C.IsNull()) throw Standard_NullObject();
if ( UFirst > ULast) throw Standard_ConstructionError();
load(C,UFirst,ULast);
}

View File

@@ -1,93 +0,0 @@
// Created on: 1993-06-03
// Created by: Bruno DUMORTIER
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _Geom2dAdaptor_GHCurve_HeaderFile
#define _Geom2dAdaptor_GHCurve_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Adaptor2d_HCurve2d.hxx>
class Standard_OutOfRange;
class Standard_NoSuchObject;
class Standard_DomainError;
class Geom2dAdaptor_Curve;
class Adaptor2d_Curve2d;
class Geom2dAdaptor_GHCurve;
DEFINE_STANDARD_HANDLE(Geom2dAdaptor_GHCurve, Adaptor2d_HCurve2d)
class Geom2dAdaptor_GHCurve : public Adaptor2d_HCurve2d
{
public:
//! Creates an empty GenHCurve2d.
Standard_EXPORT Geom2dAdaptor_GHCurve();
//! Creates a GenHCurve2d from a Curve
Standard_EXPORT Geom2dAdaptor_GHCurve(const Geom2dAdaptor_Curve& C);
//! Sets the field of the GenHCurve2d.
Standard_EXPORT void Set (const Geom2dAdaptor_Curve& C);
//! Returns the curve used to create the GenHCurve2d.
//! This is redefined from HCurve2d, cannot be inline.
Standard_EXPORT const Adaptor2d_Curve2d& Curve2d() const Standard_OVERRIDE;
//! Returns the curve used to create the GenHCurve.
Geom2dAdaptor_Curve& ChangeCurve2d();
DEFINE_STANDARD_RTTI_INLINE(Geom2dAdaptor_GHCurve,Adaptor2d_HCurve2d)
protected:
Geom2dAdaptor_Curve myCurve;
private:
};
#define TheCurve Geom2dAdaptor_Curve
#define TheCurve_hxx <Geom2dAdaptor_Curve.hxx>
#define Adaptor2d_GenHCurve2d Geom2dAdaptor_GHCurve
#define Adaptor2d_GenHCurve2d_hxx <Geom2dAdaptor_GHCurve.hxx>
#define Handle_Adaptor2d_GenHCurve2d Handle(Geom2dAdaptor_GHCurve)
#include <Adaptor2d_GenHCurve2d.lxx>
#undef TheCurve
#undef TheCurve_hxx
#undef Adaptor2d_GenHCurve2d
#undef Adaptor2d_GenHCurve2d_hxx
#undef Handle_Adaptor2d_GenHCurve2d
#endif // _Geom2dAdaptor_GHCurve_HeaderFile

View File

@@ -1,42 +0,0 @@
// Created on: 1993-06-03
// Created by: Bruno DUMORTIER
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Geom2dAdaptor_GHCurve.hxx>
#include <Standard_Type.hxx>
#include <Standard_OutOfRange.hxx>
#include <Standard_NoSuchObject.hxx>
#include <Standard_DomainError.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Adaptor2d_Curve2d.hxx>
#define TheCurve Geom2dAdaptor_Curve
#define TheCurve_hxx <Geom2dAdaptor_Curve.hxx>
#define Adaptor2d_GenHCurve2d Geom2dAdaptor_GHCurve
#define Adaptor2d_GenHCurve2d_hxx <Geom2dAdaptor_GHCurve.hxx>
#define Handle_Adaptor2d_GenHCurve2d Handle(Geom2dAdaptor_GHCurve)
#include <Adaptor2d_GenHCurve2d.gxx>

View File

@@ -1,65 +0,0 @@
// Created on: 1995-08-25
// Created by: Remi LEQUETTE
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Geom2d_Curve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Standard_ConstructionError.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Geom2dAdaptor_HCurve,Geom2dAdaptor_GHCurve)
//=======================================================================
//function : Geom2dAdaptor_HCurve
//purpose :
//=======================================================================
Geom2dAdaptor_HCurve::Geom2dAdaptor_HCurve()
{
}
//=======================================================================
//function : Geom2dAdaptor_HCurve
//purpose :
//=======================================================================
Geom2dAdaptor_HCurve::Geom2dAdaptor_HCurve(const Geom2dAdaptor_Curve& AS) :
Geom2dAdaptor_GHCurve(AS)
{
}
//=======================================================================
//function : Geom2dAdaptor_HCurve
//purpose :
//=======================================================================
Geom2dAdaptor_HCurve::Geom2dAdaptor_HCurve(const Handle(Geom2d_Curve)& S)
{
ChangeCurve2d().Load(S);
}
//=======================================================================
//function : Geom2dAdaptor_HCurve
//purpose :
//=======================================================================
Geom2dAdaptor_HCurve::Geom2dAdaptor_HCurve(const Handle(Geom2d_Curve)& S,
const Standard_Real UFirst,
const Standard_Real ULast)
{
ChangeCurve2d().Load(S,UFirst,ULast);
}

View File

@@ -1,74 +0,0 @@
// Created on: 1995-08-25
// Created by: Remi LEQUETTE
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _Geom2dAdaptor_HCurve_HeaderFile
#define _Geom2dAdaptor_HCurve_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Geom2dAdaptor_GHCurve.hxx>
#include <Standard_Real.hxx>
class Standard_ConstructionError;
class Geom2dAdaptor_Curve;
class Geom2d_Curve;
class Geom2dAdaptor_HCurve;
DEFINE_STANDARD_HANDLE(Geom2dAdaptor_HCurve, Geom2dAdaptor_GHCurve)
//! Provides an interface between the services provided by any
//! curve from the package Geom2d and those required
//! of the curve by algorithms, which use it.
class Geom2dAdaptor_HCurve : public Geom2dAdaptor_GHCurve
{
public:
Standard_EXPORT Geom2dAdaptor_HCurve();
Standard_EXPORT Geom2dAdaptor_HCurve(const Geom2dAdaptor_Curve& AS);
Standard_EXPORT Geom2dAdaptor_HCurve(const Handle(Geom2d_Curve)& S);
//! ConstructionError is raised if UFirst>ULast or VFirst>VLast
Standard_EXPORT Geom2dAdaptor_HCurve(const Handle(Geom2d_Curve)& S, const Standard_Real UFirst, const Standard_Real ULast);
DEFINE_STANDARD_RTTIEXT(Geom2dAdaptor_HCurve,Geom2dAdaptor_GHCurve)
protected:
private:
};
#endif // _Geom2dAdaptor_HCurve_HeaderFile