OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/LProp3d/LProp3d_CLProps.hxx
View File

@@ -16,18 +16,12 @@
#ifndef _LProp3d_CLProps_HeaderFile
#define _LProp3d_CLProps_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
#include <Adaptor3d_Curve.hxx>
#include <gp_Pnt.hxx>
#include <gp_Vec.hxx>
#include <gp_Dir.hxx>
#include <LProp_Status.hxx>
#include <Standard_Boolean.hxx>
class Adaptor3d_HCurve;
class LProp_BadContinuity;
class Standard_DomainError;
class Standard_OutOfRange;
@@ -55,12 +49,12 @@ public:
//! only the tangent, N should be equal to 1.
//! <Resolution> is the linear tolerance (it is used to test
//! if a vector is null).
Standard_EXPORT LProp3d_CLProps(const Handle(Adaptor3d_HCurve)& C, const Standard_Integer N, const Standard_Real Resolution);
Standard_EXPORT LProp3d_CLProps(const Handle(Adaptor3d_Curve)& C, const Standard_Integer N, const Standard_Real Resolution);
//! Same as previous constructor but here the parameter is
//! set to the value <U>.
//! All the computations done will be related to <C> and <U>.
Standard_EXPORT LProp3d_CLProps(const Handle(Adaptor3d_HCurve)& C, const Standard_Real U, const Standard_Integer N, const Standard_Real Resolution);
Standard_EXPORT LProp3d_CLProps(const Handle(Adaptor3d_Curve)& C, const Standard_Real U, const Standard_Integer N, const Standard_Real Resolution);
//! Same as previous constructor but here the parameter is
//! set to the value <U> and the curve is set
@@ -76,7 +70,7 @@ public:
//! Initializes the local properties of the curve
//! for the new curve.
Standard_EXPORT void SetCurve (const Handle(Adaptor3d_HCurve)& C);
Standard_EXPORT void SetCurve (const Handle(Adaptor3d_Curve)& C);
//! Returns the Point.
Standard_EXPORT const gp_Pnt& Value() const;
@@ -123,7 +117,7 @@ private:
Handle(Adaptor3d_HCurve) myCurve;
Handle(Adaptor3d_Curve) myCurve;
Standard_Real myU;
Standard_Integer myDerOrder;
Standard_Real myCN;

6
src/LProp3d/LProp3d_CLProps_0.cxx
View File

@@ -15,7 +15,7 @@
#include <LProp3d_CLProps.hxx>
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_Curve.hxx>
#include <LProp_BadContinuity.hxx>
#include <Standard_DomainError.hxx>
#include <Standard_OutOfRange.hxx>
@@ -26,8 +26,8 @@
#include <LProp3d_CurveTool.hxx>
#define Curve Handle(Adaptor3d_HCurve)
#define Curve_hxx <Adaptor3d_HCurve.hxx>
#define Curve Handle(Adaptor3d_Curve)
#define Curve_hxx <Adaptor3d_Curve.hxx>
#define Vec gp_Vec
#define Vec_hxx <gp_Vec.hxx>
#define Pnt gp_Pnt

16
src/LProp3d/LProp3d_CurveTool.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_Curve.hxx>
#include <gp_Pnt.hxx>
#include <gp_Vec.hxx>
#include <LProp3d_CurveTool.hxx>
@@ -24,7 +24,7 @@
//function : Value
//purpose :
//=======================================================================
void LProp3d_CurveTool::Value(const Handle(Adaptor3d_HCurve)& C,
void LProp3d_CurveTool::Value(const Handle(Adaptor3d_Curve)& C,
const Standard_Real U,
gp_Pnt& P)
{
@@ -37,7 +37,7 @@ void LProp3d_CurveTool::Value(const Handle(Adaptor3d_HCurve)& C,
//purpose :
//=======================================================================
void LProp3d_CurveTool::D1(const Handle(Adaptor3d_HCurve)& C,
void LProp3d_CurveTool::D1(const Handle(Adaptor3d_Curve)& C,
const Standard_Real U,
gp_Pnt& P,
gp_Vec& V1)
@@ -51,7 +51,7 @@ void LProp3d_CurveTool::D1(const Handle(Adaptor3d_HCurve)& C,
//purpose :
//=======================================================================
void LProp3d_CurveTool::D2(const Handle(Adaptor3d_HCurve)& C,
void LProp3d_CurveTool::D2(const Handle(Adaptor3d_Curve)& C,
const Standard_Real U,
gp_Pnt& P,
gp_Vec& V1,
@@ -66,7 +66,7 @@ void LProp3d_CurveTool::D2(const Handle(Adaptor3d_HCurve)& C,
//purpose :
//=======================================================================
void LProp3d_CurveTool::D3(const Handle(Adaptor3d_HCurve)& C,
void LProp3d_CurveTool::D3(const Handle(Adaptor3d_Curve)& C,
const Standard_Real U,
gp_Pnt& P,
gp_Vec& V1,
@@ -83,7 +83,7 @@ void LProp3d_CurveTool::D3(const Handle(Adaptor3d_HCurve)& C,
//=======================================================================
Standard_Integer LProp3d_CurveTool::Continuity
(const Handle(Adaptor3d_HCurve)& C)
(const Handle(Adaptor3d_Curve)& C)
{
GeomAbs_Shape s = C->Continuity();
switch (s) {
@@ -112,7 +112,7 @@ Standard_Integer LProp3d_CurveTool::Continuity
//=======================================================================
Standard_Real LProp3d_CurveTool::FirstParameter
(const Handle(Adaptor3d_HCurve)& C)
(const Handle(Adaptor3d_Curve)& C)
{
return C->FirstParameter();
}
@@ -124,7 +124,7 @@ Standard_Real LProp3d_CurveTool::FirstParameter
//=======================================================================
Standard_Real LProp3d_CurveTool::LastParameter
(const Handle(Adaptor3d_HCurve)& C)
(const Handle(Adaptor3d_Curve)& C)
{
return C->LastParameter();
}

16
src/LProp3d/LProp3d_CurveTool.hxx
View File

@@ -22,7 +22,7 @@
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
class Adaptor3d_HCurve;
class gp_Pnt;
class gp_Vec;
@@ -36,33 +36,33 @@ public:
//! Computes the point <P> of parameter <U> on the HCurve <C>.
Standard_EXPORT static void Value (const Handle(Adaptor3d_HCurve)& C, const Standard_Real U, gp_Pnt& P);
Standard_EXPORT static void Value (const Handle(Adaptor3d_Curve)& C, const Standard_Real U, gp_Pnt& P);
//! Computes the point <P> and first derivative <V1> of
//! parameter <U> on the HCurve <C>.
Standard_EXPORT static void D1 (const Handle(Adaptor3d_HCurve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1);
Standard_EXPORT static void D1 (const Handle(Adaptor3d_Curve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1);
//! Computes the point <P>, the first derivative <V1> and second
//! derivative <V2> of parameter <U> on the HCurve <C>.
Standard_EXPORT static void D2 (const Handle(Adaptor3d_HCurve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2);
Standard_EXPORT static void D2 (const Handle(Adaptor3d_Curve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2);
//! Computes the point <P>, the first derivative <V1>, the
//! second derivative <V2> and third derivative <V3> of
//! parameter <U> on the HCurve <C>.
Standard_EXPORT static void D3 (const Handle(Adaptor3d_HCurve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3);
Standard_EXPORT static void D3 (const Handle(Adaptor3d_Curve)& C, const Standard_Real U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2, gp_Vec& V3);
//! returns the order of continuity of the HCurve <C>.
//! returns 1 : first derivative only is computable
//! returns 2 : first and second derivative only are computable.
//! returns 3 : first, second and third are computable.
Standard_EXPORT static Standard_Integer Continuity (const Handle(Adaptor3d_HCurve)& C);
Standard_EXPORT static Standard_Integer Continuity (const Handle(Adaptor3d_Curve)& C);
//! returns the first parameter bound of the HCurve.
Standard_EXPORT static Standard_Real FirstParameter (const Handle(Adaptor3d_HCurve)& C);
Standard_EXPORT static Standard_Real FirstParameter (const Handle(Adaptor3d_Curve)& C);
//! returns the last parameter bound of the HCurve.
//! FirstParameter must be less than LastParamenter.
Standard_EXPORT static Standard_Real LastParameter (const Handle(Adaptor3d_HCurve)& C);
Standard_EXPORT static Standard_Real LastParameter (const Handle(Adaptor3d_Curve)& C);

48
src/LProp3d/LProp3d_SLProps.hxx
View File

@@ -16,28 +16,8 @@
#ifndef _LProp3d_SLProps_HeaderFile
#define _LProp3d_SLProps_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
#include <gp_Pnt.hxx>
#include <gp_Vec.hxx>
#include <gp_Dir.hxx>
#include <Adaptor3d_Surface.hxx>
#include <LProp_Status.hxx>
#include <Standard_Boolean.hxx>
class Adaptor3d_HSurface;
class LProp_BadContinuity;
class Standard_DomainError;
class Standard_OutOfRange;
class LProp_NotDefined;
class LProp3d_SurfaceTool;
class gp_Pnt;
class gp_Vec;
class gp_Dir;
class LProp3d_SLProps
{
@@ -56,11 +36,11 @@ public:
//! only the tangent, N should be equal to 1.
//! <Resolution> is the linear tolerance (it is used to test
//! if a vector is null).
Standard_EXPORT LProp3d_SLProps(const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, const Standard_Integer N, const Standard_Real Resolution);
Standard_EXPORT LProp3d_SLProps(const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, const Standard_Integer N, const Standard_Real Resolution);
//! idem as previous constructor but without setting the value
//! of parameters <U> and <V>.
Standard_EXPORT LProp3d_SLProps(const Handle(Adaptor3d_HSurface)& S, const Standard_Integer N, const Standard_Real Resolution);
Standard_EXPORT LProp3d_SLProps(const Handle(Adaptor3d_Surface)& S, const Standard_Integer N, const Standard_Real Resolution);
//! idem as previous constructor but without setting the value
//! of parameters <U> and <V> and the surface.
@@ -69,7 +49,7 @@ public:
//! Initializes the local properties of the surface S
//! for the new surface.
Standard_EXPORT void SetSurface (const Handle(Adaptor3d_HSurface)& S);
Standard_EXPORT void SetSurface (const Handle(Adaptor3d_Surface)& S);
//! Initializes the local properties of the surface S
//! for the new parameter values (<U>, <V>).
@@ -143,20 +123,9 @@ public:
//! Returns the Gaussian curvature
Standard_EXPORT Standard_Real GaussianCurvature();
protected:
private:
Handle(Adaptor3d_HSurface) mySurf;
Handle(Adaptor3d_Surface) mySurf;
Standard_Real myU;
Standard_Real myV;
Standard_Integer myDerOrder;
@@ -182,13 +151,6 @@ private:
LProp_Status myNormalStatus;
LProp_Status myCurvatureStatus;
};
#endif // _LProp3d_SLProps_HeaderFile

6
src/LProp3d/LProp3d_SLProps_0.cxx
View File

@@ -15,7 +15,7 @@
#include <LProp3d_SLProps.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <LProp_BadContinuity.hxx>
#include <Standard_DomainError.hxx>
#include <Standard_OutOfRange.hxx>
@@ -26,8 +26,8 @@
#include <gp_Dir.hxx>
#define Surface Handle(Adaptor3d_HSurface)
#define Surface_hxx <Adaptor3d_HSurface.hxx>
#define Surface Handle(Adaptor3d_Surface)
#define Surface_hxx <Adaptor3d_Surface.hxx>
#define Tool LProp3d_SurfaceTool
#define Tool_hxx <LProp3d_SurfaceTool.hxx>
#define LProp_SLProps LProp3d_SLProps

14
src/LProp3d/LProp3d_SurfaceTool.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <gp_Pnt.hxx>
#include <gp_Vec.hxx>
#include <LProp3d_SurfaceTool.hxx>
@@ -24,7 +24,7 @@
//function : Value
//purpose :
//=======================================================================
void LProp3d_SurfaceTool::Value(const Handle(Adaptor3d_HSurface)& S,
void LProp3d_SurfaceTool::Value(const Handle(Adaptor3d_Surface)& S,
const Standard_Real U,
const Standard_Real V,
gp_Pnt& P)
@@ -38,7 +38,7 @@ void LProp3d_SurfaceTool::Value(const Handle(Adaptor3d_HSurface)& S,
//purpose :
//=======================================================================
void LProp3d_SurfaceTool::D1(const Handle(Adaptor3d_HSurface)& S,
void LProp3d_SurfaceTool::D1(const Handle(Adaptor3d_Surface)& S,
const Standard_Real U,
const Standard_Real V,
gp_Pnt& P,
@@ -54,7 +54,7 @@ void LProp3d_SurfaceTool::D1(const Handle(Adaptor3d_HSurface)& S,
//purpose :
//=======================================================================
void LProp3d_SurfaceTool::D2(const Handle(Adaptor3d_HSurface)& S,
void LProp3d_SurfaceTool::D2(const Handle(Adaptor3d_Surface)& S,
const Standard_Real U,
const Standard_Real V,
gp_Pnt& P,
@@ -71,7 +71,7 @@ void LProp3d_SurfaceTool::D2(const Handle(Adaptor3d_HSurface)& S,
//function : DN
//purpose :
//=======================================================================
gp_Vec LProp3d_SurfaceTool::DN(const Handle(Adaptor3d_HSurface)& S,
gp_Vec LProp3d_SurfaceTool::DN(const Handle(Adaptor3d_Surface)& S,
const Standard_Real U,
const Standard_Real V,
const Standard_Integer IU,
@@ -87,7 +87,7 @@ gp_Vec LProp3d_SurfaceTool::DN(const Handle(Adaptor3d_HSurface)& S,
//=======================================================================
Standard_Integer LProp3d_SurfaceTool::Continuity
(const Handle(Adaptor3d_HSurface)& S)
(const Handle(Adaptor3d_Surface)& S)
{
GeomAbs_Shape s = (GeomAbs_Shape) Min(S->UContinuity(),S->VContinuity());
switch (s) {
@@ -115,7 +115,7 @@ Standard_Integer LProp3d_SurfaceTool::Continuity
//purpose :
//=======================================================================
void LProp3d_SurfaceTool::Bounds(const Handle(Adaptor3d_HSurface)& S,
void LProp3d_SurfaceTool::Bounds(const Handle(Adaptor3d_Surface)& S,
Standard_Real& U1,
Standard_Real& V1,
Standard_Real& U2,

24
src/LProp3d/LProp3d_SurfaceTool.hxx
View File

@@ -16,17 +16,7 @@
#ifndef _LProp3d_SurfaceTool_HeaderFile
#define _LProp3d_SurfaceTool_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
class Adaptor3d_HSurface;
class gp_Pnt;
class gp_Vec;
#include <Adaptor3d_Surface.hxx>
class LProp3d_SurfaceTool
{
@@ -37,25 +27,25 @@ public:
//! Computes the point <P> of parameter <U> and <V> on the
//! HSurface <S>.
Standard_EXPORT static void Value (const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P);
Standard_EXPORT static void Value (const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P);
//! Computes the point <P> and first derivative <D1*> of
//! parameter <U> and <V> on the HSurface <S>.
Standard_EXPORT static void D1 (const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V);
Standard_EXPORT static void D1 (const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V);
//! Computes the point <P>, the first derivative <D1*> and second
//! derivative <D2*> of parameter <U> and <V> on the HSurface <S>.
Standard_EXPORT static void D2 (const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& DUV);
Standard_EXPORT static void D2 (const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& D1U, gp_Vec& D1V, gp_Vec& D2U, gp_Vec& D2V, gp_Vec& DUV);
Standard_EXPORT static gp_Vec DN (const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, const Standard_Integer IU, const Standard_Integer IV);
Standard_EXPORT static gp_Vec DN (const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, const Standard_Integer IU, const Standard_Integer IV);
//! returns the order of continuity of the HSurface <S>.
//! returns 1 : first derivative only is computable
//! returns 2 : first and second derivative only are computable.
Standard_EXPORT static Standard_Integer Continuity (const Handle(Adaptor3d_HSurface)& S);
Standard_EXPORT static Standard_Integer Continuity (const Handle(Adaptor3d_Surface)& S);
//! returns the bounds of the HSurface.
Standard_EXPORT static void Bounds (const Handle(Adaptor3d_HSurface)& S, Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2);
Standard_EXPORT static void Bounds (const Handle(Adaptor3d_Surface)& S, Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2);