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/Contap/Contap_ArcFunction.cxx
View File

@@ -15,8 +15,8 @@
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Contap_ArcFunction.hxx>
#include <Contap_HContTool.hxx>
#include <Contap_HCurve2dTool.hxx>
@@ -34,7 +34,7 @@ myCosAng(0.0)
}
void Contap_ArcFunction::Set(const Handle(Adaptor3d_HSurface)& S)
void Contap_ArcFunction::Set(const Handle(Adaptor3d_Surface)& S)
{
mySurf = S;
Standard_Integer i;

25
src/Contap/Contap_ArcFunction.hxx
View File

@@ -17,26 +17,13 @@
#ifndef _Contap_ArcFunction_HeaderFile
#define _Contap_ArcFunction_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Contap_TFunction.hxx>
#include <gp_Dir.hxx>
#include <gp_Pnt.hxx>
#include <TColgp_SequenceOfPnt.hxx>
#include <IntSurf_Quadric.hxx>
#include <math_FunctionWithDerivative.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
class Adaptor2d_HCurve2d;
class Adaptor3d_HSurface;
class gp_Dir;
class gp_Pnt;
class IntSurf_Quadric;
class Contap_ArcFunction : public math_FunctionWithDerivative
{
@@ -47,7 +34,7 @@ public:
Standard_EXPORT Contap_ArcFunction();
Standard_EXPORT void Set (const Handle(Adaptor3d_HSurface)& S);
Standard_EXPORT void Set (const Handle(Adaptor3d_Surface)& S);
void Set (const gp_Dir& Direction);
@@ -57,7 +44,7 @@ public:
void Set (const gp_Pnt& Eye, const Standard_Real Angle);
void Set (const Handle(Adaptor2d_HCurve2d)& A);
void Set (const Handle(Adaptor2d_Curve2d)& A);
Standard_EXPORT Standard_Boolean Value (const Standard_Real X, Standard_Real& F) Standard_OVERRIDE;
@@ -74,7 +61,7 @@ public:
Standard_EXPORT const IntSurf_Quadric& Quadric() const;
//! Returns mySurf field
const Handle(Adaptor3d_HSurface)& Surface() const;
const Handle(Adaptor3d_Surface)& Surface() const;
//! Returns the point, which has been computed
//! while the last calling Value() method
@@ -91,8 +78,8 @@ private:
Handle(Adaptor2d_HCurve2d) myArc;
Handle(Adaptor3d_HSurface) mySurf;
Handle(Adaptor2d_Curve2d) myArc;
Handle(Adaptor3d_Surface) mySurf;
Standard_Real myMean;
Contap_TFunction myType;
gp_Dir myDir;

4
src/Contap/Contap_ArcFunction.lxx
View File

@@ -42,7 +42,7 @@ inline void Contap_ArcFunction::Set(const gp_Pnt& Eye)
myEye = Eye;
}
inline void Contap_ArcFunction::Set(const Handle(Adaptor2d_HCurve2d)& A)
inline void Contap_ArcFunction::Set(const Handle(Adaptor2d_Curve2d)& A)
{
myArc = A;
seqpt.Clear();
@@ -54,7 +54,7 @@ inline const gp_Pnt& Contap_ArcFunction::Valpoint
return seqpt(Index);
}
inline const Handle(Adaptor3d_HSurface)& Contap_ArcFunction::Surface() const
inline const Handle(Adaptor3d_Surface)& Contap_ArcFunction::Surface() const
{
return(mySurf);
}

68
src/Contap/Contap_Contour.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_HSurfaceTool.hxx>
#include <Adaptor3d_TopolTool.hxx>
#include <Bnd_Box.hxx>
@@ -79,7 +79,7 @@ done(Standard_False),modeset(Standard_True)
}
Contap_Contour::Contap_Contour (const Handle(Adaptor3d_HSurface)& Surf,
Contap_Contour::Contap_Contour (const Handle(Adaptor3d_Surface)& Surf,
const Handle(Adaptor3d_TopolTool)& Domain,
const gp_Vec& Direction) :
@@ -89,7 +89,7 @@ done(Standard_False),modeset(Standard_True)
}
Contap_Contour::Contap_Contour (const Handle(Adaptor3d_HSurface)& Surf,
Contap_Contour::Contap_Contour (const Handle(Adaptor3d_Surface)& Surf,
const Handle(Adaptor3d_TopolTool)& Domain,
const gp_Vec& Direction,
const Standard_Real Angle) :
@@ -100,7 +100,7 @@ done(Standard_False),modeset(Standard_True)
}
Contap_Contour::Contap_Contour (const Handle(Adaptor3d_HSurface)& Surf,
Contap_Contour::Contap_Contour (const Handle(Adaptor3d_Surface)& Surf,
const Handle(Adaptor3d_TopolTool)& Domain,
const gp_Pnt& Eye) :
@@ -138,7 +138,7 @@ void Contap_Contour::Init (const gp_Pnt& Eye)
}
void Contap_Contour::Perform (const Handle(Adaptor3d_HSurface)& Surf,
void Contap_Contour::Perform (const Handle(Adaptor3d_Surface)& Surf,
const Handle(Adaptor3d_TopolTool)& Domain)
{
if (!modeset) {throw Standard_ConstructionError();}
@@ -166,7 +166,7 @@ void Contap_Contour::Perform (const Handle(Adaptor3d_HSurface)& Surf,
}
void Contap_Contour::Perform (const Handle(Adaptor3d_HSurface)& Surf,
void Contap_Contour::Perform (const Handle(Adaptor3d_Surface)& Surf,
const Handle(Adaptor3d_TopolTool)& Domain,
const gp_Vec& Direction)
@@ -175,7 +175,7 @@ void Contap_Contour::Perform (const Handle(Adaptor3d_HSurface)& Surf,
Perform(Surf,Domain);
}
void Contap_Contour::Perform (const Handle(Adaptor3d_HSurface)& Surf,
void Contap_Contour::Perform (const Handle(Adaptor3d_Surface)& Surf,
const Handle(Adaptor3d_TopolTool)& Domain,
const gp_Vec& Direction,
const Standard_Real Angle)
@@ -186,7 +186,7 @@ void Contap_Contour::Perform (const Handle(Adaptor3d_HSurface)& Surf,
}
void Contap_Contour::Perform (const Handle(Adaptor3d_HSurface)& Surf,
void Contap_Contour::Perform (const Handle(Adaptor3d_Surface)& Surf,
const Handle(Adaptor3d_TopolTool)& Domain,
const gp_Pnt& Eye)
@@ -235,7 +235,7 @@ static void ProcessSegments (const Contap_TheSearch&,
//-- Recherche des portions utiles sur les lignes
static void Recadre(const Handle(Adaptor3d_HSurface)& myHS1,
static void Recadre(const Handle(Adaptor3d_Surface)& myHS1,
Standard_Real& u1,
Standard_Real& v1) {
Standard_Real f,l,lmf;
@@ -282,7 +282,7 @@ static void Recadre(const Handle(Adaptor3d_HSurface)& myHS1,
static void LineConstructor(Contap_TheSequenceOfLine& slin,
const Handle(Adaptor3d_TopolTool)& Domain,
Contap_Line& L,
const Handle(Adaptor3d_HSurface)& Surf) {
const Handle(Adaptor3d_Surface)& Surf) {
//-- ------------------------------------------------------------
//-- on decoupe la ligne en portions entre 2 vertex
@@ -478,7 +478,7 @@ static void KeepInsidePoints(const Contap_TheSearchInside& solins,
Standard_Real U,V,paramproj;
gp_Pnt2d toproj,Ptproj;
Standard_Boolean projok,tokeep;
const Handle(Adaptor3d_HSurface)& Surf = Func.Surface();
const Handle(Adaptor3d_Surface)& Surf = Func.Surface();
Nbp = solins.NbPoints();
for (indp=1; indp <= Nbp; indp++) {
@@ -487,7 +487,7 @@ static void KeepInsidePoints(const Contap_TheSearchInside& solins,
pti.Parameters(U,V);
toproj = gp_Pnt2d(U,V);
for (inda = 1; inda <= Nba; inda++) {
const Handle(Adaptor2d_HCurve2d)& thearc = solrst.Segment(inda).Curve();
const Handle(Adaptor2d_Curve2d)& thearc = solrst.Segment(inda).Curve();
projok = Contap_HContTool::Project(thearc,toproj,paramproj,Ptproj);
if (projok) {
gp_Pnt pprojete = Adaptor3d_HSurfaceTool::Value(Surf,Ptproj.X(),Ptproj.Y());
@@ -530,14 +530,14 @@ static void ComputeTangency (const Contap_TheSearch& solrst,
gp_Pnt2d pt2d;
IntSurf_PathPoint PPoint;
const Handle(Adaptor3d_HSurface)& Surf = Func.Surface();
const Handle(Adaptor3d_Surface)& Surf = Func.Surface();
for (i=1; i<= NbPoints; i++) {
if (Destination(i) == 0) {
const Contap_ThePathPointOfTheSearch& PStart = solrst.Point(i);
const Handle(Adaptor2d_HCurve2d)& thearc = PStart.Arc();
const Handle(Adaptor2d_Curve2d)& thearc = PStart.Arc();
theparam = PStart.Parameter();
gp_Pnt2d Ptoproj=Contap_HCurve2dTool::Value(thearc,theparam);
//-- lbr le 15 mai 97
@@ -546,7 +546,7 @@ static void ComputeTangency (const Contap_TheSearch& solrst,
for(Standard_Integer restriction=1;
SurUneRestrictionSolution==Standard_False && restriction<=solrst.NbSegments();
restriction++) {
const Handle(Adaptor2d_HCurve2d)& thearcsol = solrst.Segment(restriction).Curve();
const Handle(Adaptor2d_Curve2d)& thearcsol = solrst.Segment(restriction).Curve();
Standard_Real paramproj;
gp_Pnt2d pproj;
Standard_Boolean projok = Contap_HContTool::Project(thearcsol,Ptoproj,paramproj,pproj);
@@ -582,7 +582,7 @@ static void ComputeTangency (const Contap_TheSearch& solrst,
if (!PStart2.IsNew()) {
const Handle(Adaptor3d_HVertex)& vtx2 = PStart2.Vertex();
if (Domain->Identical(vtx,vtx2)) {
const Handle(Adaptor2d_HCurve2d)& thearc2 = PStart2.Arc();
const Handle(Adaptor2d_Curve2d)& thearc2 = PStart2.Arc();
theparam = PStart2.Parameter();
arcorien = Domain->Orientation(thearc2);
ispassing = ispassing && (arcorien == TopAbs_INTERNAL ||
@@ -676,7 +676,7 @@ static void ComputeTangency (const Contap_TheSearch& solrst,
if (!PStart2.IsNew()) {
const Handle(Adaptor3d_HVertex)& vtx2 = PStart2.Vertex();
if (Domain->Identical(PStart.Vertex(),vtx2)) {
const Handle(Adaptor2d_HCurve2d)& thearc2 = PStart2.Arc();
const Handle(Adaptor2d_Curve2d)& thearc2 = PStart2.Arc();
theparam = PStart2.Parameter();
arcorien = Domain->Orientation(thearc2);
@@ -745,7 +745,7 @@ static void ComputeTangency (const Contap_TheSearch& solrst,
for (k=i; k <=NbPoints ; k++) {
if (Destination(k)==seqlength + 1) {
theparam = solrst.Point(k).Parameter();
const Handle(Adaptor2d_HCurve2d)& thearc2 = solrst.Point(k).Arc();
const Handle(Adaptor2d_Curve2d)& thearc2 = solrst.Point(k).Arc();
arcorien = Domain->Orientation(thearc2);
if (arcorien == TopAbs_FORWARD ||
@@ -865,7 +865,7 @@ void ProcessSegments (const Contap_TheSearch& solrst,
Standard_Integer nbedg = solrst.NbSegments();
Standard_Integer Nblines,Nbpts;
Handle(Adaptor2d_HCurve2d) arcRef;
Handle(Adaptor2d_Curve2d) arcRef;
Contap_Point ptvtx;
Contap_ThePathPointOfTheSearch PStartf,PStartl;
@@ -1022,9 +1022,9 @@ void ComputeInternalPointsOnRstr
return;
}
const Handle(Adaptor2d_HCurve2d)& thearc = Line.Arc();
const Handle(Adaptor2d_Curve2d)& thearc = Line.Arc();
const Handle(Adaptor3d_HSurface)& Surf = SFunc.Surface();
const Handle(Adaptor3d_Surface)& Surf = SFunc.Surface();
Contap_TFunction TypeFunc(SFunc.FunctionType());
Standard_Integer Nbpnts = Contap_HContTool::NbSamplesOnArc(thearc);
@@ -1173,7 +1173,7 @@ void ComputeInternalPoints
}
Standard_Integer Nbpnts = Line.NbPnts();
const Handle(Adaptor3d_HSurface)& Surf = SFunc.Surface();
const Handle(Adaptor3d_Surface)& Surf = SFunc.Surface();
Contap_TFunction TypeFunc(SFunc.FunctionType());
toler(1) = ureso; //-- Trop long !!! Adaptor3d_HSurfaceTool::UResolution(Surf,SFunc.Tolerance());
@@ -1388,7 +1388,7 @@ void Contap_Contour::Perform
// Standard_Real TolArc = 1.e-5;
Standard_Real TolArc = Precision::Confusion();
const Handle(Adaptor3d_HSurface)& Surf = mySFunc.Surface();
const Handle(Adaptor3d_Surface)& Surf = mySFunc.Surface();
Standard_Real EpsU = Adaptor3d_HSurfaceTool::UResolution(Surf,Precision::Confusion());
Standard_Real EpsV = Adaptor3d_HSurfaceTool::VResolution(Surf,Precision::Confusion());
@@ -1418,7 +1418,7 @@ void Contap_Contour::Perform
Box1OK = Standard_False;
}
else {
BndLib_AddSurface::Add(Surf->Surface(),1e-8,B1);
BndLib_AddSurface::Add (*Surf, 1e-8, B1);
}
Standard_Real x0,y0,z0,x1,y1,z1,dx,dy,dz;
if(Box1OK) {
@@ -1469,7 +1469,7 @@ void Contap_Contour::Perform
//IFV begin
if(solrst.NbSegments() <= 0) {
if(mySFunc.FunctionType() == Contap_ContourStd) {
const Handle(Adaptor3d_HSurface)& SurfToCheck = mySFunc.Surface();
const Handle(Adaptor3d_Surface)& SurfToCheck = mySFunc.Surface();
if(Adaptor3d_HSurfaceTool::GetType(SurfToCheck) == GeomAbs_Torus) {
gp_Torus aTor = Adaptor3d_HSurfaceTool::Torus(SurfToCheck);
gp_Dir aTorDir = aTor.Axis().Direction();
@@ -1534,7 +1534,7 @@ void Contap_Contour::Perform
ptdeb.SetParameter(1.0);
const Contap_ThePathPointOfTheSearch& PStart = solrst.Point(i);
const Handle(Adaptor2d_HCurve2d)& currentarc = PStart.Arc();
const Handle(Adaptor2d_Curve2d)& currentarc = PStart.Arc();
currentparam = PStart.Parameter();
if (!iwline->IsTangentAtBegining()) {
@@ -1581,7 +1581,7 @@ void Contap_Contour::Perform
ptfin.SetValue(PPoint.Value(),U,V);
ptfin.SetParameter((Standard_Real)(Nbpts));
const Contap_ThePathPointOfTheSearch& PStart = solrst.Point(i);
const Handle(Adaptor2d_HCurve2d)& currentarc = PStart.Arc();
const Handle(Adaptor2d_Curve2d)& currentarc = PStart.Arc();
currentparam = PStart.Parameter();
if (!iwline->IsTangentAtEnd()) {
@@ -1675,7 +1675,7 @@ void Contap_Contour::Perform
Standard_Boolean projok;
for (k=1; k<=Nblines;k++) {
if (slin(k).TypeContour() == Contap_Restriction) {
const Handle(Adaptor2d_HCurve2d)& thearc = slin(k).Arc();
const Handle(Adaptor2d_Curve2d)& thearc = slin(k).Arc();
Standard_Real paramproj;
gp_Pnt2d Ptproj;
projok = Contap_HContTool::Project(thearc,toproj,paramproj,Ptproj);
@@ -1737,7 +1737,7 @@ void Contap_Contour::Perform
}
static Standard_Boolean FindLine(Contap_Line& Line,
const Handle(Adaptor3d_HSurface)& Surf,
const Handle(Adaptor3d_Surface)& Surf,
const gp_Pnt2d& Pt2d,
gp_Pnt& Ptref,
Standard_Real& Paramin,
@@ -1780,7 +1780,7 @@ static Standard_Boolean FindLine(Contap_Line& Line,
static void PutPointsOnLine (const Contap_TheSearch& solrst,
const Handle(Adaptor3d_HSurface)& Surf,
const Handle(Adaptor3d_Surface)& Surf,
Contap_TheSequenceOfLine& slin)
{
@@ -1806,7 +1806,7 @@ static void PutPointsOnLine (const Contap_TheSearch& solrst,
for (i=1; i<= NbPoints; i++) {
const Contap_ThePathPointOfTheSearch& PStart = solrst.Point(i);
const Handle(Adaptor2d_HCurve2d)& thearc = PStart.Arc();
const Handle(Adaptor2d_Curve2d)& thearc = PStart.Arc();
theparam = PStart.Parameter();
Contap_HCurve2dTool::D1(thearc,theparam,pt2d,d2d);
@@ -1862,7 +1862,7 @@ IntSurf_TypeTrans ComputeTransitionOngpLine
(Contap_SurfFunction& SFunc,
const gp_Lin& L)
{
const Handle(Adaptor3d_HSurface)& Surf=SFunc.Surface();
const Handle(Adaptor3d_Surface)& Surf=SFunc.Surface();
GeomAbs_SurfaceType typS = Adaptor3d_HSurfaceTool::GetType(Surf);
gp_Pnt P;
gp_Vec T;
@@ -1892,7 +1892,7 @@ IntSurf_TypeTrans ComputeTransitionOngpCircle
(Contap_SurfFunction& SFunc,
const gp_Circ& C)
{
const Handle(Adaptor3d_HSurface)& Surf=SFunc.Surface();
const Handle(Adaptor3d_Surface)& Surf=SFunc.Surface();
GeomAbs_SurfaceType typS = Adaptor3d_HSurfaceTool::GetType(Surf);
gp_Pnt P;
gp_Vec T;
@@ -1931,7 +1931,7 @@ void Contap_Contour::PerformAna(const Handle(Adaptor3d_TopolTool)& Domain)
//gp_Lin linsol;
Contap_ContAna contana;
Contap_Line theline;
const Handle(Adaptor3d_HSurface)& Surf = mySFunc.Surface();
const Handle(Adaptor3d_Surface)& Surf = mySFunc.Surface();
Contap_TFunction TypeFunc(mySFunc.FunctionType());
Standard_Boolean PerformSolRst = Standard_True;

31
src/Contap/Contap_Contour.hxx
View File

@@ -17,29 +17,16 @@
#ifndef _Contap_Contour_HeaderFile
#define _Contap_Contour_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Boolean.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Contap_TheSequenceOfLine.hxx>
#include <Contap_TheSearch.hxx>
#include <Contap_TheSearchInside.hxx>
#include <Contap_SurfFunction.hxx>
#include <Contap_ArcFunction.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
class StdFail_NotDone;
class Standard_OutOfRange;
class Standard_ConstructionError;
class gp_Vec;
class gp_Pnt;
class Adaptor3d_HSurface;
class Adaptor3d_TopolTool;
class Contap_Line;
class Contap_SurfFunction;
class Contap_Contour
{
@@ -57,25 +44,25 @@ public:
Standard_EXPORT Contap_Contour(const gp_Pnt& Eye);
//! Creates the contour in a given direction.
Standard_EXPORT Contap_Contour(const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction);
Standard_EXPORT Contap_Contour(const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction);
//! Creates the contour in a given direction.
Standard_EXPORT Contap_Contour(const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction, const Standard_Real Angle);
Standard_EXPORT Contap_Contour(const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction, const Standard_Real Angle);
//! Creates the contour for a perspective view.
Standard_EXPORT Contap_Contour(const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Pnt& Eye);
Standard_EXPORT Contap_Contour(const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Pnt& Eye);
//! Creates the contour in a given direction.
Standard_EXPORT void Perform (const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain);
Standard_EXPORT void Perform (const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain);
//! Creates the contour in a given direction.
Standard_EXPORT void Perform (const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction);
Standard_EXPORT void Perform (const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction);
//! Creates the contour in a given direction.
Standard_EXPORT void Perform (const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction, const Standard_Real Angle);
Standard_EXPORT void Perform (const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Vec& Direction, const Standard_Real Angle);
//! Creates the contour for a perspective view.
Standard_EXPORT void Perform (const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Pnt& Eye);
Standard_EXPORT void Perform (const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain, const gp_Pnt& Eye);
Standard_EXPORT void Init (const gp_Vec& Direction);

42
src/Contap/Contap_HContTool.cxx
View File

@@ -15,8 +15,8 @@
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_HVertex.hxx>
#include <Contap_HContTool.hxx>
#include <Extrema_EPCOfExtPC2d.hxx>
@@ -27,7 +27,7 @@
static Standard_Real uinf,vinf,usup,vsup;
Standard_Integer Contap_HContTool::NbSamplesV
(const Handle(Adaptor3d_HSurface)& S,
(const Handle(Adaptor3d_Surface)& S,
const Standard_Real ,
const Standard_Real )
{
@@ -74,7 +74,7 @@ Standard_Integer Contap_HContTool::NbSamplesV
}
Standard_Integer Contap_HContTool::NbSamplesU
(const Handle(Adaptor3d_HSurface)& S,
(const Handle(Adaptor3d_Surface)& S,
const Standard_Real ,
const Standard_Real )
{
@@ -125,7 +125,7 @@ Standard_Integer Contap_HContTool::NbSamplesU
}
Standard_Integer Contap_HContTool::NbSamplePoints
(const Handle(Adaptor3d_HSurface)& S)
(const Handle(Adaptor3d_Surface)& S)
{
uinf = S->FirstUParameter();
usup = S->LastUParameter();
@@ -172,7 +172,7 @@ Standard_Integer Contap_HContTool::NbSamplePoints
return 5;
}
void Contap_HContTool::SamplePoint (const Handle(Adaptor3d_HSurface)& S,
void Contap_HContTool::SamplePoint (const Handle(Adaptor3d_Surface)& S,
const Standard_Integer Index,
Standard_Real& U,
Standard_Real& V )
@@ -219,7 +219,7 @@ void Contap_HContTool::SamplePoint (const Handle(Adaptor3d_HSurface)& S,
Standard_Integer Contap_HContTool::NbSamplesOnArc
(const Handle(Adaptor2d_HCurve2d)& A) {
(const Handle(Adaptor2d_Curve2d)& A) {
GeomAbs_CurveType CurveType = A->GetType();
@@ -249,7 +249,7 @@ Standard_Integer Contap_HContTool::NbSamplesOnArc
}
void Contap_HContTool::Bounds(const Handle(Adaptor2d_HCurve2d)& A,
void Contap_HContTool::Bounds(const Handle(Adaptor2d_Curve2d)& A,
Standard_Real& Ufirst,
Standard_Real& Ulast)
{
@@ -258,7 +258,7 @@ void Contap_HContTool::Bounds(const Handle(Adaptor2d_HCurve2d)& A,
}
Standard_Boolean Contap_HContTool::Project (const Handle(Adaptor2d_HCurve2d)& C,
Standard_Boolean Contap_HContTool::Project (const Handle(Adaptor2d_Curve2d)& C,
const gp_Pnt2d& P,
Standard_Real& Paramproj,
gp_Pnt2d& Ptproj)
@@ -270,7 +270,7 @@ Standard_Boolean Contap_HContTool::Project (const Handle(Adaptor2d_HCurve2d)& C,
Standard_Real Tol = 1.e-5;
Standard_Real Dist2;
Extrema_EPCOfExtPC2d extrema(P,C->Curve2d(),Nbu,epsX,Tol);
Extrema_EPCOfExtPC2d extrema (P, *C, Nbu, epsX, Tol);
if (!extrema.IsDone()) {
return Standard_False;
}
@@ -293,14 +293,14 @@ Standard_Boolean Contap_HContTool::Project (const Handle(Adaptor2d_HCurve2d)& C,
Standard_Real Contap_HContTool::Tolerance (const Handle(Adaptor3d_HVertex)& V,
const Handle(Adaptor2d_HCurve2d)& C)
const Handle(Adaptor2d_Curve2d)& C)
{
// return BRepAdaptor2d_Curve2dTool::Resolution(C,BRep_Tool::Tolerance(V));
return V->Resolution(C);
}
Standard_Real Contap_HContTool::Parameter (const Handle(Adaptor3d_HVertex)& V,
const Handle(Adaptor2d_HCurve2d)& C)
const Handle(Adaptor2d_Curve2d)& C)
{
// return BRep_Tool::Parameter(V,C.Edge());
return V->Parameter(C);
@@ -309,17 +309,17 @@ Standard_Real Contap_HContTool::Parameter (const Handle(Adaptor3d_HVertex)& V,
Standard_Boolean Contap_HContTool::HasBeenSeen
(const Handle(Adaptor2d_HCurve2d)&)
(const Handle(Adaptor2d_Curve2d)&)
{
return Standard_False;
}
Standard_Integer Contap_HContTool::NbPoints(const Handle(Adaptor2d_HCurve2d)&)
Standard_Integer Contap_HContTool::NbPoints(const Handle(Adaptor2d_Curve2d)&)
{
return 0;
}
void Contap_HContTool::Value(const Handle(Adaptor2d_HCurve2d)&,
void Contap_HContTool::Value(const Handle(Adaptor2d_Curve2d)&,
const Standard_Integer,
gp_Pnt&,
Standard_Real&,
@@ -328,26 +328,26 @@ void Contap_HContTool::Value(const Handle(Adaptor2d_HCurve2d)&,
throw Standard_OutOfRange();
}
Standard_Boolean Contap_HContTool::IsVertex(const Handle(Adaptor2d_HCurve2d)&,
Standard_Boolean Contap_HContTool::IsVertex(const Handle(Adaptor2d_Curve2d)&,
const Standard_Integer)
{
return Standard_False;
}
void Contap_HContTool::Vertex(const Handle(Adaptor2d_HCurve2d)&,
void Contap_HContTool::Vertex(const Handle(Adaptor2d_Curve2d)&,
const Standard_Integer,
Handle(Adaptor3d_HVertex)&)
{
throw Standard_OutOfRange();
}
Standard_Integer Contap_HContTool::NbSegments(const Handle(Adaptor2d_HCurve2d)&)
Standard_Integer Contap_HContTool::NbSegments(const Handle(Adaptor2d_Curve2d)&)
{
return 0;
}
Standard_Boolean Contap_HContTool::HasFirstPoint
(const Handle(Adaptor2d_HCurve2d)&,
(const Handle(Adaptor2d_Curve2d)&,
const Standard_Integer,
Standard_Integer&)
{
@@ -355,7 +355,7 @@ Standard_Boolean Contap_HContTool::HasFirstPoint
}
Standard_Boolean Contap_HContTool::HasLastPoint
(const Handle(Adaptor2d_HCurve2d)&,
(const Handle(Adaptor2d_Curve2d)&,
const Standard_Integer,
Standard_Integer&)
{
@@ -363,7 +363,7 @@ Standard_Boolean Contap_HContTool::HasLastPoint
}
Standard_Boolean Contap_HContTool::IsAllSolution
(const Handle(Adaptor2d_HCurve2d)&)
(const Handle(Adaptor2d_Curve2d)&)
{
return Standard_False;

46
src/Contap/Contap_HContTool.hxx
View File

@@ -17,15 +17,9 @@
#ifndef _Contap_HContTool_HeaderFile
#define _Contap_HContTool_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
class Adaptor3d_HSurface;
class Adaptor2d_HCurve2d;
class gp_Pnt2d;
class Adaptor3d_HVertex;
class gp_Pnt;
@@ -40,31 +34,31 @@ public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT static Standard_Integer NbSamplesU (const Handle(Adaptor3d_HSurface)& S, const Standard_Real u1, const Standard_Real u2);
Standard_EXPORT static Standard_Integer NbSamplesU (const Handle(Adaptor3d_Surface)& S, const Standard_Real u1, const Standard_Real u2);
Standard_EXPORT static Standard_Integer NbSamplesV (const Handle(Adaptor3d_HSurface)& S, const Standard_Real v1, const Standard_Real v2);
Standard_EXPORT static Standard_Integer NbSamplesV (const Handle(Adaptor3d_Surface)& S, const Standard_Real v1, const Standard_Real v2);
Standard_EXPORT static Standard_Integer NbSamplePoints (const Handle(Adaptor3d_HSurface)& S);
Standard_EXPORT static Standard_Integer NbSamplePoints (const Handle(Adaptor3d_Surface)& S);
Standard_EXPORT static void SamplePoint (const Handle(Adaptor3d_HSurface)& S, const Standard_Integer Index, Standard_Real& U, Standard_Real& V);
Standard_EXPORT static void SamplePoint (const Handle(Adaptor3d_Surface)& S, const Standard_Integer Index, Standard_Real& U, Standard_Real& V);
//! Returns True if all the intersection point and edges
//! are known on the Arc.
//! The intersection point are given as vertices.
//! The intersection edges are given as intervals between
//! two vertices.
Standard_EXPORT static Standard_Boolean HasBeenSeen (const Handle(Adaptor2d_HCurve2d)& C);
Standard_EXPORT static Standard_Boolean HasBeenSeen (const Handle(Adaptor2d_Curve2d)& C);
//! returns the number of points which is used to make
//! a sample on the arc. this number is a function of
//! the Surface and the CurveOnSurface complexity.
Standard_EXPORT static Standard_Integer NbSamplesOnArc (const Handle(Adaptor2d_HCurve2d)& A);
Standard_EXPORT static Standard_Integer NbSamplesOnArc (const Handle(Adaptor2d_Curve2d)& A);
//! Returns the parametric limits on the arc C.
//! These limits must be finite : they are either
//! the real limits of the arc, for a finite arc,
//! or a bounding box for an infinite arc.
Standard_EXPORT static void Bounds (const Handle(Adaptor2d_HCurve2d)& C, Standard_Real& Ufirst, Standard_Real& Ulast);
Standard_EXPORT static void Bounds (const Handle(Adaptor2d_Curve2d)& C, Standard_Real& Ufirst, Standard_Real& Ulast);
//! Projects the point P on the arc C.
//! If the methods returns Standard_True, the projection is
@@ -72,36 +66,36 @@ public:
//! of the projected point, Ptproj is the projected Point.
//! If the method returns Standard_False, Param proj and Ptproj
//! are not significant.
Standard_EXPORT static Standard_Boolean Project (const Handle(Adaptor2d_HCurve2d)& C, const gp_Pnt2d& P, Standard_Real& Paramproj, gp_Pnt2d& Ptproj);
Standard_EXPORT static Standard_Boolean Project (const Handle(Adaptor2d_Curve2d)& C, const gp_Pnt2d& P, Standard_Real& Paramproj, gp_Pnt2d& Ptproj);
//! Returns the parametric tolerance used to consider
//! that the vertex and another point meet, i-e
//! if Abs(parameter(Vertex) - parameter(OtherPnt))<=
//! Tolerance, the points are "merged".
Standard_EXPORT static Standard_Real Tolerance (const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_HCurve2d)& C);
Standard_EXPORT static Standard_Real Tolerance (const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_Curve2d)& C);
//! Returns the parameter of the vertex V on the arc A.
Standard_EXPORT static Standard_Real Parameter (const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_HCurve2d)& C);
Standard_EXPORT static Standard_Real Parameter (const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_Curve2d)& C);
//! Returns the number of intersection points on the arc A.
Standard_EXPORT static Standard_Integer NbPoints (const Handle(Adaptor2d_HCurve2d)& C);
Standard_EXPORT static Standard_Integer NbPoints (const Handle(Adaptor2d_Curve2d)& C);
//! Returns the value (Pt), the tolerance (Tol), and
//! the parameter (U) on the arc A , of the intersection
//! point of range Index.
Standard_EXPORT static void Value (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Integer Index, gp_Pnt& Pt, Standard_Real& Tol, Standard_Real& U);
Standard_EXPORT static void Value (const Handle(Adaptor2d_Curve2d)& C, const Standard_Integer Index, gp_Pnt& Pt, Standard_Real& Tol, Standard_Real& U);
//! Returns True if the intersection point of range Index
//! corresponds with a vertex on the arc A.
Standard_EXPORT static Standard_Boolean IsVertex (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Integer Index);
Standard_EXPORT static Standard_Boolean IsVertex (const Handle(Adaptor2d_Curve2d)& C, const Standard_Integer Index);
//! When IsVertex returns True, this method returns the
//! vertex on the arc A.
Standard_EXPORT static void Vertex (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Integer Index, Handle(Adaptor3d_HVertex)& V);
Standard_EXPORT static void Vertex (const Handle(Adaptor2d_Curve2d)& C, const Standard_Integer Index, Handle(Adaptor3d_HVertex)& V);
//! returns the number of part of A solution of the
//! of intersection problem.
Standard_EXPORT static Standard_Integer NbSegments (const Handle(Adaptor2d_HCurve2d)& C);
Standard_EXPORT static Standard_Integer NbSegments (const Handle(Adaptor2d_Curve2d)& C);
//! Returns True when the segment of range Index is not
//! open at the left side. In that case, IndFirst is the
@@ -109,7 +103,7 @@ public:
//! of the one which defines the left bound of the segment.
//! Otherwise, the method has to return False, and IndFirst
//! has no meaning.
Standard_EXPORT static Standard_Boolean HasFirstPoint (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Integer Index, Standard_Integer& IndFirst);
Standard_EXPORT static Standard_Boolean HasFirstPoint (const Handle(Adaptor2d_Curve2d)& C, const Standard_Integer Index, Standard_Integer& IndFirst);
//! Returns True when the segment of range Index is not
//! open at the right side. In that case, IndLast is the
@@ -117,11 +111,11 @@ public:
//! of the one which defines the right bound of the segment.
//! Otherwise, the method has to return False, and IndLast
//! has no meaning.
Standard_EXPORT static Standard_Boolean HasLastPoint (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Integer Index, Standard_Integer& IndLast);
Standard_EXPORT static Standard_Boolean HasLastPoint (const Handle(Adaptor2d_Curve2d)& C, const Standard_Integer Index, Standard_Integer& IndLast);
//! Returns True when the whole restriction is solution
//! of the intersection problem.
Standard_EXPORT static Standard_Boolean IsAllSolution (const Handle(Adaptor2d_HCurve2d)& C);
Standard_EXPORT static Standard_Boolean IsAllSolution (const Handle(Adaptor2d_Curve2d)& C);

4
src/Contap/Contap_HCurve2dTool.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Contap_HCurve2dTool.hxx>
#include <Geom2d_BezierCurve.hxx>
#include <Geom2d_BSplineCurve.hxx>
@@ -26,7 +26,7 @@
#include <Standard_OutOfRange.hxx>
//============================================================
Standard_Integer Contap_HCurve2dTool::NbSamples (const Handle(Adaptor2d_HCurve2d)& C,
Standard_Integer Contap_HCurve2dTool::NbSamples (const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real U0,
const Standard_Real U1)
{

49
src/Contap/Contap_HCurve2dTool.hxx
View File

@@ -37,7 +37,6 @@
class Standard_OutOfRange;
class Standard_NoSuchObject;
class Standard_DomainError;
class Adaptor2d_HCurve2d;
class gp_Pnt2d;
class gp_Vec2d;
class Geom2d_BezierCurve;
@@ -52,54 +51,54 @@ public:
DEFINE_STANDARD_ALLOC
static Standard_Real FirstParameter (const Handle(Adaptor2d_HCurve2d)& C);
static Standard_Real FirstParameter (const Handle(Adaptor2d_Curve2d)& C);
static Standard_Real LastParameter (const Handle(Adaptor2d_HCurve2d)& C);
static Standard_Real LastParameter (const Handle(Adaptor2d_Curve2d)& C);
static GeomAbs_Shape Continuity (const Handle(Adaptor2d_HCurve2d)& C);
static GeomAbs_Shape Continuity (const Handle(Adaptor2d_Curve2d)& C);
//! Returns the number of intervals for continuity
//! <S>. May be one if Continuity(myclass) >= <S>
static Standard_Integer NbIntervals (const Handle(Adaptor2d_HCurve2d)& C, const GeomAbs_Shape S);
static Standard_Integer NbIntervals (const Handle(Adaptor2d_Curve2d)& C, const GeomAbs_Shape S);
//! Stores in <T> the parameters bounding the intervals
//! of continuity <S>.
//!
//! The array must provide enough room to accommodate
//! for the parameters. i.e. T.Length() > NbIntervals()
static void Intervals (const Handle(Adaptor2d_HCurve2d)& C, TColStd_Array1OfReal& T, const GeomAbs_Shape S);
static void Intervals (const Handle(Adaptor2d_Curve2d)& C, TColStd_Array1OfReal& T, const GeomAbs_Shape S);
static Standard_Boolean IsClosed (const Handle(Adaptor2d_HCurve2d)& C);
static Standard_Boolean IsClosed (const Handle(Adaptor2d_Curve2d)& C);
static Standard_Boolean IsPeriodic (const Handle(Adaptor2d_HCurve2d)& C);
static Standard_Boolean IsPeriodic (const Handle(Adaptor2d_Curve2d)& C);
static Standard_Real Period (const Handle(Adaptor2d_HCurve2d)& C);
static Standard_Real Period (const Handle(Adaptor2d_Curve2d)& C);
//! Computes the point of parameter U on the curve.
static gp_Pnt2d Value (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real U);
static gp_Pnt2d Value (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real U);
//! Computes the point of parameter U on the curve.
static void D0 (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real U, gp_Pnt2d& P);
static void D0 (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real U, gp_Pnt2d& P);
//! Computes the point of parameter U on the curve with its
//! first derivative.
//! Raised if the continuity of the current interval
//! is not C1.
static void D1 (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V);
static void D1 (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V);
//! Returns the point P of parameter U, the first and second
//! derivatives V1 and V2.
//! Raised if the continuity of the current interval
//! is not C2.
static void D2 (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2);
static void D2 (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2);
//! Returns the point P of parameter U, the first, the second
//! and the third derivative.
//! Raised if the continuity of the current interval
//! is not C3.
static void D3 (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3);
static void D3 (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1, gp_Vec2d& V2, gp_Vec2d& V3);
//! The returned vector gives the value of the derivative for the
@@ -107,32 +106,32 @@ public:
//! Raised if the continuity of the current interval
//! is not CN.
//! Raised if N < 1.
static gp_Vec2d DN (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real U, const Standard_Integer N);
static gp_Vec2d DN (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real U, const Standard_Integer N);
//! Returns the parametric resolution corresponding
//! to the real space resolution <R3d>.
static Standard_Real Resolution (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real R3d);
static Standard_Real Resolution (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real R3d);
//! Returns the type of the curve in the current
//! interval : Line, Circle, Ellipse, Hyperbola,
//! Parabola, BezierCurve, BSplineCurve, OtherCurve.
static GeomAbs_CurveType GetType (const Handle(Adaptor2d_HCurve2d)& C);
static GeomAbs_CurveType GetType (const Handle(Adaptor2d_Curve2d)& C);
static gp_Lin2d Line (const Handle(Adaptor2d_HCurve2d)& C);
static gp_Lin2d Line (const Handle(Adaptor2d_Curve2d)& C);
static gp_Circ2d Circle (const Handle(Adaptor2d_HCurve2d)& C);
static gp_Circ2d Circle (const Handle(Adaptor2d_Curve2d)& C);
static gp_Elips2d Ellipse (const Handle(Adaptor2d_HCurve2d)& C);
static gp_Elips2d Ellipse (const Handle(Adaptor2d_Curve2d)& C);
static gp_Hypr2d Hyperbola (const Handle(Adaptor2d_HCurve2d)& C);
static gp_Hypr2d Hyperbola (const Handle(Adaptor2d_Curve2d)& C);
static gp_Parab2d Parabola (const Handle(Adaptor2d_HCurve2d)& C);
static gp_Parab2d Parabola (const Handle(Adaptor2d_Curve2d)& C);
static Handle(Geom2d_BezierCurve) Bezier (const Handle(Adaptor2d_HCurve2d)& C);
static Handle(Geom2d_BezierCurve) Bezier (const Handle(Adaptor2d_Curve2d)& C);
static Handle(Geom2d_BSplineCurve) BSpline (const Handle(Adaptor2d_HCurve2d)& C);
static Handle(Geom2d_BSplineCurve) BSpline (const Handle(Adaptor2d_Curve2d)& C);
Standard_EXPORT static Standard_Integer NbSamples (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real U0, const Standard_Real U1);
Standard_EXPORT static Standard_Integer NbSamples (const Handle(Adaptor2d_Curve2d)& C, const Standard_Real U0, const Standard_Real U1);

48
src/Contap/Contap_HCurve2dTool.lxx
View File

@@ -14,7 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <GeomAbs_CurveType.hxx>
#include <GeomAbs_Shape.hxx>
@@ -33,59 +33,59 @@
#include <TColStd_Array1OfReal.hxx>
//============================================================
inline Standard_Real Contap_HCurve2dTool::FirstParameter (const Handle(Adaptor2d_HCurve2d)& C) {
inline Standard_Real Contap_HCurve2dTool::FirstParameter (const Handle(Adaptor2d_Curve2d)& C) {
return(C->FirstParameter());
}
//============================================================
inline Standard_Real Contap_HCurve2dTool::LastParameter (const Handle(Adaptor2d_HCurve2d)& C) {
inline Standard_Real Contap_HCurve2dTool::LastParameter (const Handle(Adaptor2d_Curve2d)& C) {
return(C->LastParameter());
}
//============================================================
inline GeomAbs_Shape Contap_HCurve2dTool::Continuity (const Handle(Adaptor2d_HCurve2d)& C) {
inline GeomAbs_Shape Contap_HCurve2dTool::Continuity (const Handle(Adaptor2d_Curve2d)& C) {
return(C->Continuity());
}
//============================================================
inline Standard_Integer Contap_HCurve2dTool::NbIntervals(const Handle(Adaptor2d_HCurve2d)& C,const GeomAbs_Shape Sh) {
inline Standard_Integer Contap_HCurve2dTool::NbIntervals(const Handle(Adaptor2d_Curve2d)& C,const GeomAbs_Shape Sh) {
return(C->NbIntervals(Sh));
}
//============================================================
inline void Contap_HCurve2dTool::Intervals(const Handle(Adaptor2d_HCurve2d)& C,
inline void Contap_HCurve2dTool::Intervals(const Handle(Adaptor2d_Curve2d)& C,
TColStd_Array1OfReal& Tab,
const GeomAbs_Shape Sh) {
C->Intervals(Tab,Sh);
}
//============================================================
inline Standard_Boolean Contap_HCurve2dTool::IsClosed(const Handle(Adaptor2d_HCurve2d)& C) {
inline Standard_Boolean Contap_HCurve2dTool::IsClosed(const Handle(Adaptor2d_Curve2d)& C) {
return(C->IsClosed());
}
//============================================================
inline Standard_Boolean Contap_HCurve2dTool::IsPeriodic(const Handle(Adaptor2d_HCurve2d)& C) {
inline Standard_Boolean Contap_HCurve2dTool::IsPeriodic(const Handle(Adaptor2d_Curve2d)& C) {
return(C->IsPeriodic());
}
//============================================================
inline Standard_Real Contap_HCurve2dTool::Period(const Handle(Adaptor2d_HCurve2d)& C) {
inline Standard_Real Contap_HCurve2dTool::Period(const Handle(Adaptor2d_Curve2d)& C) {
return(C->Period());
}
//============================================================
inline gp_Pnt2d Contap_HCurve2dTool::Value (const Handle(Adaptor2d_HCurve2d)& C,
inline gp_Pnt2d Contap_HCurve2dTool::Value (const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real U) {
return(C->Value(U));
}
//============================================================
inline void Contap_HCurve2dTool::D0(const Handle(Adaptor2d_HCurve2d)& C,
inline void Contap_HCurve2dTool::D0(const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real U,
gp_Pnt2d& P) {
C->D0(U,P);
}
//============================================================
inline void Contap_HCurve2dTool::D1 (const Handle(Adaptor2d_HCurve2d)& C,
inline void Contap_HCurve2dTool::D1 (const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real U,
gp_Pnt2d& P,
gp_Vec2d& T) {
C->D1(U,P,T);
}
//============================================================
inline void Contap_HCurve2dTool::D2 (const Handle(Adaptor2d_HCurve2d)& C,
inline void Contap_HCurve2dTool::D2 (const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real U,
gp_Pnt2d& P,
gp_Vec2d& T,
@@ -94,7 +94,7 @@ inline void Contap_HCurve2dTool::D2 (const Handle(Adaptor2d_HCurve2d)& C,
C->D2(U,P,T,N);
}
//============================================================
inline void Contap_HCurve2dTool::D3 (const Handle(Adaptor2d_HCurve2d)& C,
inline void Contap_HCurve2dTool::D3 (const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real U,
gp_Pnt2d& P,
gp_Vec2d& V1,
@@ -104,47 +104,47 @@ inline void Contap_HCurve2dTool::D3 (const Handle(Adaptor2d_HCurve2d)& C,
C->D3(U,P,V1,V2,V3);
}
//============================================================
inline gp_Vec2d Contap_HCurve2dTool::DN (const Handle(Adaptor2d_HCurve2d)& C,
inline gp_Vec2d Contap_HCurve2dTool::DN (const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real U,
const Standard_Integer N) {
return(C->DN(U,N));
}
//============================================================
inline Standard_Real Contap_HCurve2dTool::Resolution(const Handle(Adaptor2d_HCurve2d)& C,
inline Standard_Real Contap_HCurve2dTool::Resolution(const Handle(Adaptor2d_Curve2d)& C,
const Standard_Real R3d) {
return(C->Resolution(R3d));
}
//============================================================
inline GeomAbs_CurveType Contap_HCurve2dTool::GetType(const Handle(Adaptor2d_HCurve2d)& C) {
inline GeomAbs_CurveType Contap_HCurve2dTool::GetType(const Handle(Adaptor2d_Curve2d)& C) {
return(C->GetType());
}
//============================================================
inline gp_Lin2d Contap_HCurve2dTool::Line (const Handle(Adaptor2d_HCurve2d)& C) {
inline gp_Lin2d Contap_HCurve2dTool::Line (const Handle(Adaptor2d_Curve2d)& C) {
return(C->Line());
}
//============================================================
inline gp_Circ2d Contap_HCurve2dTool::Circle (const Handle(Adaptor2d_HCurve2d)& C) {
inline gp_Circ2d Contap_HCurve2dTool::Circle (const Handle(Adaptor2d_Curve2d)& C) {
return(C->Circle());
}
//============================================================
inline gp_Elips2d Contap_HCurve2dTool::Ellipse (const Handle(Adaptor2d_HCurve2d)& C) {
inline gp_Elips2d Contap_HCurve2dTool::Ellipse (const Handle(Adaptor2d_Curve2d)& C) {
return(C->Ellipse());
}
//============================================================
inline gp_Parab2d Contap_HCurve2dTool::Parabola (const Handle(Adaptor2d_HCurve2d)& C) {
inline gp_Parab2d Contap_HCurve2dTool::Parabola (const Handle(Adaptor2d_Curve2d)& C) {
return(C->Parabola());
}
//============================================================
inline gp_Hypr2d Contap_HCurve2dTool::Hyperbola (const Handle(Adaptor2d_HCurve2d)& C) {
inline gp_Hypr2d Contap_HCurve2dTool::Hyperbola (const Handle(Adaptor2d_Curve2d)& C) {
return(C->Hyperbola());
}
//============================================================
inline Handle(Geom2d_BezierCurve) Contap_HCurve2dTool::Bezier (const Handle(Adaptor2d_HCurve2d)& C) {
inline Handle(Geom2d_BezierCurve) Contap_HCurve2dTool::Bezier (const Handle(Adaptor2d_Curve2d)& C) {
return(C->Bezier());
}
//============================================================
inline Handle(Geom2d_BSplineCurve) Contap_HCurve2dTool::BSpline (const Handle(Adaptor2d_HCurve2d)& C) {
inline Handle(Geom2d_BSplineCurve) Contap_HCurve2dTool::BSpline (const Handle(Adaptor2d_Curve2d)& C) {
return(C->BSpline());
}
//============================================================

6
src/Contap/Contap_Line.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Contap_Line.hxx>
#include <Contap_Point.hxx>
#include <gp_Circ.hxx>
@@ -79,7 +79,7 @@ void Contap_Line::SetValue(const gp_Circ& C)
typL = Contap_Circle;
}
void Contap_Line::SetValue(const Handle(Adaptor2d_HCurve2d)& A)
void Contap_Line::SetValue(const Handle(Adaptor2d_Curve2d)& A)
{
thearc = A;
typL = Contap_Restriction;
@@ -98,7 +98,7 @@ IntSurf_TypeTrans Contap_Line::TransitionOnS() const {
return(Trans);
}
const Handle(Adaptor2d_HCurve2d)& Contap_Line::Arc () const
const Handle(Adaptor2d_Curve2d)& Contap_Line::Arc () const
{
if (typL != Contap_Restriction) {throw Standard_DomainError();}
return thearc;

7
src/Contap/Contap_Line.hxx
View File

@@ -31,7 +31,6 @@
#include <gp_Lin.hxx>
#include <gp_Circ.hxx>
class IntSurf_LineOn2S;
class Adaptor2d_HCurve2d;
class Standard_DomainError;
class Standard_OutOfRange;
class IntSurf_PntOn2S;
@@ -64,7 +63,7 @@ public:
Standard_EXPORT void SetValue (const gp_Circ& C);
Standard_EXPORT void SetValue (const Handle(Adaptor2d_HCurve2d)& A);
Standard_EXPORT void SetValue (const Handle(Adaptor2d_Curve2d)& A);
Standard_EXPORT void Add (const Contap_Point& P);
@@ -85,7 +84,7 @@ public:
gp_Circ Circle() const;
Standard_EXPORT const Handle(Adaptor2d_HCurve2d)& Arc() const;
Standard_EXPORT const Handle(Adaptor2d_Curve2d)& Arc() const;
//! Set The Tansition of the line.
Standard_EXPORT void SetTransitionOnS (const IntSurf_TypeTrans T);
@@ -110,7 +109,7 @@ private:
IntSurf_TypeTrans Trans;
Handle(IntSurf_LineOn2S) curv;
Handle(Contap_TheHSequenceOfPoint) svtx;
Handle(Adaptor2d_HCurve2d) thearc;
Handle(Adaptor2d_Curve2d) thearc;
Contap_IType typL;
gp_Pnt pt;
gp_Dir dir1;

2
src/Contap/Contap_Point.cxx
View File

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

8
src/Contap/Contap_Point.hxx
View File

@@ -25,7 +25,7 @@
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <IntSurf_Transition.hxx>
class Adaptor2d_HCurve2d;
class Adaptor3d_HVertex;
class Standard_DomainError;
class gp_Pnt;
@@ -64,7 +64,7 @@ public:
//! Sets the value of the arc and of the parameter on
//! this arc of the point.
void SetArc (const Handle(Adaptor2d_HCurve2d)& A, const Standard_Real Param, const IntSurf_Transition& TLine, const IntSurf_Transition& TArc);
void SetArc (const Handle(Adaptor2d_Curve2d)& A, const Standard_Real Param, const IntSurf_Transition& TLine, const IntSurf_Transition& TArc);
void SetMultiple();
@@ -88,7 +88,7 @@ public:
//! Returns the arc of restriction containing the
//! vertex.
const Handle(Adaptor2d_HCurve2d)& Arc() const;
const Handle(Adaptor2d_Curve2d)& Arc() const;
//! Returns the parameter of the point on the
//! arc returned by the method Arc().
@@ -137,7 +137,7 @@ private:
Standard_Real vparam;
Standard_Real paraline;
Standard_Boolean onarc;
Handle(Adaptor2d_HCurve2d) arc;
Handle(Adaptor2d_Curve2d) arc;
IntSurf_Transition traline;
IntSurf_Transition traarc;
Standard_Real prmarc;

4
src/Contap/Contap_Point.lxx
View File

@@ -40,7 +40,7 @@ inline void Contap_Point::SetVertex(const Handle(Adaptor3d_HVertex)& V) {
vtx = V;
}
inline void Contap_Point::SetArc (const Handle(Adaptor2d_HCurve2d)& A,
inline void Contap_Point::SetArc (const Handle(Adaptor2d_Curve2d)& A,
const Standard_Real Param,
const IntSurf_Transition& TLine,
const IntSurf_Transition& TArc) {
@@ -94,7 +94,7 @@ inline Standard_Boolean Contap_Point::IsOnArc () const{
return onarc;
}
inline const Handle(Adaptor2d_HCurve2d)& Contap_Point::Arc () const {
inline const Handle(Adaptor2d_Curve2d)& Contap_Point::Arc () const {
if (!onarc) {throw Standard_DomainError();}
return arc;

4
src/Contap/Contap_SurfFunction.cxx
View File

@@ -16,7 +16,7 @@
// jag 940616 Tolpetit = 1.e-16
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_HSurfaceTool.hxx>
#include <Contap_HContTool.hxx>
#include <Contap_SurfFunction.hxx>
@@ -46,7 +46,7 @@ Contap_SurfFunction::Contap_SurfFunction ():
{
}
void Contap_SurfFunction::Set(const Handle(Adaptor3d_HSurface)& S)
void Contap_SurfFunction::Set(const Handle(Adaptor3d_Surface)& S)
{
mySurf = S;
Standard_Integer i;

19
src/Contap/Contap_SurfFunction.hxx
View File

@@ -17,22 +17,15 @@
#ifndef _Contap_SurfFunction_HeaderFile
#define _Contap_SurfFunction_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Contap_TFunction.hxx>
#include <gp_Dir.hxx>
#include <gp_Pnt.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Vec.hxx>
#include <Standard_Boolean.hxx>
#include <math_FunctionSetWithDerivatives.hxx>
#include <Standard_Integer.hxx>
#include <math_Vector.hxx>
class Adaptor3d_HSurface;
class StdFail_UndefinedDerivative;
class gp_Pnt;
class gp_Dir;
class math_Matrix;
@@ -53,7 +46,7 @@ public:
Standard_EXPORT Contap_SurfFunction();
Standard_EXPORT void Set (const Handle(Adaptor3d_HSurface)& S);
Standard_EXPORT void Set (const Handle(Adaptor3d_Surface)& S);
void Set (const gp_Pnt& Eye);
@@ -104,10 +97,10 @@ public:
Standard_Real Angle() const;
const Handle(Adaptor3d_HSurface)& Surface() const;
const Handle(Adaptor3d_Surface)& Surface() const;
//! Method is entered for compatibility with IntPatch_TheSurfFunction.
const Handle(Adaptor3d_HSurface)& PSurface() const
const Handle(Adaptor3d_Surface)& PSurface() const
{
return Surface();
}
@@ -123,7 +116,7 @@ private:
Handle(Adaptor3d_HSurface) mySurf;
Handle(Adaptor3d_Surface) mySurf;
Standard_Real myMean;
Contap_TFunction myType;
gp_Dir myDir;

2
src/Contap/Contap_SurfFunction.lxx
View File

@@ -80,7 +80,7 @@ inline const gp_Dir2d& Contap_SurfFunction::Direction2d()
return d2d;
}
inline const Handle(Adaptor3d_HSurface)& Contap_SurfFunction::Surface() const
inline const Handle(Adaptor3d_Surface)& Contap_SurfFunction::Surface() const
{
return mySurf;
}

8
src/Contap/Contap_SurfProps.cxx
View File

@@ -15,7 +15,7 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_HSurfaceTool.hxx>
#include <Contap_SurfProps.hxx>
#include <ElSLib.hxx>
@@ -26,7 +26,7 @@
//function : Normale
//purpose :
//=======================================================================
void Contap_SurfProps::Normale(const Handle(Adaptor3d_HSurface)& S,
void Contap_SurfProps::Normale(const Handle(Adaptor3d_Surface)& S,
const Standard_Real U,
const Standard_Real V,
gp_Pnt& P,
@@ -131,7 +131,7 @@ void Contap_SurfProps::Normale(const Handle(Adaptor3d_HSurface)& S,
//purpose :
//=======================================================================
void Contap_SurfProps::DerivAndNorm(const Handle(Adaptor3d_HSurface)& S,
void Contap_SurfProps::DerivAndNorm(const Handle(Adaptor3d_Surface)& S,
const Standard_Real U,
const Standard_Real V,
gp_Pnt& P,
@@ -231,7 +231,7 @@ void Contap_SurfProps::DerivAndNorm(const Handle(Adaptor3d_HSurface)& S,
//purpose :
//=======================================================================
void Contap_SurfProps::NormAndDn(const Handle(Adaptor3d_HSurface)& S,
void Contap_SurfProps::NormAndDn(const Handle(Adaptor3d_Surface)& S,
const Standard_Real U,
const Standard_Real V,
gp_Pnt& P,

13
src/Contap/Contap_SurfProps.hxx
View File

@@ -17,16 +17,11 @@
#ifndef _Contap_SurfProps_HeaderFile
#define _Contap_SurfProps_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Standard_Real.hxx>
class Adaptor3d_HSurface;
class gp_Pnt;
class gp_Vec;
//! Internal tool used to compute the normal and its
//! derivatives.
class Contap_SurfProps
@@ -38,15 +33,15 @@ public:
//! Computes the point <P>, and normal vector <N> on
//! <S> at parameters U,V.
Standard_EXPORT static void Normale (const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& N);
Standard_EXPORT static void Normale (const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& N);
//! Computes the point <P>, and normal vector <N> on
//! <S> at parameters U,V.
Standard_EXPORT static void DerivAndNorm (const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& d1u, gp_Vec& d1v, gp_Vec& N);
Standard_EXPORT static void DerivAndNorm (const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& d1u, gp_Vec& d1v, gp_Vec& N);
//! Computes the point <P>, normal vector <N>, and its
//! derivatives <Dnu> and <Dnv> on <S> at parameters U,V.
Standard_EXPORT static void NormAndDn (const Handle(Adaptor3d_HSurface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& N, gp_Vec& Dnu, gp_Vec& Dnv);
Standard_EXPORT static void NormAndDn (const Handle(Adaptor3d_Surface)& S, const Standard_Real U, const Standard_Real V, gp_Pnt& P, gp_Vec& N, gp_Vec& Dnu, gp_Vec& Dnv);

21
src/Contap/Contap_TheIWalking.hxx
View File

@@ -17,13 +17,8 @@
#ifndef _Contap_TheIWalking_HeaderFile
#define _Contap_TheIWalking_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Boolean.hxx>
#include <Adaptor3d_Surface.hxx>
#include <IntSurf_SequenceOfPathPoint.hxx>
#include <Standard_Real.hxx>
#include <math_Vector.hxx>
#include <IntWalk_VectorOfWalkingData.hxx>
#include <IntWalk_VectorOfInteger.hxx>
@@ -34,21 +29,17 @@
#include <TColStd_DataMapOfIntegerListOfInteger.hxx>
#include <Contap_SequenceOfIWLineOfTheIWalking.hxx>
#include <IntSurf_SequenceOfInteriorPoint.hxx>
#include <Standard_Integer.hxx>
#include <TColStd_SequenceOfReal.hxx>
#include <IntWalk_StatusDeflection.hxx>
#include <Bnd_Range.hxx>
class StdFail_NotDone;
class Standard_OutOfRange;
class IntSurf_PathPoint;
class IntSurf_PathPointTool;
class IntSurf_InteriorPoint;
class IntSurf_InteriorPointTool;
class Adaptor3d_HSurface;
class Adaptor3d_HSurfaceTool;
class Contap_SurfFunction;
class Contap_TheIWLineOfTheIWalking;
class IntSurf_PntOn2S;
class math_FunctionSetRoot;
class Contap_TheIWalking
@@ -81,11 +72,11 @@ public:
//! Searches a set of polylines starting on a point of Pnts1
//! or Pnts2.
//! Each point on a resulting polyline verifies F(u,v)=0
Standard_EXPORT void Perform (const IntSurf_SequenceOfPathPoint& Pnts1, const IntSurf_SequenceOfInteriorPoint& Pnts2, Contap_SurfFunction& Func, const Handle(Adaptor3d_HSurface)& S, const Standard_Boolean Reversed = Standard_False);
Standard_EXPORT void Perform (const IntSurf_SequenceOfPathPoint& Pnts1, const IntSurf_SequenceOfInteriorPoint& Pnts2, Contap_SurfFunction& Func, const Handle(Adaptor3d_Surface)& S, const Standard_Boolean Reversed = Standard_False);
//! Searches a set of polylines starting on a point of Pnts1.
//! Each point on a resulting polyline verifies F(u,v)=0
Standard_EXPORT void Perform (const IntSurf_SequenceOfPathPoint& Pnts1, Contap_SurfFunction& Func, const Handle(Adaptor3d_HSurface)& S, const Standard_Boolean Reversed = Standard_False);
Standard_EXPORT void Perform (const IntSurf_SequenceOfPathPoint& Pnts1, Contap_SurfFunction& Func, const Handle(Adaptor3d_Surface)& S, const Standard_Boolean Reversed = Standard_False);
//! Returns true if the calculus was successful.
Standard_Boolean IsDone() const;
@@ -203,8 +194,8 @@ private:
#define ThePointOfLoopTool_hxx <IntSurf_InteriorPointTool.hxx>
#define ThePOLIterator IntSurf_SequenceOfInteriorPoint
#define ThePOLIterator_hxx <IntSurf_SequenceOfInteriorPoint.hxx>
#define ThePSurface Handle(Adaptor3d_HSurface)
#define ThePSurface_hxx <Adaptor3d_HSurface.hxx>
#define ThePSurface Handle(Adaptor3d_Surface)
#define ThePSurface_hxx <Adaptor3d_Surface.hxx>
#define ThePSurfaceTool Adaptor3d_HSurfaceTool
#define ThePSurfaceTool_hxx <Adaptor3d_HSurfaceTool.hxx>
#define TheIWFunction Contap_SurfFunction

6
src/Contap/Contap_TheIWalking_0.cxx
View File

@@ -22,7 +22,7 @@
#include <IntSurf_PathPointTool.hxx>
#include <IntSurf_InteriorPoint.hxx>
#include <IntSurf_InteriorPointTool.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_HSurfaceTool.hxx>
#include <Contap_SurfFunction.hxx>
#include <Contap_TheIWLineOfTheIWalking.hxx>
@@ -41,8 +41,8 @@
#define ThePointOfLoopTool_hxx <IntSurf_InteriorPointTool.hxx>
#define ThePOLIterator IntSurf_SequenceOfInteriorPoint
#define ThePOLIterator_hxx <IntSurf_SequenceOfInteriorPoint.hxx>
#define ThePSurface Handle(Adaptor3d_HSurface)
#define ThePSurface_hxx <Adaptor3d_HSurface.hxx>
#define ThePSurface Handle(Adaptor3d_Surface)
#define ThePSurface_hxx <Adaptor3d_Surface.hxx>
#define ThePSurfaceTool Adaptor3d_HSurfaceTool
#define ThePSurfaceTool_hxx <Adaptor3d_HSurfaceTool.hxx>
#define TheIWFunction Contap_SurfFunction

27
src/Contap/Contap_ThePathPointOfTheSearch.hxx
View File

@@ -17,20 +17,13 @@
#ifndef _Contap_ThePathPointOfTheSearch_HeaderFile
#define _Contap_ThePathPointOfTheSearch_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <gp_Pnt.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
class Adaptor3d_HVertex;
class Adaptor2d_HCurve2d;
class Standard_DomainError;
class gp_Pnt;
class Contap_ThePathPointOfTheSearch
{
public:
@@ -40,13 +33,13 @@ public:
Standard_EXPORT Contap_ThePathPointOfTheSearch();
Standard_EXPORT Contap_ThePathPointOfTheSearch(const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_HCurve2d)& A, const Standard_Real Parameter);
Standard_EXPORT Contap_ThePathPointOfTheSearch(const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_Curve2d)& A, const Standard_Real Parameter);
Standard_EXPORT Contap_ThePathPointOfTheSearch(const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor2d_HCurve2d)& A, const Standard_Real Parameter);
Standard_EXPORT Contap_ThePathPointOfTheSearch(const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor2d_Curve2d)& A, const Standard_Real Parameter);
void SetValue (const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_HCurve2d)& A, const Standard_Real Parameter);
void SetValue (const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor3d_HVertex)& V, const Handle(Adaptor2d_Curve2d)& A, const Standard_Real Parameter);
void SetValue (const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor2d_HCurve2d)& A, const Standard_Real Parameter);
void SetValue (const gp_Pnt& P, const Standard_Real Tol, const Handle(Adaptor2d_Curve2d)& A, const Standard_Real Parameter);
const gp_Pnt& Value() const;
@@ -56,7 +49,7 @@ public:
const Handle(Adaptor3d_HVertex)& Vertex() const;
const Handle(Adaptor2d_HCurve2d)& Arc() const;
const Handle(Adaptor2d_Curve2d)& Arc() const;
Standard_Real Parameter() const;
@@ -77,7 +70,7 @@ private:
Standard_Real tol;
Standard_Boolean isnew;
Handle(Adaptor3d_HVertex) vtx;
Handle(Adaptor2d_HCurve2d) arc;
Handle(Adaptor2d_Curve2d) arc;
Standard_Real param;
@@ -85,8 +78,8 @@ private:
#define TheVertex Handle(Adaptor3d_HVertex)
#define TheVertex_hxx <Adaptor3d_HVertex.hxx>
#define TheArc Handle(Adaptor2d_HCurve2d)
#define TheArc_hxx <Adaptor2d_HCurve2d.hxx>
#define TheArc Handle(Adaptor2d_Curve2d)
#define TheArc_hxx <Adaptor2d_Curve2d.hxx>
#define IntStart_PathPoint Contap_ThePathPointOfTheSearch
#define IntStart_PathPoint_hxx <Contap_ThePathPointOfTheSearch.hxx>

6
src/Contap/Contap_ThePathPointOfTheSearch_0.cxx
View File

@@ -17,15 +17,15 @@
#include <Contap_ThePathPointOfTheSearch.hxx>
#include <Adaptor3d_HVertex.hxx>
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Standard_DomainError.hxx>
#include <gp_Pnt.hxx>
#define TheVertex Handle(Adaptor3d_HVertex)
#define TheVertex_hxx <Adaptor3d_HVertex.hxx>
#define TheArc Handle(Adaptor2d_HCurve2d)
#define TheArc_hxx <Adaptor2d_HCurve2d.hxx>
#define TheArc Handle(Adaptor2d_Curve2d)
#define TheArc_hxx <Adaptor2d_Curve2d.hxx>
#define IntStart_PathPoint Contap_ThePathPointOfTheSearch
#define IntStart_PathPoint_hxx <Contap_ThePathPointOfTheSearch.hxx>
#include <IntStart_PathPoint.gxx>

5
src/Contap/Contap_TheSearch.hxx
View File

@@ -30,7 +30,6 @@ class StdFail_NotDone;
class Standard_OutOfRange;
class Standard_ConstructionError;
class Adaptor3d_HVertex;
class Adaptor2d_HCurve2d;
class Contap_HCurve2dTool;
class Contap_HContTool;
class Adaptor3d_TopolTool;
@@ -108,8 +107,8 @@ private:
#define TheVertex Handle(Adaptor3d_HVertex)
#define TheVertex_hxx <Adaptor3d_HVertex.hxx>
#define TheArc Handle(Adaptor2d_HCurve2d)
#define TheArc_hxx <Adaptor2d_HCurve2d.hxx>
#define TheArc Handle(Adaptor2d_Curve2d)
#define TheArc_hxx <Adaptor2d_Curve2d.hxx>
#define TheArcTool Contap_HCurve2dTool
#define TheArcTool_hxx <Contap_HCurve2dTool.hxx>
#define TheSOBTool Contap_HContTool

24
src/Contap/Contap_TheSearchInside.hxx
View File

@@ -17,25 +17,15 @@
#ifndef _Contap_TheSearchInside_HeaderFile
#define _Contap_TheSearchInside_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Boolean.hxx>
#include <Adaptor3d_Surface.hxx>
#include <IntSurf_SequenceOfInteriorPoint.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
class StdFail_NotDone;
class Standard_OutOfRange;
class Adaptor3d_HSurface;
class Adaptor3d_HSurfaceTool;
class Adaptor3d_TopolTool;
class Contap_HContTool;
class Contap_SurfFunction;
class IntSurf_InteriorPoint;
class Contap_TheSearchInside
{
public:
@@ -45,11 +35,11 @@ public:
Standard_EXPORT Contap_TheSearchInside();
Standard_EXPORT Contap_TheSearchInside(Contap_SurfFunction& F, const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& T, const Standard_Real Epsilon);
Standard_EXPORT Contap_TheSearchInside(Contap_SurfFunction& F, const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& T, const Standard_Real Epsilon);
Standard_EXPORT void Perform (Contap_SurfFunction& F, const Handle(Adaptor3d_HSurface)& Surf, const Handle(Adaptor3d_TopolTool)& T, const Standard_Real Epsilon);
Standard_EXPORT void Perform (Contap_SurfFunction& F, const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& T, const Standard_Real Epsilon);
Standard_EXPORT void Perform (Contap_SurfFunction& F, const Handle(Adaptor3d_HSurface)& Surf, const Standard_Real UStart, const Standard_Real VStart);
Standard_EXPORT void Perform (Contap_SurfFunction& F, const Handle(Adaptor3d_Surface)& Surf, const Standard_Real UStart, const Standard_Real VStart);
Standard_Boolean IsDone() const;
@@ -84,8 +74,8 @@ private:
};
#define ThePSurface Handle(Adaptor3d_HSurface)
#define ThePSurface_hxx <Adaptor3d_HSurface.hxx>
#define ThePSurface Handle(Adaptor3d_Surface)
#define ThePSurface_hxx <Adaptor3d_Surface.hxx>
#define ThePSurfaceTool Adaptor3d_HSurfaceTool
#define ThePSurfaceTool_hxx <Adaptor3d_HSurfaceTool.hxx>
#define Handle_TheTopolTool Handle(Adaptor3d_TopolTool)

6
src/Contap/Contap_TheSearchInside_0.cxx
View File

@@ -18,7 +18,7 @@
#include <StdFail_NotDone.hxx>
#include <Standard_OutOfRange.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_HSurfaceTool.hxx>
#include <Adaptor3d_TopolTool.hxx>
#include <Contap_HContTool.hxx>
@@ -26,8 +26,8 @@
#include <IntSurf_InteriorPoint.hxx>
#define ThePSurface Handle(Adaptor3d_HSurface)
#define ThePSurface_hxx <Adaptor3d_HSurface.hxx>
#define ThePSurface Handle(Adaptor3d_Surface)
#define ThePSurface_hxx <Adaptor3d_Surface.hxx>
#define ThePSurfaceTool Adaptor3d_HSurfaceTool
#define ThePSurfaceTool_hxx <Adaptor3d_HSurfaceTool.hxx>
#define Handle_TheTopolTool Handle(Adaptor3d_TopolTool)

6
src/Contap/Contap_TheSearch_0.cxx
View File

@@ -20,7 +20,7 @@
#include <Standard_OutOfRange.hxx>
#include <Standard_ConstructionError.hxx>
#include <Adaptor3d_HVertex.hxx>
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Contap_HCurve2dTool.hxx>
#include <Contap_HContTool.hxx>
#include <Adaptor3d_TopolTool.hxx>
@@ -32,8 +32,8 @@
#define TheVertex Handle(Adaptor3d_HVertex)
#define TheVertex_hxx <Adaptor3d_HVertex.hxx>
#define TheArc Handle(Adaptor2d_HCurve2d)
#define TheArc_hxx <Adaptor2d_HCurve2d.hxx>
#define TheArc Handle(Adaptor2d_Curve2d)
#define TheArc_hxx <Adaptor2d_Curve2d.hxx>
#define TheArcTool Contap_HCurve2dTool
#define TheArcTool_hxx <Contap_HCurve2dTool.hxx>
#define TheSOBTool Contap_HContTool

20
src/Contap/Contap_TheSegmentOfTheSearch.hxx
View File

@@ -17,19 +17,13 @@
#ifndef _Contap_TheSegmentOfTheSearch_HeaderFile
#define _Contap_TheSegmentOfTheSearch_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Boolean.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Contap_ThePathPointOfTheSearch.hxx>
class Adaptor2d_HCurve2d;
class Standard_DomainError;
class Adaptor3d_HVertex;
class Contap_ThePathPointOfTheSearch;
class Contap_TheSegmentOfTheSearch
{
public:
@@ -41,7 +35,7 @@ public:
Standard_EXPORT Contap_TheSegmentOfTheSearch();
//! Defines the concerned arc.
void SetValue (const Handle(Adaptor2d_HCurve2d)& A);
void SetValue (const Handle(Adaptor2d_Curve2d)& A);
//! Defines the first point or the last point,
//! depending on the value of the boolean First.
@@ -49,7 +43,7 @@ public:
//! Returns the geometric curve on the surface 's domain
//! which is solution.
const Handle(Adaptor2d_HCurve2d)& Curve() const;
const Handle(Adaptor2d_Curve2d)& Curve() const;
//! Returns True if there is a vertex (ThePathPoint) defining
//! the lowest valid parameter on the arc.
@@ -78,7 +72,7 @@ private:
Handle(Adaptor2d_HCurve2d) arc;
Handle(Adaptor2d_Curve2d) arc;
Standard_Boolean hasfp;
Contap_ThePathPointOfTheSearch thefp;
Standard_Boolean haslp;
@@ -89,8 +83,8 @@ private:
#define TheVertex Handle(Adaptor3d_HVertex)
#define TheVertex_hxx <Adaptor3d_HVertex.hxx>
#define TheArc Handle(Adaptor2d_HCurve2d)
#define TheArc_hxx <Adaptor2d_HCurve2d.hxx>
#define TheArc Handle(Adaptor2d_Curve2d)
#define TheArc_hxx <Adaptor2d_Curve2d.hxx>
#define ThePathPoint Contap_ThePathPointOfTheSearch
#define ThePathPoint_hxx <Contap_ThePathPointOfTheSearch.hxx>
#define IntStart_Segment Contap_TheSegmentOfTheSearch

6
src/Contap/Contap_TheSegmentOfTheSearch_0.cxx
View File

@@ -16,7 +16,7 @@
#include <Contap_TheSegmentOfTheSearch.hxx>
#include <Adaptor2d_HCurve2d.hxx>
#include <Adaptor2d_Curve2d.hxx>
#include <Standard_DomainError.hxx>
#include <Adaptor3d_HVertex.hxx>
#include <Contap_ThePathPointOfTheSearch.hxx>
@@ -24,8 +24,8 @@
#define TheVertex Handle(Adaptor3d_HVertex)
#define TheVertex_hxx <Adaptor3d_HVertex.hxx>
#define TheArc Handle(Adaptor2d_HCurve2d)
#define TheArc_hxx <Adaptor2d_HCurve2d.hxx>
#define TheArc Handle(Adaptor2d_Curve2d)
#define TheArc_hxx <Adaptor2d_Curve2d.hxx>
#define ThePathPoint Contap_ThePathPointOfTheSearch
#define ThePathPoint_hxx <Contap_ThePathPointOfTheSearch.hxx>
#define IntStart_Segment Contap_TheSegmentOfTheSearch