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

6
src/BRepFill/BRepFill_ACRLaw.cxx
View File

@@ -22,7 +22,7 @@
#include <BRepTools_WireExplorer.hxx>
#include <Geom_Curve.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GeomFill_HArray1OfLocationLaw.hxx>
#include <GeomFill_LocationGuide.hxx>
#include <GeomFill_LocationLaw.hxx>
@@ -56,7 +56,7 @@ BRepFill_ACRLaw::BRepFill_ACRLaw(const TopoDS_Wire& Path,
// BRep_Tool B;
TopoDS_Edge E;
Handle(Geom_Curve) C;
Handle(GeomAdaptor_HCurve) AC;
Handle(GeomAdaptor_Curve) AC;
Standard_Real First, Last;
// return ACR of edges of the trajectory
@@ -82,7 +82,7 @@ BRepFill_ACRLaw::BRepFill_ACRLaw(const TopoDS_Wire& Path,
First = C->FirstParameter();
Last = C->LastParameter();
}
AC = new (GeomAdaptor_HCurve) (C, First, Last);
AC = new (GeomAdaptor_Curve) (C, First, Last);
// Set the parameters for the case multi-edges
Standard_Real t1 = OrigParam->Value(ipath-1);

16
src/BRepFill/BRepFill_AdvancedEvolved.cxx
View File

@@ -33,8 +33,8 @@
#include <BOPAlgo_PaveFiller.hxx>
#include <math_MultipleVarFunctionWithHessian.hxx>
#include <Adaptor3d_CurveOnSurface.hxx>
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Adaptor3d_Surface.hxx>
#include <math_NewtonMinimum.hxx>
#include <BOPTools_AlgoTools.hxx>
#include <math_Matrix.hxx>
@@ -1149,8 +1149,8 @@ public:
gp_Pnt GetPoint(const Standard_Real theX)
{
const Handle(Adaptor2d_HCurve2d) &aC = myCOnS.GetCurve();
const Handle(Adaptor3d_HSurface) &aS = myCOnS.GetSurface();
const Handle(Adaptor2d_Curve2d) &aC = myCOnS.GetCurve();
const Handle(Adaptor3d_Surface) &aS = myCOnS.GetSurface();
const gp_Pnt2d aP2d(aC->Value(theX));
return aS->Value(aP2d.X(), aP2d.Y());
}
@@ -1174,8 +1174,8 @@ private:
//=======================================================================
Standard_Boolean NormalFunc::Value(const math_Vector& theX, Standard_Real& theF)
{
const Handle(Adaptor2d_HCurve2d) &aC = myCOnS.GetCurve();
const Handle(Adaptor3d_HSurface) &aS = myCOnS.GetSurface();
const Handle(Adaptor2d_Curve2d) &aC = myCOnS.GetCurve();
const Handle(Adaptor3d_Surface) &aS = myCOnS.GetSurface();
const gp_Pnt2d aP2d(aC->Value(theX(1)));
gp_Pnt aP3d;
@@ -1213,8 +1213,8 @@ Standard_Boolean NormalFunc::Value(const math_Vector& theX, Standard_Real& theF)
//=======================================================================
Standard_Boolean NormalFunc::Gradient(const math_Vector& theX, math_Vector& theG)
{
const Handle(Adaptor2d_HCurve2d) &aC = myCOnS.GetCurve();
const Handle(Adaptor3d_HSurface) &aS = myCOnS.GetSurface();
const Handle(Adaptor2d_Curve2d) &aC = myCOnS.GetCurve();
const Handle(Adaptor3d_Surface) &aS = myCOnS.GetSurface();
gp_Pnt2d aP2d;
gp_Vec2d aDc;

30
src/BRepFill/BRepFill_CurveConstraint.cxx
View File

@@ -15,18 +15,18 @@
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_HCurveOnSurface.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_CurveOnSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepFill_CurveConstraint.hxx>
#include <GCPnts_AbscissaPoint.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom_Plane.hxx>
#include <GeomAdaptor.hxx>
#include <GeomAdaptor_HSurface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomAPI.hxx>
#include <GeomPlate_CurveConstraint.hxx>
#include <Precision.hxx>
@@ -40,7 +40,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BRepFill_CurveConstraint,GeomPlate_CurveConstraint)
//---------------------------------------------------------
// Constructeurs avec courbe sur surface
//---------------------------------------------------------
BRepFill_CurveConstraint :: BRepFill_CurveConstraint (const Handle(Adaptor3d_HCurveOnSurface)& Boundary,
BRepFill_CurveConstraint :: BRepFill_CurveConstraint (const Handle(Adaptor3d_CurveOnSurface)& Boundary,
const Standard_Integer Tang,
const Standard_Integer NPt,
const Standard_Real TolDist,
@@ -64,15 +64,15 @@ myConstG2=Standard_True;
if (myFrontiere.IsNull())
throw Standard_Failure("BRepFill_CurveConstraint : Curve must be on a Surface");
Handle(Geom_Surface) Surf;
Handle(GeomAdaptor_HSurface) GS1;
GS1 = Handle(GeomAdaptor_HSurface)::DownCast(myFrontiere->ChangeCurve().GetSurface());
Handle(GeomAdaptor_Surface) GS1;
GS1 = Handle(GeomAdaptor_Surface)::DownCast(myFrontiere->GetSurface());
if (!GS1.IsNull()) {
Surf=GS1->ChangeSurface().Surface();
Surf = GS1->Surface();
}
else {
Handle(BRepAdaptor_HSurface) BS1;
BS1=Handle(BRepAdaptor_HSurface)::DownCast(myFrontiere->ChangeCurve().GetSurface());
Surf = BRep_Tool::Surface(BS1->ChangeSurface().Face());
Handle(BRepAdaptor_Surface) BS1;
BS1=Handle(BRepAdaptor_Surface)::DownCast(myFrontiere->GetSurface());
Surf = BRep_Tool::Surface(BS1->Face());
}
myLProp.SetSurface(Surf);
}
@@ -80,7 +80,7 @@ myConstG2=Standard_True;
//---------------------------------------------------------
// Constructeurs avec courbe 3d (pour continuite G0 G-1)
//---------------------------------------------------------
BRepFill_CurveConstraint :: BRepFill_CurveConstraint (const Handle(Adaptor3d_HCurve)& Boundary,
BRepFill_CurveConstraint :: BRepFill_CurveConstraint (const Handle(Adaptor3d_Curve)& Boundary,
const Standard_Integer Tang,
const Standard_Integer NPt,
const Standard_Real TolDist)

7
src/BRepFill/BRepFill_CurveConstraint.hxx
View File

@@ -24,9 +24,6 @@
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
class Standard_ConstructionError;
class Adaptor3d_HCurveOnSurface;
class Adaptor3d_HCurve;
class BRepFill_CurveConstraint;
DEFINE_STANDARD_HANDLE(BRepFill_CurveConstraint, GeomPlate_CurveConstraint)
@@ -48,9 +45,9 @@ public:
//! TolAng is the maximum error to satisfy for G1 constraints
//! TolCurv is the maximum error to satisfy for G2 constraints
//! These errors can be replaced by laws of criterion.
Standard_EXPORT BRepFill_CurveConstraint(const Handle(Adaptor3d_HCurveOnSurface)& Boundary, const Standard_Integer Order, const Standard_Integer NPt = 10, const Standard_Real TolDist = 0.0001, const Standard_Real TolAng = 0.01, const Standard_Real TolCurv = 0.1);
Standard_EXPORT BRepFill_CurveConstraint(const Handle(Adaptor3d_CurveOnSurface)& Boundary, const Standard_Integer Order, const Standard_Integer NPt = 10, const Standard_Real TolDist = 0.0001, const Standard_Real TolAng = 0.01, const Standard_Real TolCurv = 0.1);
Standard_EXPORT BRepFill_CurveConstraint(const Handle(Adaptor3d_HCurve)& Boundary, const Standard_Integer Tang, const Standard_Integer NPt = 10, const Standard_Real TolDist = 0.0001);
Standard_EXPORT BRepFill_CurveConstraint(const Handle(Adaptor3d_Curve)& Boundary, const Standard_Integer Tang, const Standard_Integer NPt = 10, const Standard_Real TolDist = 0.0001);

7
src/BRepFill/BRepFill_Draft.cxx
View File

@@ -14,8 +14,9 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <BRepFill_Draft.hxx>
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Bnd_Box.hxx>
#include <BndLib_Add3dCurve.hxx>
@@ -31,7 +32,6 @@
#include <BRepClass3d_SolidClassifier.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
#include <BRepFill_DataMapOfShapeHArray2OfShape.hxx>
#include <BRepFill_Draft.hxx>
#include <BRepFill_DraftLaw.hxx>
#include <BRepFill_SectionLaw.hxx>
#include <BRepFill_ShapeLaw.hxx>
@@ -47,7 +47,6 @@
#include <Geom_RectangularTrimmedSurface.hxx>
#include <Geom_Surface.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <GeomAdaptor_HSurface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomFill_LocationDraft.hxx>
#include <GeomLProp_SLProps.hxx>
@@ -189,7 +188,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
Nb++; // Number of points
TColgp_Array1OfPnt Pnts(1, Nb);
Handle(Adaptor3d_HCurve) AC;
Handle(Adaptor3d_Curve) AC;
gp_XYZ Bary(0.,0.,0.);
for (ii=1; ii<=Nb; ii++) {

6
src/BRepFill/BRepFill_Edge3DLaw.cxx
View File

@@ -20,7 +20,7 @@
#include <BRepTools_WireExplorer.hxx>
#include <Geom_Curve.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GeomFill_HArray1OfLocationLaw.hxx>
#include <GeomFill_LocationLaw.hxx>
#include <Standard_Type.hxx>
@@ -44,7 +44,7 @@ BRepFill_Edge3DLaw::BRepFill_Edge3DLaw(const TopoDS_Wire& Path,
// BRep_Tool B;
TopoDS_Edge E;
Handle(Geom_Curve) C;
Handle(GeomAdaptor_HCurve) AC;
Handle(GeomAdaptor_Curve) AC;
Standard_Real First, Last;
for (ipath=0, wexp.Init(myPath);
@@ -65,7 +65,7 @@ BRepFill_Edge3DLaw::BRepFill_Edge3DLaw(const TopoDS_Wire& Path,
Last = C->LastParameter();
}
AC = new (GeomAdaptor_HCurve) (C,First, Last);
AC = new (GeomAdaptor_Curve) (C,First, Last);
myLaws->SetValue(ipath, Law->Copy());
myLaws->ChangeValue(ipath)->SetCurve(AC);
}

19
src/BRepFill/BRepFill_EdgeOnSurfLaw.cxx
View File

@@ -14,16 +14,15 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <BRepFill_EdgeOnSurfLaw.hxx>
#include <Adaptor3d_CurveOnSurface.hxx>
#include <Adaptor3d_HCurveOnSurface.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepFill_EdgeOnSurfLaw.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepTools_WireExplorer.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <GeomFill_CurveAndTrihedron.hxx>
#include <GeomFill_Darboux.hxx>
#include <GeomFill_HArray1OfLocationLaw.hxx>
@@ -53,9 +52,9 @@ BRepFill_EdgeOnSurfLaw::BRepFill_EdgeOnSurfLaw(const TopoDS_Wire& Path,
// BRep_Tool B;
TopoDS_Edge E;
Handle(Geom2d_Curve) C;
Handle(Geom2dAdaptor_HCurve) AC2d;
Handle(Adaptor3d_HCurveOnSurface) AC;
Handle(BRepAdaptor_HSurface) AS;
Handle(Geom2dAdaptor_Curve) AC2d;
Handle(Adaptor3d_CurveOnSurface) AC;
Handle(BRepAdaptor_Surface) AS;
Standard_Real First = 0., Last = 0.;
Handle(GeomFill_Darboux) TLaw = new (GeomFill_Darboux)() ;
Handle(GeomFill_CurveAndTrihedron) Law =
@@ -74,7 +73,7 @@ BRepFill_EdgeOnSurfLaw::BRepFill_EdgeOnSurfLaw(const TopoDS_Wire& Path,
C = BRep_Tool::CurveOnSurface(E, F, First, Last);
if (!C.IsNull()) {
Trouve=Standard_True;
AS = new (BRepAdaptor_HSurface) (F);
AS = new (BRepAdaptor_Surface) (F);
}
}
if (!Trouve) { // Impossible to construct the law.
@@ -93,8 +92,8 @@ BRepFill_EdgeOnSurfLaw::BRepFill_EdgeOnSurfLaw(const TopoDS_Wire& Path,
Last = C->LastParameter();
}
AC2d = new (Geom2dAdaptor_HCurve) (C,First, Last);
AC = new (Adaptor3d_HCurveOnSurface)
AC2d = new (Geom2dAdaptor_Curve) (C,First, Last);
AC = new (Adaptor3d_CurveOnSurface)
(Adaptor3d_CurveOnSurface(AC2d, AS));
myLaws->SetValue(ipath, Law->Copy());
myLaws->ChangeValue(ipath)->SetCurve(AC);

52
src/BRepFill/BRepFill_Filling.cxx
View File

@@ -16,16 +16,16 @@
#include <Adaptor3d_CurveOnSurface.hxx>
#include <Adaptor3d_HCurveOnSurface.hxx>
#include <Adaptor3d_CurveOnSurface.hxx>
#include <BRep_Builder.hxx>
#include <BRep_CurveRepresentation.hxx>
#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
#include <BRep_TEdge.hxx>
#include <BRep_Tool.hxx>
#include <BRep_TVertex.hxx>
#include <BRepAdaptor_HCurve.hxx>
#include <BRepAdaptor_HCurve2d.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_Curve2d.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepFill_CurveConstraint.hxx>
#include <BRepFill_EdgeFaceAndOrder.hxx>
#include <BRepFill_FaceAndOrder.hxx>
@@ -40,9 +40,9 @@
#include <BRepTools_WireExplorer.hxx>
#include <Geom2d_BezierCurve.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom_BSplineSurface.hxx>
#include <GeomAdaptor_HSurface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomAPI_ProjectPointOnSurf.hxx>
#include <GeomPlate_CurveConstraint.hxx>
#include <GeomPlate_MakeApprox.hxx>
@@ -298,10 +298,10 @@ Standard_Integer BRepFill_Filling::Add( const Standard_Real U,
const TopoDS_Face& Support,
const GeomAbs_Shape Order )
{
Handle( BRepAdaptor_HSurface ) HSurf = new BRepAdaptor_HSurface();
HSurf->ChangeSurface().Initialize( Support );
Handle( BRepAdaptor_Surface ) HSurf = new BRepAdaptor_Surface();
HSurf->Initialize( Support );
Handle( GeomPlate_PointConstraint ) aPC =
new GeomPlate_PointConstraint( U, V, BRep_Tool::Surface( HSurf->ChangeSurface().Face() ), Order,
new GeomPlate_PointConstraint( U, V, BRep_Tool::Surface( HSurf->Face() ), Order,
myTol3d, myTolAng, myTolCurv );
myPoints.Append( aPC );
return (myBoundary.Length() + myFreeConstraints.Length() + myConstraints.Length() + myPoints.Length());
@@ -328,9 +328,9 @@ void BRepFill_Filling::AddConstraints( const BRepFill_SequenceOfEdgeFaceAndOrder
if (CurFace.IsNull()) {
if (CurOrder == GeomAbs_C0) {
Handle( BRepAdaptor_HCurve ) HCurve = new BRepAdaptor_HCurve();
HCurve->ChangeCurve().Initialize( CurEdge );
const Handle(Adaptor3d_HCurve)& aHCurve = HCurve; // to avoid ambiguity
Handle( BRepAdaptor_Curve ) HCurve = new BRepAdaptor_Curve();
HCurve->Initialize( CurEdge );
const Handle(Adaptor3d_Curve)& aHCurve = HCurve; // to avoid ambiguity
Constr = new BRepFill_CurveConstraint(aHCurve,
CurOrder,
myNbPtsOnCur,
@@ -349,11 +349,11 @@ void BRepFill_Filling::AddConstraints( const BRepFill_SequenceOfEdgeFaceAndOrder
}
Surface = Handle(Geom_Surface)::DownCast(Surface->Copy());
Surface->Transform(loc.Transformation());
Handle( GeomAdaptor_HSurface ) Surf = new GeomAdaptor_HSurface(Surface);
Handle( Geom2dAdaptor_HCurve ) Curve2d = new Geom2dAdaptor_HCurve(C2d);
Handle( GeomAdaptor_Surface ) Surf = new GeomAdaptor_Surface(Surface);
Handle( Geom2dAdaptor_Curve ) Curve2d = new Geom2dAdaptor_Curve(C2d);
Adaptor3d_CurveOnSurface CurvOnSurf( Curve2d, Surf );
Handle (Adaptor3d_HCurveOnSurface) HCurvOnSurf = new Adaptor3d_HCurveOnSurface( CurvOnSurf );
Handle (Adaptor3d_CurveOnSurface) HCurvOnSurf = new Adaptor3d_CurveOnSurface( CurvOnSurf );
Constr = new GeomPlate_CurveConstraint(HCurvOnSurf,
CurOrder,
@@ -365,15 +365,15 @@ void BRepFill_Filling::AddConstraints( const BRepFill_SequenceOfEdgeFaceAndOrder
}
else
{
Handle( BRepAdaptor_HSurface ) Surf = new BRepAdaptor_HSurface();
Surf->ChangeSurface().Initialize( CurFace );
Handle( BRepAdaptor_HCurve2d ) Curve2d = new BRepAdaptor_HCurve2d();
Curve2d->ChangeCurve2d().Initialize( CurEdge, CurFace );
Handle( BRepAdaptor_Surface ) Surf = new BRepAdaptor_Surface();
Surf->Initialize( CurFace );
Handle( BRepAdaptor_Curve2d ) Curve2d = new BRepAdaptor_Curve2d();
Curve2d->Initialize( CurEdge, CurFace );
// If CurEdge has no 2d representation on CurFace,
// there will be exception "Attempt to access to null object"
// in this initialization (null pcurve).
Adaptor3d_CurveOnSurface CurvOnSurf( Curve2d, Surf );
Handle (Adaptor3d_HCurveOnSurface) HCurvOnSurf = new Adaptor3d_HCurveOnSurface( CurvOnSurf );
Handle (Adaptor3d_CurveOnSurface) HCurvOnSurf = new Adaptor3d_CurveOnSurface( CurvOnSurf );
Constr = new BRepFill_CurveConstraint( HCurvOnSurf,
CurOrder,
@@ -597,9 +597,9 @@ void BRepFill_Filling::Build()
Standard_Real U1, V1, U2, V2;
CurFace = myFreeConstraints(j).myFace;
Handle( BRepAdaptor_HSurface ) HSurf = new BRepAdaptor_HSurface();
HSurf->ChangeSurface().Initialize( CurFace );
Handle( Geom_Surface ) CurSurface = BRep_Tool::Surface( HSurf->ChangeSurface().Face() );
Handle( BRepAdaptor_Surface ) HSurf = new BRepAdaptor_Surface();
HSurf->Initialize( CurFace );
Handle( Geom_Surface ) CurSurface = BRep_Tool::Surface( HSurf->Face() );
//BRepTopAdaptor_FClass2d Classifier( CurFace, Precision::Confusion() );
for (i = 1; i <= VerSeq.Length(); i += 2)
@@ -648,9 +648,9 @@ void BRepFill_Filling::Build()
//Load initial surface to myBuilder if it is given
if (myIsInitFaceGiven)
{
Handle( BRepAdaptor_HSurface ) HSurfInit = new BRepAdaptor_HSurface();
HSurfInit->ChangeSurface().Initialize( myInitFace );
myBuilder.LoadInitSurface( BRep_Tool::Surface( HSurfInit->ChangeSurface().Face() ) );
Handle( BRepAdaptor_Surface ) HSurfInit = new BRepAdaptor_Surface();
HSurfInit->Initialize( myInitFace );
myBuilder.LoadInitSurface( BRep_Tool::Surface( HSurfInit->Face() ) );
}
//Adding constraints to myBuilder

8
src/BRepFill/BRepFill_LocationLaw.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_Curve.hxx>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_Curve.hxx>
@@ -440,7 +440,7 @@ void BRepFill_LocationLaw::CurvilinearBounds(const Standard_Integer Index,
for (ii=1, Length=0.; ii<=NbE; ii++) {
myLaws->Value(ii)->GetDomain(f, l);
Length += AbsC.Length(myLaws->Value(ii)->GetCurve()->GetCurve(), myTol);
Length += AbsC.Length(*myLaws->Value(ii)->GetCurve(), myTol);
myLength->SetValue(ii+1, Length);
}
@@ -585,7 +585,7 @@ void BRepFill_LocationLaw::CurvilinearBounds(const Standard_Integer Index,
else {
GCPnts_AbscissaPoint
AbsC(myTol,
myLaws->Value(iedge)->GetCurve()->GetCurve(),
*myLaws->Value(iedge)->GetCurve(),
Abcissa-myLength->Value(iedge), f);
U = AbsC.Parameter();
}
@@ -645,7 +645,7 @@ void BRepFill_LocationLaw::CurvilinearBounds(const Standard_Integer Index,
CurvilinearBounds(Index, bid, Length);
}
Length += AbsC.Length(myLaws->Value(Index)->GetCurve()->GetCurve(),
Length += AbsC.Length(*myLaws->Value(Index)->GetCurve(),
myLaws->Value(Index)->GetCurve()->FirstParameter(),
Param, myTol);
return Length;

11
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@@ -51,7 +51,6 @@
#include <Geom2d_OffsetCurve.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
#include <Geom2dLProp_CLProps2d.hxx>
#include <Geom_Circle.hxx>
@@ -271,7 +270,7 @@ static Standard_Boolean KPartCircle
Standard_Real anOffset = myOffset;
Handle(Geom2d_Curve) aPCurve = BRep_Tool::CurveOnSurface(E, mySpine, f, l);
Handle(Geom2dAdaptor_HCurve) AHC = new Geom2dAdaptor_HCurve(aPCurve, f, l);
Handle(Geom2dAdaptor_Curve) AHC = new Geom2dAdaptor_Curve(aPCurve, f, l);
Handle(Geom2d_Curve) OC;
if (AHC->GetType() == GeomAbs_Line)
{
@@ -2055,8 +2054,8 @@ void MakeOffset (const TopoDS_Edge& E,
if (anOffset*Signe < AC.Circle().Radius() - Precision::Confusion()) {
Handle(Geom2dAdaptor_HCurve) AHC =
new Geom2dAdaptor_HCurve(G2d);
Handle(Geom2dAdaptor_Curve) AHC =
new Geom2dAdaptor_Curve(G2d);
Adaptor2d_OffsetCurve Off(AHC, anOffset);
Handle(Geom2d_Circle) CC = new Geom2d_Circle(Off.Circle());
@@ -2090,8 +2089,8 @@ void MakeOffset (const TopoDS_Edge& E,
}
}
else if (AC.GetType() == GeomAbs_Line) {
Handle(Geom2dAdaptor_HCurve) AHC =
new Geom2dAdaptor_HCurve(G2d);
Handle(Geom2dAdaptor_Curve) AHC =
new Geom2dAdaptor_Curve(G2d);
Adaptor2d_OffsetCurve Off(AHC, anOffset);
Handle(Geom2d_Line) CC = new Geom2d_Line(Off.Line());
Standard_Real Delta = (l - f);

8
src/BRepFill/BRepFill_Pipe.cxx
View File

@@ -30,12 +30,12 @@
#include <BRepLib.hxx>
#include <BRepLib_MakeVertex.hxx>
#include <BRepTools_Substitution.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_OffsetCurve.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <GeomAbs_Shape.hxx>
#include <GeomAdaptor_HSurface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomFill_CorrectedFrenet.hxx>
#include <GeomFill_CurveAndTrihedron.hxx>
#include <GeomFill_DiscreteTrihedron.hxx>
@@ -115,9 +115,9 @@ static void UpdateTolFromTopOrBottomPCurve(const TopoDS_Face& aFace,
if (aCurve.IsNull())
return;
Handle(Geom2dAdaptor_HCurve) GAHC2d = new Geom2dAdaptor_HCurve(aPCurve, fpar, lpar);
Handle(Geom2dAdaptor_Curve) GAHC2d = new Geom2dAdaptor_Curve(aPCurve, fpar, lpar);
Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace);
Handle(GeomAdaptor_HSurface) GAHS = new GeomAdaptor_HSurface(aSurf);
Handle(GeomAdaptor_Surface) GAHS = new GeomAdaptor_Surface(aSurf);
Adaptor3d_CurveOnSurface ConS(GAHC2d, GAHS);
Standard_Real Tol = BRep_Tool::Tolerance(anEdge);

12
src/BRepFill/BRepFill_PipeShell.cxx
View File

@@ -17,7 +17,7 @@
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
#include <BRepAdaptor_HCompCurve.hxx>
#include <BRepAdaptor_CompCurve.hxx>
#include <BRepBuilderAPI_Copy.hxx>
#include <BRepBuilderAPI_Transform.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
@@ -38,8 +38,8 @@
#include <BRepGProp.hxx>
#include <BRepLib_MakeEdge.hxx>
#include <BRepLib_MakeFace.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <GeomAdaptor_HSurface.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomFill_ConstantBiNormal.hxx>
#include <GeomFill_CorrectedFrenet.hxx>
#include <GeomFill_CurveAndTrihedron.hxx>
@@ -386,7 +386,7 @@ BRepFill_PipeShell::BRepFill_PipeShell(const TopoDS_Wire& Spine)
DBRep::Set("theguide", TheGuide);
#endif
// transform the guide in a single curve
Handle(BRepAdaptor_HCompCurve) Guide = new (BRepAdaptor_HCompCurve) (TheGuide);
Handle(BRepAdaptor_CompCurve) Guide = new (BRepAdaptor_CompCurve) (TheGuide);
if (CurvilinearEquivalence) { // trihedron by curvilinear reduced abscissa
if (KeepContact == BRepFill_Contact ||
@@ -491,9 +491,9 @@ void BRepFill_PipeShell::SetForceApproxC1(const Standard_Boolean ForceApproxC1)
TopoDS_Face ProfileFace = BRepLib_MakeFace(TopoDS::Wire(Profile), Standard_True); //only plane
Handle(Geom_Surface) thePlane = BRep_Tool::Surface(ProfileFace);
Handle(GeomAdaptor_HSurface) GAHplane = new GeomAdaptor_HSurface(thePlane);
Handle(GeomAdaptor_Surface) GAHplane = new GeomAdaptor_Surface(thePlane);
IntCurveSurface_HInter Intersector;
Handle(Adaptor3d_HCurve) aHCurve [2];
Handle(Adaptor3d_Curve) aHCurve [2];
aHCurve[0] = Loc->GetCurve();
aHCurve[1] = Loc->Guide();
gp_Pnt PointsOnSpines [2];

10
src/BRepFill/BRepFill_SectionPlacement.cxx
View File

@@ -16,8 +16,8 @@
#include <BRep_Tool.hxx>
#include <BRepAdaptor_HCompCurve.hxx>
#include <BRepAdaptor_HCurve.hxx>
#include <BRepAdaptor_CompCurve.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
#include <BRepExtrema_SupportType.hxx>
#include <BRepFill_LocationLaw.hxx>
@@ -27,7 +27,7 @@
#include <Geom_Curve.hxx>
#include <Geom_Line.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GeomConvert_CompCurveToBSplineCurve.hxx>
#include <GeomFill_LocationLaw.hxx>
#include <GeomFill_SectionPlacement.hxx>
@@ -288,8 +288,8 @@ BRepFill_SectionPlacement(const Handle(BRepFill_LocationLaw)& Law,
}
SuperKnot(1) = 0;
Handle(BRepAdaptor_HCompCurve) adpPath =
new (BRepAdaptor_HCompCurve) (myLaw->Wire());
Handle(BRepAdaptor_CompCurve) adpPath =
new (BRepAdaptor_CompCurve) (myLaw->Wire());
Place.Perform(adpPath, Precision::Confusion());

56
src/BRepFill/BRepFill_Sweep.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HCurveOnSurface.hxx>
#include <Adaptor3d_CurveOnSurface.hxx>
#include <Approx_CurveOnSurface.hxx>
#include <Approx_SameParameter.hxx>
#include <Bnd_Box.hxx>
@@ -27,9 +27,9 @@
#include <BRep_TEdge.hxx>
#include <BRep_Tool.hxx>
#include <BRep_TVertex.hxx>
#include <BRepAdaptor_HCurve.hxx>
#include <BRepAdaptor_HCurve2d.hxx>
#include <BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepAdaptor_Curve2d.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepCheck_Edge.hxx>
#include <BRepFill_CurveConstraint.hxx>
@@ -48,7 +48,7 @@
#include <Geom2d_BSplineCurve.hxx>
#include <Geom2d_Line.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2dAdaptor_HCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom_BezierCurve.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_Curve.hxx>
@@ -56,8 +56,8 @@
#include <Geom_RectangularTrimmedSurface.hxx>
#include <Geom_Surface.hxx>
#include <Geom_SurfaceOfRevolution.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <GeomAdaptor_HSurface.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomConvert_ApproxSurface.hxx>
#include <GeomFill_LocationLaw.hxx>
#include <GeomFill_SectionLaw.hxx>
@@ -271,9 +271,9 @@ static Handle(Geom2d_Curve) Couture(const TopoDS_Edge& E,
//=======================================================================
static Standard_Boolean CheckSameParameter
(const Handle(Adaptor3d_HCurve)& C3d,
(const Handle(Adaptor3d_Curve)& C3d,
const Handle(Geom2d_Curve)& Pcurv,
const Handle(Adaptor3d_HSurface)& S,
const Handle(Adaptor3d_Surface)& S,
const Standard_Real tol3d,
Standard_Real& tolreached)
{
@@ -315,13 +315,13 @@ static Standard_Boolean SameParameter(TopoDS_Edge& E,
const Standard_Real tol3d,
Standard_Real& tolreached)
{
//Handle(BRepAdaptor_HCurve) C3d = new (BRepAdaptor_HCurve)(E);
//Handle(BRepAdaptor_Curve) C3d = new (BRepAdaptor_Curve)(E);
Standard_Real f, l;
Handle(Geom_Curve) C3d = BRep_Tool::Curve( E, f, l );
GeomAdaptor_Curve GAC3d( C3d, f, l );
Handle(GeomAdaptor_HCurve) HC3d = new GeomAdaptor_HCurve( GAC3d );
Handle(GeomAdaptor_Curve) HC3d = new GeomAdaptor_Curve( GAC3d );
Handle(GeomAdaptor_HSurface) S = new (GeomAdaptor_HSurface)(Surf);
Handle(GeomAdaptor_Surface) S = new (GeomAdaptor_Surface)(Surf);
Standard_Real ResTol;
if(CheckSameParameter( HC3d, Pcurv, S, tol3d, tolreached ))
@@ -329,7 +329,7 @@ static Standard_Boolean SameParameter(TopoDS_Edge& E,
if (!HasPCurves(E))
{
Handle(Geom2dAdaptor_HCurve) HC2d = new Geom2dAdaptor_HCurve( Pcurv );
Handle(Geom2dAdaptor_Curve) HC2d = new Geom2dAdaptor_Curve( Pcurv );
Approx_CurveOnSurface AppCurve(HC2d, S, HC2d->FirstParameter(), HC2d->LastParameter(),
Precision::Confusion());
AppCurve.Perform(10, 10, GeomAbs_C1, Standard_True);
@@ -343,7 +343,7 @@ static Standard_Boolean SameParameter(TopoDS_Edge& E,
}
}
const Handle(Adaptor3d_HCurve)& aHCurve = HC3d; // to avoid ambiguity
const Handle(Adaptor3d_Curve)& aHCurve = HC3d; // to avoid ambiguity
Approx_SameParameter sp (aHCurve, Pcurv, S, tol3d );
if(sp.IsDone() && !sp.IsSameParameter()) Pcurv = sp.Curve2d();
else if(!sp.IsDone() && !sp.IsSameParameter()){
@@ -951,9 +951,9 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
// Deform the surface of revolution.
GeomPlate_BuildPlateSurface BPS;
Handle(BRepAdaptor_HSurface) AS;
Handle(BRepAdaptor_HCurve2d) AC2d;
Handle(Adaptor3d_HCurveOnSurface) HConS;
Handle(BRepAdaptor_Surface) AS;
Handle(BRepAdaptor_Curve2d) AC2d;
Handle(Adaptor3d_CurveOnSurface) HConS;
*/
Handle(Geom2d_Line) L;
gp_Pnt2d P2d(0.,0.);
@@ -1009,10 +1009,10 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
// Determine the constraints and
// their parametric localisation.
if (!E1.IsNull()) {
AS = new BRepAdaptor_HSurface(TopoDS::Face(F1));
AC2d = new BRepAdaptor_HCurve2d();
AS = new BRepAdaptor_Surface(TopoDS::Face(F1));
AC2d = new BRepAdaptor_Curve2d();
AC2d->ChangeCurve2d().Initialize(E1,TopoDS::Face(F1));
HConS = new (Adaptor3d_HCurveOnSurface)();
HConS = new (Adaptor3d_CurveOnSurface)();
HConS->ChangeCurve().Load(AC2d);
HConS->ChangeCurve().Load(AS);
@@ -1025,10 +1025,10 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
}
if (!E2.IsNull()) {
AS = new BRepAdaptor_HSurface(TopoDS::Face(F2));
AC2d = new BRepAdaptor_HCurve2d();
AS = new BRepAdaptor_Surface(TopoDS::Face(F2));
AC2d = new BRepAdaptor_Curve2d();
AC2d->ChangeCurve2d().Initialize(E2,TopoDS::Face(F2));
HConS = new (Adaptor3d_HCurveOnSurface);
HConS = new (Adaptor3d_CurveOnSurface);
HConS->ChangeCurve().Load(AC2d);
HConS->ChangeCurve().Load(AS);
@@ -1040,7 +1040,7 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
}
if (WithE3) {
Handle(BRepAdaptor_HCurve) AC = new (BRepAdaptor_HCurve) (E3);
Handle(BRepAdaptor_Curve) AC = new (BRepAdaptor_Curve) (E3);
Handle(BRepFill_CurveConstraint) Cont
= new BRepFill_CurveConstraint(AC, 0);
Cont->SetCurve2dOnSurf(C3);
@@ -1061,7 +1061,7 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
if (WithE4) {
Handle(BRepAdaptor_HCurve) AC = new (BRepAdaptor_HCurve) (E4);
Handle(BRepAdaptor_Curve) AC = new (BRepAdaptor_Curve) (E4);
Handle(BRepFill_CurveConstraint) Cont
= new BRepFill_CurveConstraint(AC, 0);
Cont->SetCurve2dOnSurf(C4);
@@ -1236,7 +1236,7 @@ static Standard_Boolean Filling(const TopoDS_Shape& EF,
// C1 = BT.CurveOnSurface(E1, TopoDS::Face(F1), f2, l2);
C1 = BRep_Tool::CurveOnSurface(E1, TopoDS::Face(F1), f2, l2);
C1->D0(aPrm[i], P2d);
Handle(BRepAdaptor_HSurface) AS = new BRepAdaptor_HSurface(TopoDS::Face(F1));
Handle(BRepAdaptor_Surface) AS = new BRepAdaptor_Surface(TopoDS::Face(F1));
AS->D1(P2d.X(), P2d.Y(), P, D1U, D1V);
N2 = D1U^D1V;
@@ -1555,9 +1555,9 @@ static TopoDS_Edge BuildEdge(const Handle(Geom_Surface)& S,
Standard_Real MaxTol = 1.e-4;
Standard_Real theTol;
GeomAdaptor_Curve GAiso(Iso);
Handle(GeomAdaptor_HCurve) GAHiso = new GeomAdaptor_HCurve(GAiso);
Handle(GeomAdaptor_Curve) GAHiso = new GeomAdaptor_Curve(GAiso);
GeomAdaptor_Surface GAsurf(S);
Handle(GeomAdaptor_HSurface) GAHsurf = new GeomAdaptor_HSurface(GAsurf);
Handle(GeomAdaptor_Surface) GAHsurf = new GeomAdaptor_Surface(GAsurf);
CheckSameParameter( GAHiso, L, GAHsurf, MaxTol, theTol);
B.UpdateEdge(E, theTol);

6
src/BRepFill/BRepFill_TrimSurfaceTool.cxx
View File

@@ -36,7 +36,7 @@
#include <Geom_Plane.hxx>
#include <Geom_SurfaceOfRevolution.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomProjLib.hxx>
#include <gp.hxx>
@@ -368,8 +368,8 @@ static void EvalParameters(const TopoDS_Edge& Edge,
//----------------------------------------------------------
Handle(Geom_SurfaceOfRevolution) GSRev =
Handle(Geom_SurfaceOfRevolution)::DownCast(GS);
Handle(GeomAdaptor_HCurve) HC =
new GeomAdaptor_HCurve(GSRev->BasisCurve());
Handle(GeomAdaptor_Curve) HC =
new GeomAdaptor_Curve(GSRev->BasisCurve());
GeomAdaptor_SurfaceOfRevolution ASRev(HC,GAS.AxeOfRevolution());
Axis = ASRev.Axis();
Phase = EvalPhase(Edge,Face,GAS,Axis);