OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +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

12
src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx
View File

@@ -18,7 +18,7 @@
#include <Bnd_Box2d.hxx>
#include <BndLib_Add2dCurve.hxx>
#include <BndLib_AddSurface.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <GCPnts_QuasiUniformDeflection.hxx>
#include <gp_Pnt.hxx>
#include <gp_Pnt2d.hxx>
@@ -36,7 +36,7 @@
// function: GetDeflection
// purpose:
//==================================================================
static Standard_Real GetDeflection(const Handle(BRepAdaptor_HSurface)& aFace,
static Standard_Real GetDeflection(const Handle(BRepAdaptor_Surface)& aFace,
const Handle (VrmlConverter_Drawer)& aDrawer) {
Standard_Real theRequestedDeflection;
@@ -76,7 +76,7 @@ static Standard_Real GetDeflection(const Handle(BRepAdaptor_HSurface)& aFace,
//=========================================================================
void VrmlConverter_WFDeflectionRestrictedFace::Add
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Standard_Boolean DrawUIso,
const Standard_Boolean DrawVIso,
const Standard_Real Deflection,
@@ -312,7 +312,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::Add
//=========================================================================
void VrmlConverter_WFDeflectionRestrictedFace::Add
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Handle (VrmlConverter_Drawer)& aDrawer){
Standard_Real Deflection = GetDeflection(aFace, aDrawer);
@@ -339,7 +339,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::Add
//=========================================================================
void VrmlConverter_WFDeflectionRestrictedFace::AddUIso
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Handle (VrmlConverter_Drawer)& aDrawer) {
Standard_Real Deflection = GetDeflection(aFace, aDrawer);
@@ -364,7 +364,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::AddUIso
//=========================================================================
void VrmlConverter_WFDeflectionRestrictedFace::AddVIso
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Handle (VrmlConverter_Drawer)& aDrawer) {
Standard_Real Deflection = GetDeflection(aFace, aDrawer);

18
src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.hxx
View File

@@ -17,16 +17,10 @@
#ifndef _VrmlConverter_WFDeflectionRestrictedFace_HeaderFile
#define _VrmlConverter_WFDeflectionRestrictedFace_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <Standard_OStream.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
class BRepAdaptor_HSurface;
class VrmlConverter_Drawer;
class VrmlConverter_Drawer;
//! WFDeflectionRestrictedFace - computes the
//! wireframe presentation of faces with
@@ -45,13 +39,13 @@ public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddUIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddUIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddVIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddVIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Standard_Boolean DrawUIso, const Standard_Boolean DrawVIso, const Standard_Real Deflection, const Standard_Integer NBUiso, const Standard_Integer NBViso, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Standard_Boolean DrawUIso, const Standard_Boolean DrawVIso, const Standard_Real Deflection, const Standard_Integer NBUiso, const Standard_Integer NBViso, const Handle(VrmlConverter_Drawer)& aDrawer);
};

8
src/VrmlConverter/VrmlConverter_WFDeflectionShape.cxx
View File

@@ -15,7 +15,7 @@
#include <Bnd_Box.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepBndLib.hxx>
#include <gp_Pnt.hxx>
#include <Poly_PolygonOnTriangulation.hxx>
@@ -90,7 +90,7 @@ void VrmlConverter_WFDeflectionShape::Add( Standard_OStream& a
}
if (isoU || isoV) {
S.Initialize(Tool.GetFace());
Handle(BRepAdaptor_HSurface) HS = new BRepAdaptor_HSurface(S);
Handle(BRepAdaptor_Surface) HS = new BRepAdaptor_Surface(S);
VrmlConverter_WFDeflectionRestrictedFace::Add(anOStream, HS,
isoU, isoV,
theRequestedDeflection,
@@ -113,7 +113,7 @@ void VrmlConverter_WFDeflectionShape::Add( Standard_OStream& a
if (Tool.IsPlanarFace()) isoU = aDrawer->IsoOnPlane();
if (isoU) {
S.Initialize(Tool.GetFace());
Handle(BRepAdaptor_HSurface) HS = new BRepAdaptor_HSurface(S);
Handle(BRepAdaptor_Surface) HS = new BRepAdaptor_Surface(S);
VrmlConverter_WFDeflectionRestrictedFace::Add(anOStream, HS,
isoU, Standard_False,
theRequestedDeflection,
@@ -134,7 +134,7 @@ void VrmlConverter_WFDeflectionShape::Add( Standard_OStream& a
if (Tool.IsPlanarFace()) isoV = aDrawer->IsoOnPlane();
if (isoV) {
S.Initialize(Tool.GetFace());
Handle(BRepAdaptor_HSurface) HS = new BRepAdaptor_HSurface(S);
Handle(BRepAdaptor_Surface) HS = new BRepAdaptor_Surface(S);
VrmlConverter_WFDeflectionRestrictedFace::Add(anOStream, HS,
Standard_False, isoV,
theRequestedDeflection,

10
src/VrmlConverter/VrmlConverter_WFRestrictedFace.cxx
View File

@@ -15,7 +15,7 @@
#include <Adaptor3d_IsoCurve.hxx>
#include <Bnd_Box2d.hxx>
#include <BndLib_Add2dCurve.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <gp_Pnt.hxx>
#include <Hatch_Hatcher.hxx>
#include <Precision.hxx>
@@ -33,7 +33,7 @@
//=========================================================================
void VrmlConverter_WFRestrictedFace::Add
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Standard_Boolean DrawUIso,
const Standard_Boolean DrawVIso,
const Standard_Integer NBUiso,
@@ -288,7 +288,7 @@ void VrmlConverter_WFRestrictedFace::Add
//=========================================================================
void VrmlConverter_WFRestrictedFace::Add
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Handle (VrmlConverter_Drawer)& aDrawer){
Standard_Integer finu = aDrawer->UIsoAspect()->Number();
@@ -312,7 +312,7 @@ void VrmlConverter_WFRestrictedFace::Add
//=========================================================================
void VrmlConverter_WFRestrictedFace::AddUIso
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Handle (VrmlConverter_Drawer)& aDrawer) {
Standard_Integer finu = aDrawer->UIsoAspect()->Number();
@@ -335,7 +335,7 @@ void VrmlConverter_WFRestrictedFace::AddUIso
//=========================================================================
void VrmlConverter_WFRestrictedFace::AddVIso
(Standard_OStream& anOStream,
const Handle(BRepAdaptor_HSurface)& aFace,
const Handle(BRepAdaptor_Surface)& aFace,
const Handle (VrmlConverter_Drawer)& aDrawer) {
Standard_Integer finu = aDrawer->UIsoAspect()->Number();

18
src/VrmlConverter/VrmlConverter_WFRestrictedFace.hxx
View File

@@ -17,16 +17,10 @@
#ifndef _VrmlConverter_WFRestrictedFace_HeaderFile
#define _VrmlConverter_WFRestrictedFace_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <Standard_OStream.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
class BRepAdaptor_HSurface;
class VrmlConverter_Drawer;
class VrmlConverter_Drawer;
//! WFRestrictedFace - computes the wireframe
//! presentation of faces with restrictions by
@@ -44,13 +38,13 @@ public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddUIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddUIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddVIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void AddVIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Standard_Boolean DrawUIso, const Standard_Boolean DrawVIso, const Standard_Integer NBUiso, const Standard_Integer NBViso, const Handle(VrmlConverter_Drawer)& aDrawer);
Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_Surface)& aFace, const Standard_Boolean DrawUIso, const Standard_Boolean DrawVIso, const Standard_Integer NBUiso, const Standard_Integer NBViso, const Handle(VrmlConverter_Drawer)& aDrawer);

8
src/VrmlConverter/VrmlConverter_WFShape.cxx
View File

@@ -15,7 +15,7 @@
#include <Bnd_Box.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepBndLib.hxx>
#include <gp_Pnt.hxx>
#include <StdPrs_ShapeTool.hxx>
@@ -59,7 +59,7 @@ void VrmlConverter_WFShape::Add(Standard_OStream& anOStream,
}
if (isoU || isoV) {
S.Initialize(Tool.GetFace());
Handle(BRepAdaptor_HSurface) HS = new BRepAdaptor_HSurface(S);
Handle(BRepAdaptor_Surface) HS = new BRepAdaptor_Surface(S);
VrmlConverter_WFRestrictedFace::Add(anOStream, HS,
isoU, isoV,
aDrawer->UIsoAspect()->Number(),
@@ -81,7 +81,7 @@ void VrmlConverter_WFShape::Add(Standard_OStream& anOStream,
if (Tool.IsPlanarFace()) isoU = aDrawer->IsoOnPlane();
if (isoU) {
S.Initialize(Tool.GetFace());
Handle(BRepAdaptor_HSurface) HS = new BRepAdaptor_HSurface(S);
Handle(BRepAdaptor_Surface) HS = new BRepAdaptor_Surface(S);
VrmlConverter_WFRestrictedFace::Add(anOStream, HS,
isoU, Standard_False,
aDrawer->UIsoAspect()->Number(),
@@ -101,7 +101,7 @@ void VrmlConverter_WFShape::Add(Standard_OStream& anOStream,
if (Tool.IsPlanarFace()) isoV = aDrawer->IsoOnPlane();
if (isoV) {
S.Initialize(Tool.GetFace());
Handle(BRepAdaptor_HSurface) HS = new BRepAdaptor_HSurface(S);
Handle(BRepAdaptor_Surface) HS = new BRepAdaptor_Surface(S);
VrmlConverter_WFRestrictedFace::Add(anOStream, HS,
Standard_False, isoV,
0,