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

2
src/Blend/Blend_CSWalking.gxx
View File

@@ -16,7 +16,7 @@
#include <math_Gauss.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <IntSurf.hxx>
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Precision.hxx>
#ifdef OCCT_DEBUG

2
src/Blend/Blend_CSWalking_3.gxx
View File

@@ -75,7 +75,7 @@ Standard_Boolean Blend_CSWalking::Recadre(Blend_FuncInv& FuncInv,
}
TheArc thearc = Iter->Value();
Handle(Adaptor2d_HCurve2d) thecur;
Handle(Adaptor2d_Curve2d) thecur;
if (OnFirst) {
thecur = TheBlendTool::CurveOnSurf(thearc,surf1);
}

2
src/Blend/Blend_FuncInv.cxx
View File

@@ -13,7 +13,7 @@
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Blend_FuncInv.hxx>
#include <math_Matrix.hxx>

4
src/Blend/Blend_FuncInv.hxx
View File

@@ -27,8 +27,6 @@
#include <math_Vector.hxx>
#include <Standard_Real.hxx>
class math_Matrix;
class Adaptor2d_HCurve2d;
//! Deferred class for a function used to compute a blending
//! surface between two surfaces, using a guide line.
@@ -75,7 +73,7 @@ public:
//! to be found. If <OnFirst> is set to Standard_True,
//! the curve will be on the first surface, otherwise the
//! curve is on the second one.
Standard_EXPORT virtual void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_HCurve2d)& COnSurf) = 0;
Standard_EXPORT virtual void Set (const Standard_Boolean OnFirst, const Handle(Adaptor2d_Curve2d)& COnSurf) = 0;
//! Returns in the vector Tolerance the parametric tolerance
//! for each of the 4 variables;

2
src/Blend/Blend_SurfCurvFuncInv.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Blend_SurfCurvFuncInv.hxx>
#include <math_Matrix.hxx>

4
src/Blend/Blend_SurfCurvFuncInv.hxx
View File

@@ -27,8 +27,6 @@
#include <math_Vector.hxx>
#include <Standard_Real.hxx>
class math_Matrix;
class Adaptor2d_HCurve2d;
//! Deferred class for a function used to compute a
//! blending surface between a surface and a curve, using
@@ -73,7 +71,7 @@ public:
Standard_EXPORT virtual Standard_Boolean Values (const math_Vector& X, math_Vector& F, math_Matrix& D) = 0;
//! Set the Point on which a solution has to be found.
Standard_EXPORT virtual void Set (const Handle(Adaptor2d_HCurve2d)& Rst) = 0;
Standard_EXPORT virtual void Set (const Handle(Adaptor2d_Curve2d)& Rst) = 0;
//! Returns in the vector Tolerance the parametric tolerance
//! for each of the 3 variables;

2
src/Blend/Blend_Walking.gxx
View File

@@ -18,7 +18,7 @@
#include <TColgp_Array2OfVec.hxx>
#include <IntSurf.hxx>
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <CSLib.hxx>
#include <CSLib_NormalStatus.hxx>
#include <Precision.hxx>

2
src/Blend/Blend_Walking_1.gxx
View File

@@ -16,7 +16,7 @@ Blend_Walking::Blend_Walking(const TheSurface& Surf1,
const TheSurface& Surf2,
const Handle(TheTopolTool)& Domain1,
const Handle(TheTopolTool)& Domain2,
const Handle(ChFiDS_HElSpine)& HGuide):
const Handle(ChFiDS_ElSpine)& HGuide):
sol(1,4),surf1(Surf1),surf2(Surf2),
ToCorrectOnRst1(Standard_False),ToCorrectOnRst2(Standard_False),
done(Standard_False),

6
src/Blend/Blend_Walking_3.gxx
View File

@@ -90,7 +90,7 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
math_Vector toler(1,4),infb(1,4),supb(1,4),valsol(1,4);
Handle(Adaptor2d_HCurve2d) thecur;
Handle(Adaptor2d_Curve2d) thecur;
Handle(TheTopolTool) Iter;
if (OnFirst) Iter = recdomain1;
@@ -220,7 +220,7 @@ Standard_Boolean Blend_Walking::Recadre(Blend_FuncInv& FuncInv,
// Recadrage eventuelle pour le cas periodique
if (periodic) {
Handle(Adaptor3d_HSurface) surf;
Handle(Adaptor3d_Surface) surf;
if (OnFirst) surf = surf2;
else surf = surf1;
@@ -409,7 +409,7 @@ void Blend_Walking::Transition(const Standard_Boolean OnFirst,
CSLib::Normal(d1u, d1v, 1.e-9, stat, thenormal);
if (stat == CSLib_Defined) normale.SetXYZ(thenormal.XYZ());
else {
Handle(Adaptor3d_HSurface) surf;
Handle(Adaptor3d_Surface) surf;
if (OnFirst) surf = surf1;
else surf = surf2;
Standard_Integer iu, iv;

6
src/Blend/Blend_Walking_4.gxx
View File

@@ -331,7 +331,7 @@ void Blend_Walking::InternalPerform(Blend_Function& Func,
const Standard_Real TolProd = 1.e-5;
Standard_Real SavedParams [2];
Standard_Boolean SameDirs [2] = {Standard_False, Standard_False};
ChFiDS_ElSpine& theElSpine = hguide->ChangeCurve();
ChFiDS_ElSpine& theElSpine = *hguide;
SavedParams[0] = theElSpine.GetSavedFirstParameter();
SavedParams[1] = theElSpine.GetSavedLastParameter();
for (Standard_Integer ind = 0; ind < 2; ind++)
@@ -767,7 +767,7 @@ Standard_Boolean Blend_Walking::CorrectExtremityOnOneRst(const Standard_Integer
{
const Standard_Real TolAng = 0.001; //bug OCC25701
ChFiDS_ElSpine& theElSpine = hguide->ChangeCurve();
ChFiDS_ElSpine& theElSpine = *hguide;
if (theElSpine.NbVertices() == 0)
return Standard_False;
@@ -866,7 +866,7 @@ Standard_Boolean Blend_Walking::CorrectExtremityOnOneRst(const Standard_Integer
////////////////////////////////////////////////////////////////////////
//Project the point <PntOnPlane> on the surface 2
Extrema_ExtPS projonsurf(PntOnPlane, AnotherSurf->Surface(),
Extrema_ExtPS projonsurf(PntOnPlane, *AnotherSurf,
Precision::PConfusion(), Precision::PConfusion(),
Extrema_ExtFlag_MIN);
if (projonsurf.IsDone())