OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0024683: Convertation of the generic classes to the non-generic. Part 1

Browse Source 
Generic classes from "BRepApprox" package:
    "BRepApprox_ApproxLineGen" and "BRepApprox_SurfaceToolGen" converted to the non-generic classes "BRepApprox_ApproxLine" and "BRepApprox_SurfaceTool".
Generic classes from "BRepBlend" package:
    "BRepBlend_HCurve3dToolGen" and "BRepBlend_HCurve2dToolGen" converted to the non-generic classes "BRepBlend_HCurve3dTool" and "BRepBlend_HCurve2dTool".
Generic classes from "Blend" package:
    "Blend_Extremity", "Blend_Line" and "Blend_PointOnRst" moved to the corresponding non-generic classes "BRepBlend_Extremity", "BRepBlend_Line" and "BRepBlend_PointOnRst" to "BRepBlend" package.

And some other minor changes were done.
Field "myPntOn2S" was deleted from "BRepApprox_ApproxLine" class. Therefore BRepApprox_ApproxLine::Point(...) method was a little changed.
This commit is contained in:
dln 2014-03-27 16:24:53 +04:00 committed by apn
parent 0a58bfe2c3
commit 04f7bd75e3
25 changed files with 364 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/BRepApprox/BRepApprox.cdl
View File

@ -36,16 +36,9 @@ uses
is is
generic class ApproxLineGen; class ApproxLine;
class ApproxLine instantiates ApproxLineGen from BRepApprox class SurfaceTool;
(BSplineCurve from Geom,
BSplineCurve from Geom2d);
generic class SurfaceToolGen;
class SurfaceTool instantiates SurfaceToolGen from BRepApprox
(Surface from BRepAdaptor);
class Approx instantiates Approx from ApproxInt class Approx instantiates Approx from ApproxInt
(Surface from BRepAdaptor, (Surface from BRepAdaptor,

32
src/BRepApprox/BRepApprox_ApproxLineGen.cdl → src/BRepApprox/BRepApprox_ApproxLine.cdl
View File

@ -14,42 +14,40 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class ApproxLineGen from BRepApprox class ApproxLine from BRepApprox inherits TShared from MMgt
(TheCurve as any;
TheCurve2d as any)
inherits TShared from MMgt
uses uses
PntOn2S from IntSurf, PntOn2S from IntSurf,
LineOn2S from IntSurf LineOn2S from IntSurf,
BSplineCurve from Geom,
BSplineCurve from Geom2d
is is
Create(CurveXYZ: TheCurve; Create(CurveXYZ: BSplineCurve from Geom;
CurveUV1: TheCurve2d; CurveUV1: BSplineCurve from Geom2d;
CurveUV2: TheCurve2d) CurveUV2: BSplineCurve from Geom2d)
returns mutable ApproxLineGen from BRepApprox; returns mutable ApproxLine from BRepApprox;
Create(lin: LineOn2S from IntSurf; Tang: Boolean from Standard) Create(lin: LineOn2S from IntSurf; Tang: Boolean from Standard)
returns mutable ApproxLineGen from BRepApprox; returns mutable ApproxLine from BRepApprox;
NbPnts(me) NbPnts(me)
returns Integer from Standard returns Integer from Standard
is static; is static;
Point(me: mutable; Index: Integer from Standard) Point(me: mutable; Index: Integer from Standard)
returns PntOn2S from IntSurf returns PntOn2S from IntSurf
is static; is static;
fields fields
curvxyz : TheCurve; myCurveXYZ : BSplineCurve from Geom;
curvuv1 : TheCurve2d; myCurveUV1 : BSplineCurve from Geom2d;
curvuv2 : TheCurve2d; myCurveUV2 : BSplineCurve from Geom2d;
pnton2s : PntOn2S from IntSurf; myLineOn2S : LineOn2S from IntSurf;
linon2s : LineOn2S from IntSurf;
end ApproxLineGen from BRepApprox; end ApproxLine from BRepApprox;

71
src/BRepApprox/BRepApprox_ApproxLineGen.gxx → src/BRepApprox/BRepApprox_ApproxLine.cxx
View File

@ -14,33 +14,35 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <BRepApprox_ApproxLine.ixx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
//======================================================================= //=======================================================================
//function : BRepApprox_ApproxLineGen //function : BRepApprox_ApproxLine
//purpose : //purpose :
//======================================================================= //=======================================================================
BRepApprox_ApproxLineGen::BRepApprox_ApproxLineGen BRepApprox_ApproxLine::BRepApprox_ApproxLine
(const TheCurve& CurveXYZ, (const Handle(Geom_BSplineCurve)& CurveXYZ,
const TheCurve2d& CurveUV1, const Handle(Geom2d_BSplineCurve)& CurveUV1,
const TheCurve2d& CurveUV2) const Handle(Geom2d_BSplineCurve)& CurveUV2)
{ {
curvxyz = CurveXYZ; myCurveXYZ = CurveXYZ;
curvuv1 = CurveUV1; myCurveUV1 = CurveUV1;
curvuv2 = CurveUV2; myCurveUV2 = CurveUV2;
} }
//======================================================================= //=======================================================================
//function : BRepApprox_ApproxLineGen //function : BRepApprox_ApproxLine
//purpose : //purpose :
//======================================================================= //=======================================================================
BRepApprox_ApproxLineGen::BRepApprox_ApproxLineGen BRepApprox_ApproxLine::BRepApprox_ApproxLine
(const Handle(IntSurf_LineOn2S)& lin, (const Handle(IntSurf_LineOn2S)& lin,
const Standard_Boolean ) const Standard_Boolean )
:linon2s(lin) :myLineOn2S(lin)
{ {
} }
@ -49,15 +51,15 @@ BRepApprox_ApproxLineGen::BRepApprox_ApproxLineGen
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Integer BRepApprox_ApproxLineGen::NbPnts() const Standard_Integer BRepApprox_ApproxLine::NbPnts() const
{ {
if(!curvxyz.IsNull()) if(!myCurveXYZ.IsNull())
return(curvxyz->NbPoles()); return(myCurveXYZ->NbPoles());
if(!curvuv1.IsNull()) if(!myCurveUV1.IsNull())
return(curvuv1->NbPoles()); return(myCurveUV1->NbPoles());
if(!curvuv2.IsNull()) if(!myCurveUV2.IsNull())
return(curvuv2->NbPoles()); return(myCurveUV2->NbPoles());
return(linon2s->NbPoints()); return(myLineOn2S->NbPoints());
} }
//======================================================================= //=======================================================================
@ -65,27 +67,24 @@ Standard_Integer BRepApprox_ApproxLineGen::NbPnts() const
//purpose : //purpose :
//======================================================================= //=======================================================================
IntSurf_PntOn2S BRepApprox_ApproxLineGen::Point IntSurf_PntOn2S BRepApprox_ApproxLine::Point(const Standard_Integer Index)
(const Standard_Integer Index)
{ {
if(!linon2s.IsNull()) { if(!myLineOn2S.IsNull()) {
if(linon2s->NbPoints()) { if(myLineOn2S->NbPoints()) {
return(linon2s->Value(Index)); return(myLineOn2S->Value(Index));
} }
} }
gp_Pnt2d P1,P2; gp_Pnt2d P1,P2;
gp_Pnt P; gp_Pnt P;
if(!curvxyz.IsNull()) if(!myCurveXYZ.IsNull())
P = curvxyz->Pole(Index); P = myCurveXYZ->Pole(Index);
if(!curvuv1.IsNull()) if(!myCurveUV1.IsNull())
P1 = curvuv1->Pole(Index); P1 = myCurveUV1->Pole(Index);
if(!curvuv2.IsNull()) if(!myCurveUV2.IsNull())
P2 = curvuv2->Pole(Index); P2 = myCurveUV2->Pole(Index);
pnton2s.SetValue(P, IntSurf_PntOn2S aPntOn2S;
P1.X(), aPntOn2S.SetValue(P, P1.X(), P1.Y(), P2.X(), P2.Y());
P1.Y(),
P2.X(), return aPntOn2S;
P2.Y());
return(pnton2s);
} }

87
src/BRepApprox/BRepApprox_SurfaceToolGen.cdl → src/BRepApprox/BRepApprox_SurfaceTool.cdl
View File

@ -14,9 +14,7 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class SurfaceToolGen from BRepApprox class SurfaceTool from BRepApprox
(TheSurface as any)
uses uses
@ -35,7 +33,8 @@ uses
HSurface from Adaptor3d, HSurface from Adaptor3d,
HCurve from Adaptor3d, HCurve from Adaptor3d,
Ax1 from gp, Ax1 from gp,
Dir from gp Dir from gp,
Surface from BRepAdaptor
raises raises
@ -44,48 +43,48 @@ raises
is is
FirstUParameter(myclass; S: TheSurface) FirstUParameter(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
FirstVParameter(myclass; S: TheSurface) FirstVParameter(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
LastUParameter(myclass; S: TheSurface) LastUParameter(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
LastVParameter(myclass; S: TheSurface) LastVParameter(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
NbUIntervals(myclass; S: TheSurface; NbUIntervals(myclass; S: Surface from BRepAdaptor;
Sh : Shape from GeomAbs) Sh : Shape from GeomAbs)
---C++: inline ---C++: inline
returns Integer from Standard; returns Integer from Standard;
NbVIntervals(myclass; S: TheSurface; NbVIntervals(myclass; S: Surface from BRepAdaptor;
Sh : Shape from GeomAbs) Sh : Shape from GeomAbs)
---C++: inline ---C++: inline
returns Integer from Standard; returns Integer from Standard;
UIntervals(myclass; S : TheSurface; UIntervals(myclass; S : Surface from BRepAdaptor;
T : in out Array1OfReal from TColStd; T : in out Array1OfReal from TColStd;
Sh : Shape from GeomAbs); Sh : Shape from GeomAbs);
---C++: inline ---C++: inline
VIntervals(myclass; S : TheSurface; VIntervals(myclass; S : Surface from BRepAdaptor;
T : in out Array1OfReal from TColStd; T : in out Array1OfReal from TColStd;
Sh : Shape from GeomAbs) ; Sh : Shape from GeomAbs) ;
---C++: inline ---C++: inline
UTrim(myclass; S : TheSurface; UTrim(myclass; S : Surface from BRepAdaptor;
First, Last, Tol : Real) First, Last, Tol : Real)
---C++: inline ---C++: inline
returns HSurface from Adaptor3d returns HSurface from Adaptor3d
@ -93,7 +92,7 @@ is
OutOfRange from Standard; OutOfRange from Standard;
---Purpose: If <First> >= <Last> ---Purpose: If <First> >= <Last>
VTrim(myclass; S : TheSurface; VTrim(myclass; S : Surface from BRepAdaptor;
First, Last, Tol : Real) First, Last, Tol : Real)
---C++: inline ---C++: inline
returns HSurface from Adaptor3d returns HSurface from Adaptor3d
@ -102,62 +101,62 @@ is
---Purpose: If <First> >= <Last> ---Purpose: If <First> >= <Last>
IsUClosed(myclass; S: TheSurface) IsUClosed(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Boolean from Standard; returns Boolean from Standard;
IsVClosed(myclass; S: TheSurface) IsVClosed(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Boolean from Standard; returns Boolean from Standard;
IsUPeriodic(myclass; S: TheSurface) IsUPeriodic(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Boolean from Standard; returns Boolean from Standard;
UPeriod(myclass; S: TheSurface) UPeriod(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
IsVPeriodic(myclass; S: TheSurface) IsVPeriodic(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Boolean from Standard; returns Boolean from Standard;
VPeriod(myclass; S: TheSurface) VPeriod(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
Value(myclass; S : TheSurface; Value(myclass; S : Surface from BRepAdaptor;
u,v : Real from Standard) u,v : Real from Standard)
---C++: inline ---C++: inline
returns Pnt from gp; returns Pnt from gp;
D0(myclass; S : TheSurface; D0(myclass; S : Surface from BRepAdaptor;
u,v : Real from Standard; u,v : Real from Standard;
P : out Pnt from gp); P : out Pnt from gp);
---C++: inline ---C++: inline
D1(myclass; S : TheSurface; D1(myclass; S : Surface from BRepAdaptor;
u,v : Real from Standard; u,v : Real from Standard;
P : out Pnt from gp; P : out Pnt from gp;
D1u,D1v: out Vec from gp); D1u,D1v: out Vec from gp);
---C++: inline ---C++: inline
D2(myclass; S : TheSurface; D2(myclass; S : Surface from BRepAdaptor;
u,v : Real from Standard; u,v : Real from Standard;
P : out Pnt from gp; P : out Pnt from gp;
D1U,D1V,D2U,D2V,D2UV: out Vec from gp); D1U,D1V,D2U,D2V,D2UV: out Vec from gp);
---C++: inline ---C++: inline
D3(myclass; S : TheSurface; D3(myclass; S : Surface from BRepAdaptor;
u,v : Real from Standard; u,v : Real from Standard;
P : out Pnt from gp; P : out Pnt from gp;
D1U, D1V, D2U, D2V, D2UV, D3U, D3V, D3UUV, D3UVV: out Vec from gp); D1U, D1V, D2U, D2V, D2UV, D3U, D3V, D3UUV, D3UVV: out Vec from gp);
---C++: inline ---C++: inline
DN(myclass; S : TheSurface; DN(myclass; S : Surface from BRepAdaptor;
u,v : Real from Standard; u,v : Real from Standard;
Nu,Nv : Integer from Standard) Nu,Nv : Integer from Standard)
---C++: inline ---C++: inline
@ -165,58 +164,58 @@ is
UResolution(myclass; S:TheSurface; R3d: Real from Standard) UResolution(myclass; S:Surface from BRepAdaptor; R3d: Real from Standard)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
VResolution(myclass; S:TheSurface; R3d: Real from Standard) VResolution(myclass; S:Surface from BRepAdaptor; R3d: Real from Standard)
---C++: inline ---C++: inline
returns Real from Standard; returns Real from Standard;
GetType(myclass; S: TheSurface) GetType(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns SurfaceType from GeomAbs; returns SurfaceType from GeomAbs;
Plane(myclass; S: TheSurface) Plane(myclass; S: Surface from BRepAdaptor)
---C++: inline ---C++: inline
returns Pln from gp; returns Pln from gp;
Cylinder(myclass; S : TheSurface) returns Cylinder from gp Cylinder(myclass; S : Surface from BRepAdaptor) returns Cylinder from gp
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
Cone(myclass; S : TheSurface) returns Cone from gp Cone(myclass; S : Surface from BRepAdaptor) returns Cone from gp
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
Torus(myclass; S : TheSurface) returns Torus from gp Torus(myclass; S : Surface from BRepAdaptor) returns Torus from gp
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
Sphere(myclass; S : TheSurface) returns Sphere from gp Sphere(myclass; S : Surface from BRepAdaptor) returns Sphere from gp
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
Bezier(myclass; S : TheSurface) returns BezierSurface from Geom Bezier(myclass; S : Surface from BRepAdaptor) returns BezierSurface from Geom
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
BSpline(myclass; S : TheSurface) returns BSplineSurface from Geom BSpline(myclass; S : Surface from BRepAdaptor) returns BSplineSurface from Geom
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
AxeOfRevolution(myclass; S: TheSurface) returns Ax1 from gp AxeOfRevolution(myclass; S: Surface from BRepAdaptor) returns Ax1 from gp
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
Direction(myclass; S: TheSurface) returns Dir from gp Direction(myclass; S: Surface from BRepAdaptor) returns Dir from gp
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
BasisCurve(myclass; S:TheSurface) returns HCurve from Adaptor3d BasisCurve(myclass; S:Surface from BRepAdaptor) returns HCurve from Adaptor3d
raises NoSuchObject from Standard; raises NoSuchObject from Standard;
---C++: inline ---C++: inline
@ -224,17 +223,17 @@ is
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
NbSamplesU(myclass; S : TheSurface) returns Integer from Standard; NbSamplesU(myclass; S : Surface from BRepAdaptor) returns Integer from Standard;
NbSamplesV(myclass; S : TheSurface) returns Integer from Standard; NbSamplesV(myclass; S : Surface from BRepAdaptor) returns Integer from Standard;
NbSamplesU(myclass; S : TheSurface; u1,u2: Real from Standard) returns Integer from Standard; NbSamplesU(myclass; S : Surface from BRepAdaptor; u1,u2: Real from Standard) returns Integer from Standard;
NbSamplesV(myclass; S : TheSurface; v1,v2: Real from Standard) returns Integer from Standard; NbSamplesV(myclass; S : Surface from BRepAdaptor; v1,v2: Real from Standard) returns Integer from Standard;
end SurfaceToolGen from BRepApprox ; end SurfaceTool from BRepApprox ;

11
src/BRepApprox/BRepApprox_SurfaceToolGen.gxx → src/BRepApprox/BRepApprox_SurfaceTool.cxx
View File

@ -14,27 +14,26 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include TheSurface_hxx #include "BRepApprox_SurfaceTool.ixx"
Standard_Integer BRepApprox_SurfaceTool::NbSamplesU (const BRepAdaptor_Surface&)
Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesU (const TheSurface&)
{ {
return(10); return(10);
} }
Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesV (const TheSurface&) Standard_Integer BRepApprox_SurfaceTool::NbSamplesV (const BRepAdaptor_Surface&)
{ {
return(10); return(10);
} }
Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesU (const TheSurface&, Standard_Integer BRepApprox_SurfaceTool::NbSamplesU (const BRepAdaptor_Surface&,
const Standard_Real, const Standard_Real,
const Standard_Real) const Standard_Real)
{ {
return(10); return(10);
} }
Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesV (const TheSurface&, Standard_Integer BRepApprox_SurfaceTool::NbSamplesV (const BRepAdaptor_Surface&,
const Standard_Real, const Standard_Real,
const Standard_Real) const Standard_Real)
{ {

73
src/BRepApprox/BRepApprox_SurfaceToolGen.lxx → src/BRepApprox/BRepApprox_SurfaceTool.lxx
View File

@ -14,7 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include TheSurface_hxx
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
@ -29,44 +28,42 @@
#include <Adaptor3d_HSurface.hxx> #include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_HCurve.hxx> #include <Adaptor3d_HCurve.hxx>
inline Standard_Real BRepApprox_SurfaceTool::FirstUParameter(const BRepAdaptor_Surface& Surf){ return Surf.FirstUParameter(); }
inline Standard_Real BRepApprox_SurfaceTool::FirstVParameter(const BRepAdaptor_Surface& Surf){ return Surf.FirstVParameter();}
inline Standard_Real BRepApprox_SurfaceTool::LastUParameter(const BRepAdaptor_Surface& Surf){ return Surf.LastUParameter();}
inline Standard_Real BRepApprox_SurfaceTool::LastVParameter(const BRepAdaptor_Surface& Surf){ return Surf.LastVParameter();}
inline Standard_Integer BRepApprox_SurfaceTool::NbUIntervals(const BRepAdaptor_Surface& Surf,
inline Standard_Real BRepApprox_SurfaceToolGen::FirstUParameter(const TheSurface& Surf){ return Surf.FirstUParameter(); }
inline Standard_Real BRepApprox_SurfaceToolGen::FirstVParameter(const TheSurface& Surf){ return Surf.FirstVParameter();}
inline Standard_Real BRepApprox_SurfaceToolGen::LastUParameter(const TheSurface& Surf){ return Surf.LastUParameter();}
inline Standard_Real BRepApprox_SurfaceToolGen::LastVParameter(const TheSurface& Surf){ return Surf.LastVParameter();}
inline Standard_Integer BRepApprox_SurfaceToolGen::NbUIntervals(const TheSurface& Surf,
const GeomAbs_Shape S){ const GeomAbs_Shape S){
return Surf.NbUIntervals(S); return Surf.NbUIntervals(S);
} }
inline Standard_Integer BRepApprox_SurfaceToolGen::NbVIntervals(const TheSurface& Surf, inline Standard_Integer BRepApprox_SurfaceTool::NbVIntervals(const BRepAdaptor_Surface& Surf,
const GeomAbs_Shape S){ const GeomAbs_Shape S){
return Surf.NbVIntervals(S); return Surf.NbVIntervals(S);
} }
inline void BRepApprox_SurfaceToolGen::UIntervals(const TheSurface& Surf, inline void BRepApprox_SurfaceTool::UIntervals(const BRepAdaptor_Surface& Surf,
TColStd_Array1OfReal& Tab, TColStd_Array1OfReal& Tab,
const GeomAbs_Shape S){ const GeomAbs_Shape S){
Surf.UIntervals(Tab,S); Surf.UIntervals(Tab,S);
} }
inline void BRepApprox_SurfaceToolGen::VIntervals(const TheSurface& Surf, inline void BRepApprox_SurfaceTool::VIntervals(const BRepAdaptor_Surface& Surf,
TColStd_Array1OfReal& Tab, TColStd_Array1OfReal& Tab,
const GeomAbs_Shape S){ const GeomAbs_Shape S){
Surf.VIntervals(Tab,S); Surf.VIntervals(Tab,S);
} }
inline Handle_Adaptor3d_HSurface BRepApprox_SurfaceToolGen::UTrim(const TheSurface& Surf, inline Handle_Adaptor3d_HSurface BRepApprox_SurfaceTool::UTrim(const BRepAdaptor_Surface& Surf,
const Standard_Real F, const Standard_Real F,
const Standard_Real L, const Standard_Real L,
const Standard_Real Tol) { const Standard_Real Tol) {
return Surf.UTrim(F,L,Tol); return Surf.UTrim(F,L,Tol);
} }
inline Handle_Adaptor3d_HSurface BRepApprox_SurfaceToolGen::VTrim(const TheSurface& Surf, inline Handle_Adaptor3d_HSurface BRepApprox_SurfaceTool::VTrim(const BRepAdaptor_Surface& Surf,
const Standard_Real F, const Standard_Real F,
const Standard_Real L, const Standard_Real L,
const Standard_Real Tol) { const Standard_Real Tol) {
@ -76,44 +73,44 @@ inline Handle_Adaptor3d_HSurface BRepApprox_SurfaceToolGen::VTrim(const TheSurfa
inline Standard_Boolean BRepApprox_SurfaceToolGen::IsUClosed(const TheSurface& S) inline Standard_Boolean BRepApprox_SurfaceTool::IsUClosed(const BRepAdaptor_Surface& S)
{ {
return S.IsUClosed(); return S.IsUClosed();
} }
inline Standard_Boolean BRepApprox_SurfaceToolGen::IsVClosed(const TheSurface& S) inline Standard_Boolean BRepApprox_SurfaceTool::IsVClosed(const BRepAdaptor_Surface& S)
{ {
return S.IsVClosed(); return S.IsVClosed();
} }
inline Standard_Boolean BRepApprox_SurfaceToolGen::IsUPeriodic(const TheSurface& S) inline Standard_Boolean BRepApprox_SurfaceTool::IsUPeriodic(const BRepAdaptor_Surface& S)
{ {
return S.IsUPeriodic(); return S.IsUPeriodic();
} }
inline Standard_Real BRepApprox_SurfaceToolGen::UPeriod(const TheSurface& S) inline Standard_Real BRepApprox_SurfaceTool::UPeriod(const BRepAdaptor_Surface& S)
{ {
return S.UPeriod(); return S.UPeriod();
} }
inline Standard_Boolean BRepApprox_SurfaceToolGen::IsVPeriodic(const TheSurface& S) inline Standard_Boolean BRepApprox_SurfaceTool::IsVPeriodic(const BRepAdaptor_Surface& S)
{ {
return S.IsVPeriodic(); return S.IsVPeriodic();
} }
inline Standard_Real BRepApprox_SurfaceToolGen::VPeriod(const TheSurface& S) inline Standard_Real BRepApprox_SurfaceTool::VPeriod(const BRepAdaptor_Surface& S)
{ {
return S.VPeriod(); return S.VPeriod();
} }
inline gp_Pnt BRepApprox_SurfaceToolGen::Value(const TheSurface& S, inline gp_Pnt BRepApprox_SurfaceTool::Value(const BRepAdaptor_Surface& S,
const Standard_Real U, const Standard_Real U,
const Standard_Real V ) const Standard_Real V )
{ {
return S.Value(U,V); return S.Value(U,V);
} }
inline void BRepApprox_SurfaceToolGen::D0(const TheSurface& S, inline void BRepApprox_SurfaceTool::D0(const BRepAdaptor_Surface& S,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
gp_Pnt& P) gp_Pnt& P)
@ -121,7 +118,7 @@ inline void BRepApprox_SurfaceToolGen::D0(const TheSurface& S,
S.D0(U,V,P); S.D0(U,V,P);
} }
inline void BRepApprox_SurfaceToolGen::D1(const TheSurface& S, inline void BRepApprox_SurfaceTool::D1(const BRepAdaptor_Surface& S,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
gp_Pnt& P, gp_Pnt& P,
@ -131,7 +128,7 @@ inline void BRepApprox_SurfaceToolGen::D1(const TheSurface& S,
S.D1(U,V,P,D1U,D1V); S.D1(U,V,P,D1U,D1V);
} }
inline void BRepApprox_SurfaceToolGen::D2(const TheSurface& S, inline void BRepApprox_SurfaceTool::D2(const BRepAdaptor_Surface& S,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
gp_Pnt& P, gp_Pnt& P,
@ -144,7 +141,7 @@ inline void BRepApprox_SurfaceToolGen::D2(const TheSurface& S,
S.D2(U,V,P,D1U,D1V,D2U,D2V,D2UV); S.D2(U,V,P,D1U,D1V,D2U,D2V,D2UV);
} }
inline void BRepApprox_SurfaceToolGen::D3(const TheSurface& S, inline void BRepApprox_SurfaceTool::D3(const BRepAdaptor_Surface& S,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
gp_Pnt& P, gp_Pnt& P,
@ -161,7 +158,7 @@ inline void BRepApprox_SurfaceToolGen::D3(const TheSurface& S,
S.D3(U,V,P,D1U,D1V,D2U,D2V,D2UV,D3U,D3V,D3UUV,D3UVV); S.D3(U,V,P,D1U,D1V,D2U,D2V,D2UV,D3U,D3V,D3UUV,D3UVV);
} }
inline gp_Vec BRepApprox_SurfaceToolGen::DN(const TheSurface& S, inline gp_Vec BRepApprox_SurfaceTool::DN(const BRepAdaptor_Surface& S,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
const Standard_Integer Nu, const Standard_Integer Nu,
@ -170,66 +167,66 @@ inline gp_Vec BRepApprox_SurfaceToolGen::DN(const TheSurface& S,
return S.DN(U,V,Nu,Nv); return S.DN(U,V,Nu,Nv);
} }
inline Standard_Real BRepApprox_SurfaceToolGen::UResolution(const TheSurface& S, inline Standard_Real BRepApprox_SurfaceTool::UResolution(const BRepAdaptor_Surface& S,
const Standard_Real R3d) const Standard_Real R3d)
{ {
return S.UResolution(R3d); return S.UResolution(R3d);
} }
inline Standard_Real BRepApprox_SurfaceToolGen::VResolution(const TheSurface& S, inline Standard_Real BRepApprox_SurfaceTool::VResolution(const BRepAdaptor_Surface& S,
const Standard_Real R3d) const Standard_Real R3d)
{ {
return S.VResolution(R3d); return S.VResolution(R3d);
} }
inline GeomAbs_SurfaceType BRepApprox_SurfaceToolGen::GetType(const TheSurface& S ) inline GeomAbs_SurfaceType BRepApprox_SurfaceTool::GetType(const BRepAdaptor_Surface& S )
{ {
return S.GetType(); return S.GetType();
} }
inline gp_Pln BRepApprox_SurfaceToolGen::Plane(const TheSurface& S) inline gp_Pln BRepApprox_SurfaceTool::Plane(const BRepAdaptor_Surface& S)
{ {
return S.Plane(); return S.Plane();
} }
inline gp_Cylinder BRepApprox_SurfaceToolGen::Cylinder(const TheSurface& S) inline gp_Cylinder BRepApprox_SurfaceTool::Cylinder(const BRepAdaptor_Surface& S)
{ {
return S.Cylinder(); return S.Cylinder();
} }
inline gp_Cone BRepApprox_SurfaceToolGen::Cone(const TheSurface& S) inline gp_Cone BRepApprox_SurfaceTool::Cone(const BRepAdaptor_Surface& S)
{ {
return S.Cone(); return S.Cone();
} }
inline gp_Sphere BRepApprox_SurfaceToolGen::Sphere(const TheSurface& S) inline gp_Sphere BRepApprox_SurfaceTool::Sphere(const BRepAdaptor_Surface& S)
{ {
return S.Sphere(); return S.Sphere();
} }
inline gp_Torus BRepApprox_SurfaceToolGen::Torus(const TheSurface& S) inline gp_Torus BRepApprox_SurfaceTool::Torus(const BRepAdaptor_Surface& S)
{ {
return S.Torus(); return S.Torus();
} }
inline Handle(Geom_BezierSurface) BRepApprox_SurfaceToolGen::Bezier(const TheSurface& S) { inline Handle(Geom_BezierSurface) BRepApprox_SurfaceTool::Bezier(const BRepAdaptor_Surface& S) {
return(S.Bezier()); return(S.Bezier());
} }
inline Handle(Geom_BSplineSurface) BRepApprox_SurfaceToolGen::BSpline(const TheSurface& S) { inline Handle(Geom_BSplineSurface) BRepApprox_SurfaceTool::BSpline(const BRepAdaptor_Surface& S) {
return(S.BSpline()); return(S.BSpline());
} }
inline gp_Ax1 BRepApprox_SurfaceToolGen::AxeOfRevolution(const TheSurface& S) { inline gp_Ax1 BRepApprox_SurfaceTool::AxeOfRevolution(const BRepAdaptor_Surface& S) {
return(S.AxeOfRevolution()); return(S.AxeOfRevolution());
} }
inline gp_Dir BRepApprox_SurfaceToolGen::Direction(const TheSurface& S) { inline gp_Dir BRepApprox_SurfaceTool::Direction(const BRepAdaptor_Surface& S) {
return(S.Direction()); return(S.Direction());
} }
inline Handle(Adaptor3d_HCurve) BRepApprox_SurfaceToolGen::BasisCurve(const TheSurface& S) { inline Handle(Adaptor3d_HCurve) BRepApprox_SurfaceTool::BasisCurve(const BRepAdaptor_Surface& S) {
return(S.BasisCurve()); return(S.BasisCurve());
} }

32
src/BRepBlend/BRepBlend.cdl
View File

@ -27,14 +27,12 @@ uses Blend, BlendFunc, AppBlend, Approx, Adaptor3d,Adaptor2d,
is is
generic class HCurveToolGen; class PointOnRst;
generic class HCurve2dToolGen; class Extremity;
class Line;
class HCurveTool instantiates HCurveToolGen from BRepBlend ( class HCurveTool;
HCurve from Adaptor3d); class HCurve2dTool;
class HCurve2dTool instantiates HCurve2dToolGen from BRepBlend (
HCurve2d from Adaptor2d);
class BlendTool; class BlendTool;
@ -62,29 +60,9 @@ is
alias ChAsymInv is ChAsymInv from BlendFunc; alias ChAsymInv is ChAsymInv from BlendFunc;
class PointOnRst instantiates PointOnRst from Blend
(HCurve2d from Adaptor2d);
class SequenceOfPointOnRst instantiates Sequence from TCollection class SequenceOfPointOnRst instantiates Sequence from TCollection
(PointOnRst from BRepBlend); (PointOnRst from BRepBlend);
class Extremity instantiates Extremity from Blend
(HVertex from Adaptor3d,
HCurve2d from Adaptor2d,
PointOnRst from BRepBlend,
SequenceOfPointOnRst from BRepBlend);
class Line instantiates Line from Blend
(HVertex from Adaptor3d,
HCurve2d from Adaptor2d,
PointOnRst from BRepBlend,
SequenceOfPointOnRst from BRepBlend,
Extremity from BRepBlend);
class Walking instantiates Walking from Blend class Walking instantiates Walking from Blend
(HVertex from Adaptor3d, (HVertex from Adaptor3d,
HCurve2d from Adaptor2d, HCurve2d from Adaptor2d,

40
src/Blend/Blend_Extremity.cdl → src/BRepBlend/BRepBlend_Extremity.cdl
View File

@ -14,20 +14,16 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class Extremity from Blend class Extremity from BRepBlend
(TheVertex as any;
TheArc as any;
ThePointOnRst as any; -- as PointOnRst from Blend(TheArc)
TheSequenceOfPointOnRst as any)
---Purpose: ---Purpose:
uses Pnt from gp, uses Pnt from gp,
Vec from gp, Vec from gp,
Transition from IntSurf Transition from IntSurf,
HVertex from Adaptor3d,
HCurve2d from Adaptor2d,
PointOnRst from BRepBlend,
SequenceOfPointOnRst from BRepBlend
raises DomainError from Standard, raises DomainError from Standard,
OutOfRange from Standard OutOfRange from Standard
@ -36,28 +32,28 @@ is
Create Create
returns Extremity from Blend; returns Extremity from BRepBlend;
Create(P: Pnt from gp; Create(P: Pnt from gp;
U,V,Param: Real from Standard; Tol: Real from Standard) U,V,Param: Real from Standard; Tol: Real from Standard)
---Purpose: Creates an extremity on a surface ---Purpose: Creates an extremity on a surface
returns Extremity from Blend; returns Extremity from BRepBlend;
Create(P: Pnt from gp; Create(P: Pnt from gp;
U,V,Param: Real from Standard; Tol: Real from Standard; U,V,Param: Real from Standard; Tol: Real from Standard;
Vtx: TheVertex) Vtx: HVertex from Adaptor3d)
---Purpose: Creates an extremity on a surface. This extremity matches ---Purpose: Creates an extremity on a surface. This extremity matches
-- the vertex <Vtx>. -- the vertex <Vtx>.
returns Extremity from Blend; returns Extremity from BRepBlend;
Create(P: Pnt from gp; Create(P: Pnt from gp;
W, Param: Real from Standard; Tol: Real from Standard) W, Param: Real from Standard; Tol: Real from Standard)
---Purpose: Creates an extremity on a curve ---Purpose: Creates an extremity on a curve
returns Extremity from Blend; returns Extremity from BRepBlend;
SetValue(me: in out; P: Pnt from gp; SetValue(me: in out; P: Pnt from gp;
@ -69,7 +65,7 @@ is
SetValue(me: in out; P: Pnt from gp; SetValue(me: in out; P: Pnt from gp;
U,V,Param: Real from Standard; U,V,Param: Real from Standard;
Tol: Real from Standard; Vtx: TheVertex) Tol: Real from Standard; Vtx: HVertex from Adaptor3d)
---Purpose: Set the values for an extremity on a surface.This ---Purpose: Set the values for an extremity on a surface.This
-- extremity matches the vertex <Vtx>. -- extremity matches the vertex <Vtx>.
is static; is static;
@ -132,12 +128,12 @@ is
-- methods for an extremity on a surface -- methods for an extremity on a surface
SetVertex(me: in out; V: TheVertex) SetVertex(me: in out; V: HVertex from Adaptor3d)
---Purpose: Set the values for an extremity on a curve. ---Purpose: Set the values for an extremity on a curve.
is static; is static;
AddArc(me: in out; A: TheArc; Param: Real from Standard; AddArc(me: in out; A: HCurve2d from Adaptor2d; Param: Real from Standard;
TLine, TArc: Transition from IntSurf) TLine, TArc: Transition from IntSurf)
---Purpose: Sets the values of a point which is on the arc ---Purpose: Sets the values of a point which is on the arc
@ -171,7 +167,7 @@ is
---Purpose: Returns the vertex when IsVertex returns Standard_True. ---Purpose: Returns the vertex when IsVertex returns Standard_True.
returns any TheVertex returns any HVertex from Adaptor3d
---C++: inline ---C++: inline
---C++: return const& ---C++: return const&
@ -200,7 +196,7 @@ is
---Purpose: ---Purpose:
returns any ThePointOnRst returns any PointOnRst from BRepBlend
---C++: inline ---C++: inline
---C++: return const& ---C++: return const&
@ -225,8 +221,8 @@ is
is static; is static;
fields fields
vtx : TheVertex; vtx : HVertex from Adaptor3d;
seqpt : TheSequenceOfPointOnRst; seqpt : SequenceOfPointOnRst from BRepBlend;
pt : Pnt from gp; pt : Pnt from gp;
tang : Vec from gp; tang : Vec from gp;
param : Real from Standard; param : Real from Standard;

27
src/Blend/Blend_Extremity.gxx → src/BRepBlend/BRepBlend_Extremity.cxx
View File

@ -12,7 +12,10 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
Blend_Extremity::Blend_Extremity (): #include <BRepBlend_Extremity.ixx>
#include <BRepBlend_PointOnRst.hxx>
BRepBlend_Extremity::BRepBlend_Extremity ():
pt(gp_Pnt(0,0,0)), pt(gp_Pnt(0,0,0)),
tang(gp_Vec(0,0,0)), tang(gp_Vec(0,0,0)),
param(0.0), u(0.0), v(0.0), tol(0.0), param(0.0), u(0.0), v(0.0), tol(0.0),
@ -20,7 +23,7 @@ Blend_Extremity::Blend_Extremity ():
{ {
} }
Blend_Extremity::Blend_Extremity (const gp_Pnt& P, BRepBlend_Extremity::BRepBlend_Extremity (const gp_Pnt& P,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
const Standard_Real Param, const Standard_Real Param,
@ -33,12 +36,12 @@ Blend_Extremity::Blend_Extremity (const gp_Pnt& P,
} }
Blend_Extremity::Blend_Extremity (const gp_Pnt& P, BRepBlend_Extremity::BRepBlend_Extremity (const gp_Pnt& P,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
const Standard_Real Param, const Standard_Real Param,
const Standard_Real Tol, const Standard_Real Tol,
const TheVertex& Vtx) : const Handle(Adaptor3d_HVertex)& Vtx) :
vtx(Vtx),pt(P), vtx(Vtx),pt(P),
tang(gp_Vec(0,0,0)), tang(gp_Vec(0,0,0)),
param(Param),u(U),v(V),tol(Tol),isvtx(Standard_True), param(Param),u(U),v(V),tol(Tol),isvtx(Standard_True),
@ -46,7 +49,7 @@ Blend_Extremity::Blend_Extremity (const gp_Pnt& P,
{} {}
Blend_Extremity::Blend_Extremity (const gp_Pnt& P, BRepBlend_Extremity::BRepBlend_Extremity (const gp_Pnt& P,
const Standard_Real W, const Standard_Real W,
const Standard_Real Param, const Standard_Real Param,
const Standard_Real Tol) : const Standard_Real Tol) :
@ -57,7 +60,7 @@ Blend_Extremity::Blend_Extremity (const gp_Pnt& P,
{} {}
void Blend_Extremity::SetValue (const gp_Pnt& P, void BRepBlend_Extremity::SetValue (const gp_Pnt& P,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
const Standard_Real Param, const Standard_Real Param,
@ -73,12 +76,12 @@ void Blend_Extremity::SetValue (const gp_Pnt& P,
} }
void Blend_Extremity::SetValue (const gp_Pnt& P, void BRepBlend_Extremity::SetValue (const gp_Pnt& P,
const Standard_Real U, const Standard_Real U,
const Standard_Real V, const Standard_Real V,
const Standard_Real Param, const Standard_Real Param,
const Standard_Real Tol, const Standard_Real Tol,
const TheVertex& Vtx) const Handle(Adaptor3d_HVertex)& Vtx)
{ {
pt = P; pt = P;
u = U; u = U;
@ -90,7 +93,7 @@ void Blend_Extremity::SetValue (const gp_Pnt& P,
seqpt.Clear(); seqpt.Clear();
} }
void Blend_Extremity::SetValue (const gp_Pnt& P, void BRepBlend_Extremity::SetValue (const gp_Pnt& P,
const Standard_Real W, const Standard_Real W,
const Standard_Real Param, const Standard_Real Param,
const Standard_Real Tol) const Standard_Real Tol)
@ -104,17 +107,17 @@ void Blend_Extremity::SetValue (const gp_Pnt& P,
} }
void Blend_Extremity::SetVertex (const TheVertex& V) void BRepBlend_Extremity::SetVertex (const Handle(Adaptor3d_HVertex)& V)
{ {
isvtx = Standard_True; isvtx = Standard_True;
vtx = V; vtx = V;
} }
void Blend_Extremity::AddArc (const TheArc& A, void BRepBlend_Extremity::AddArc (const Handle(Adaptor2d_HCurve2d)& A,
const Standard_Real Param, const Standard_Real Param,
const IntSurf_Transition& TLine, const IntSurf_Transition& TLine,
const IntSurf_Transition& TArc) const IntSurf_Transition& TArc)
{ {
seqpt.Append(ThePointOnRst(A,Param,TLine,TArc)); seqpt.Append(BRepBlend_PointOnRst(A,Param,TLine,TArc));
} }

24
src/Blend/Blend_Extremity.lxx → src/BRepBlend/BRepBlend_Extremity.lxx
View File

@ -14,71 +14,71 @@
#include <Standard_DomainError.hxx> #include <Standard_DomainError.hxx>
inline const gp_Pnt& Blend_Extremity::Value () const inline const gp_Pnt& BRepBlend_Extremity::Value () const
{ {
return pt; return pt;
} }
inline void Blend_Extremity::SetTangent(const gp_Vec& Tangent) inline void BRepBlend_Extremity::SetTangent(const gp_Vec& Tangent)
{ {
hastang = Standard_True; hastang = Standard_True;
tang = Tangent; tang = Tangent;
} }
inline Standard_Boolean Blend_Extremity::HasTangent () const inline Standard_Boolean BRepBlend_Extremity::HasTangent () const
{ {
return hastang; return hastang;
} }
inline const gp_Vec& Blend_Extremity::Tangent () const inline const gp_Vec& BRepBlend_Extremity::Tangent () const
{ {
if (!hastang) {Standard_DomainError::Raise();} if (!hastang) {Standard_DomainError::Raise();}
return tang; return tang;
} }
inline void Blend_Extremity::Parameters(Standard_Real& U, inline void BRepBlend_Extremity::Parameters(Standard_Real& U,
Standard_Real& V) const Standard_Real& V) const
{ {
U = u; U = u;
V = v; V = v;
} }
inline Standard_Real Blend_Extremity::Tolerance() const inline Standard_Real BRepBlend_Extremity::Tolerance() const
{ {
return tol; return tol;
} }
inline Standard_Boolean Blend_Extremity::IsVertex() const inline Standard_Boolean BRepBlend_Extremity::IsVertex() const
{ {
return isvtx; return isvtx;
} }
inline const TheVertex& Blend_Extremity::Vertex () const inline const Handle_Adaptor3d_HVertex& BRepBlend_Extremity::Vertex () const
{ {
if (!isvtx) {Standard_DomainError::Raise();} if (!isvtx) {Standard_DomainError::Raise();}
return vtx; return vtx;
} }
inline Standard_Integer Blend_Extremity::NbPointOnRst () const inline Standard_Integer BRepBlend_Extremity::NbPointOnRst () const
{ {
return seqpt.Length(); return seqpt.Length();
} }
inline const ThePointOnRst& Blend_Extremity::PointOnRst inline const BRepBlend_PointOnRst& BRepBlend_Extremity::PointOnRst
(const Standard_Integer Index) const (const Standard_Integer Index) const
{ {
return seqpt(Index); return seqpt(Index);
} }
inline Standard_Real Blend_Extremity::Parameter() const inline Standard_Real BRepBlend_Extremity::Parameter() const
{ {
return u; return u;
} }
inline Standard_Real Blend_Extremity::ParameterOnGuide() const inline Standard_Real BRepBlend_Extremity::ParameterOnGuide() const
{ {
return param; return param;

56
src/BRepBlend/BRepBlend_HCurve2dToolGen.cdl → src/BRepBlend/BRepBlend_HCurve2dTool.cdl
View File

@ -14,8 +14,7 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class HCurve2dToolGen from BRepBlend ( class HCurve2dTool from BRepBlend
CurveGen as any)
uses uses
Array1OfReal from TColStd, Array1OfReal from TColStd,
@ -29,7 +28,8 @@ uses
Parab2d from gp, Parab2d from gp,
Lin2d from gp, Lin2d from gp,
BezierCurve from Geom2d, BezierCurve from Geom2d,
BSplineCurve from Geom2d BSplineCurve from Geom2d,
HCurve2d from Adaptor2d
raises raises
@ -43,12 +43,12 @@ is
-- Global methods - Apply to the whole curve. -- Global methods - Apply to the whole curve.
-- --
FirstParameter(myclass; C: CurveGen) returns Real FirstParameter(myclass; C: HCurve2d from Adaptor2d) returns Real
---C++: inline ---C++: inline
; ;
LastParameter(myclass; C: CurveGen) returns Real LastParameter(myclass; C: HCurve2d from Adaptor2d) returns Real
---C++: inline ---C++: inline
; ;
@ -72,18 +72,18 @@ is
-- use the method Trim(). -- use the method Trim().
Continuity(myclass; C: CurveGen) returns Shape from GeomAbs Continuity(myclass; C: HCurve2d from Adaptor2d) returns Shape from GeomAbs
---Purpose: ---Purpose:
---C++: inline ---C++: inline
; ;
NbIntervals(myclass; C: CurveGen; S : Shape from GeomAbs) returns Integer NbIntervals(myclass; C: HCurve2d from Adaptor2d; S : Shape from GeomAbs) returns Integer
---Purpose: Returns the number of intervals for continuity ---Purpose: Returns the number of intervals for continuity
-- <S>. May be one if Continuity(myclass) >= <S> -- <S>. May be one if Continuity(myclass) >= <S>
---C++: inline ---C++: inline
; ;
Intervals(myclass; C: CurveGen; T : in out Array1OfReal from TColStd; Intervals(myclass; C: HCurve2d from Adaptor2d; T : in out Array1OfReal from TColStd;
S : Shape from GeomAbs) S : Shape from GeomAbs)
---Purpose: Stores in <T> the parameters bounding the intervals ---Purpose: Stores in <T> the parameters bounding the intervals
-- of continuity <S>. -- of continuity <S>.
@ -95,31 +95,31 @@ is
---C++: inline ---C++: inline
; ;
IsClosed(myclass; C: CurveGen) returns Boolean IsClosed(myclass; C: HCurve2d from Adaptor2d) returns Boolean
---C++: inline ---C++: inline
; ;
IsPeriodic(myclass; C: CurveGen) returns Boolean IsPeriodic(myclass; C: HCurve2d from Adaptor2d) returns Boolean
---C++: inline ---C++: inline
; ;
Period(myclass; C: CurveGen) returns Real Period(myclass; C: HCurve2d from Adaptor2d) returns Real
raises raises
DomainError from Standard -- if the curve is not periodic DomainError from Standard -- if the curve is not periodic
---C++: inline ---C++: inline
; ;
Value(myclass; C: CurveGen; U : Real) returns Pnt2d from gp Value(myclass; C: HCurve2d from Adaptor2d; U : Real) returns Pnt2d from gp
--- Purpose : Computes the point of parameter U on the curve. --- Purpose : Computes the point of parameter U on the curve.
---C++: inline ---C++: inline
; ;
D0 (myclass; C: CurveGen; U : Real; P : out Pnt2d from gp) D0 (myclass; C: HCurve2d from Adaptor2d; U : Real; P : out Pnt2d from gp)
--- Purpose : Computes the point of parameter U on the curve. --- Purpose : Computes the point of parameter U on the curve.
---C++: inline ---C++: inline
; ;
D1 (myclass; C: CurveGen; U : Real; P : out Pnt2d from gp ; V : out Vec2d from gp) D1 (myclass; C: HCurve2d from Adaptor2d; U : Real; P : out Pnt2d from gp ; V : out Vec2d from gp)
--- Purpose : Computes the point of parameter U on the curve with its --- Purpose : Computes the point of parameter U on the curve with its
-- first derivative. -- first derivative.
raises raises
@ -129,7 +129,7 @@ is
---C++: inline ---C++: inline
; ;
D2 (myclass; C: CurveGen; U : Real; P : out Pnt2d from gp; V1, V2 : out Vec2d from gp) D2 (myclass; C: HCurve2d from Adaptor2d; U : Real; P : out Pnt2d from gp; V1, V2 : out Vec2d from gp)
--- Purpose : --- Purpose :
-- Returns the point P of parameter U, the first and second -- Returns the point P of parameter U, the first and second
-- derivatives V1 and V2. -- derivatives V1 and V2.
@ -140,7 +140,7 @@ is
---C++: inline ---C++: inline
; ;
D3 (myclass; C: CurveGen; U : Real; P : out Pnt2d from gp; V1, V2, V3 : out Vec2d from gp) D3 (myclass; C: HCurve2d from Adaptor2d; U : Real; P : out Pnt2d from gp; V1, V2, V3 : out Vec2d from gp)
--- Purpose : --- Purpose :
-- Returns the point P of parameter U, the first, the second -- Returns the point P of parameter U, the first, the second
-- and the third derivative. -- and the third derivative.
@ -151,7 +151,7 @@ is
---C++: inline ---C++: inline
; ;
DN (myclass; C: CurveGen; U : Real; N : Integer) returns Vec2d from gp DN (myclass; C: HCurve2d from Adaptor2d; U : Real; N : Integer) returns Vec2d from gp
--- Purpose : --- Purpose :
-- The returned vector gives the value of the derivative for the -- The returned vector gives the value of the derivative for the
-- order of derivation N. -- order of derivation N.
@ -164,13 +164,13 @@ is
---C++: inline ---C++: inline
; ;
Resolution(myclass; C: CurveGen; R3d : Real) returns Real Resolution(myclass; C: HCurve2d from Adaptor2d; R3d : Real) returns Real
---Purpose : Returns the parametric resolution corresponding ---Purpose : Returns the parametric resolution corresponding
-- to the real space resolution <R3d>. -- to the real space resolution <R3d>.
---C++: inline ---C++: inline
; ;
GetType(myclass; C: CurveGen) returns CurveType from GeomAbs GetType(myclass; C: HCurve2d from Adaptor2d) returns CurveType from GeomAbs
---Purpose: Returns the type of the curve in the current ---Purpose: Returns the type of the curve in the current
-- interval : Line, Circle, Ellipse, Hyperbola, -- interval : Line, Circle, Ellipse, Hyperbola,
-- Parabola, BezierCurve, BSplineCurve, OtherCurve. -- Parabola, BezierCurve, BSplineCurve, OtherCurve.
@ -182,43 +182,43 @@ is
-- the corresponding type. -- the corresponding type.
-- --
Line(myclass; C: CurveGen) returns Lin2d from gp Line(myclass; C: HCurve2d from Adaptor2d) returns Lin2d from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Circle(myclass; C: CurveGen) returns Circ2d from gp Circle(myclass; C: HCurve2d from Adaptor2d) returns Circ2d from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Ellipse(myclass; C: CurveGen) returns Elips2d from gp Ellipse(myclass; C: HCurve2d from Adaptor2d) returns Elips2d from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Hyperbola(myclass; C: CurveGen) returns Hypr2d from gp Hyperbola(myclass; C: HCurve2d from Adaptor2d) returns Hypr2d from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Parabola(myclass; C: CurveGen) returns Parab2d from gp Parabola(myclass; C: HCurve2d from Adaptor2d) returns Parab2d from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Bezier(myclass; C: CurveGen) returns BezierCurve from Geom2d Bezier(myclass; C: HCurve2d from Adaptor2d) returns BezierCurve from Geom2d
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
BSpline(myclass; C: CurveGen) returns BSplineCurve from Geom2d BSpline(myclass; C: HCurve2d from Adaptor2d) returns BSplineCurve from Geom2d
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
@ -228,9 +228,9 @@ is
NbSamples(myclass; C: CurveGen; U0,U1: Real from Standard) NbSamples(myclass; C: HCurve2d from Adaptor2d; U0,U1: Real from Standard)
returns Integer from Standard; returns Integer from Standard;
end HCurve2dToolGen; end HCurve2dTool;

5
src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx → src/BRepBlend/BRepBlend_HCurve2dTool.cxx
View File

@ -14,7 +14,8 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include CurveGen_hxx #include <BRepBlend_HCurve2dTool.ixx>
#include <GeomAbs_CurveType.hxx> #include <GeomAbs_CurveType.hxx>
#include <GeomAbs_Shape.hxx> #include <GeomAbs_Shape.hxx>
#include <Geom2d_BezierCurve.hxx> #include <Geom2d_BezierCurve.hxx>
@ -24,7 +25,7 @@
//============================================================ //============================================================
Standard_Integer BRepBlend_HCurve2dToolGen::NbSamples (const CurveGen& C, Standard_Integer BRepBlend_HCurve2dTool::NbSamples (const Handle(Adaptor2d_HCurve2d)& C,
const Standard_Real U0, const Standard_Real U0,
const Standard_Real U1) { const Standard_Real U1) {
GeomAbs_CurveType typC = C->GetType(); GeomAbs_CurveType typC = C->GetType();

48
src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx → src/BRepBlend/BRepBlend_HCurve2dTool.lxx
View File

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

56
src/BRepBlend/BRepBlend_HCurveToolGen.cdl → src/BRepBlend/BRepBlend_HCurveTool.cdl
View File

@ -14,8 +14,7 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class HCurveToolGen from BRepBlend ( class HCurveTool from BRepBlend
CurveGen as any)
uses uses
Array1OfReal from TColStd, Array1OfReal from TColStd,
@ -29,7 +28,8 @@ uses
Parab from gp, Parab from gp,
Lin from gp, Lin from gp,
BezierCurve from Geom, BezierCurve from Geom,
BSplineCurve from Geom BSplineCurve from Geom,
HCurve from Adaptor3d
raises raises
@ -43,12 +43,12 @@ is
-- Global methods - Apply to the whole curve. -- Global methods - Apply to the whole curve.
-- --
FirstParameter(myclass; C: CurveGen) returns Real FirstParameter(myclass; C: HCurve from Adaptor3d) returns Real
---C++: inline ---C++: inline
; ;
LastParameter(myclass; C: CurveGen) returns Real LastParameter(myclass; C: HCurve from Adaptor3d) returns Real
---C++: inline ---C++: inline
; ;
@ -72,18 +72,18 @@ is
-- use the method Trim(). -- use the method Trim().
Continuity(myclass; C: CurveGen) returns Shape from GeomAbs Continuity(myclass; C: HCurve from Adaptor3d) returns Shape from GeomAbs
---Purpose: ---Purpose:
---C++: inline ---C++: inline
; ;
NbIntervals(myclass; C: CurveGen; S : Shape from GeomAbs) returns Integer NbIntervals(myclass; C: HCurve from Adaptor3d; S : Shape from GeomAbs) returns Integer
---Purpose: Returns the number of intervals for continuity ---Purpose: Returns the number of intervals for continuity
-- <S>. May be one if Continuity(myclass) >= <S> -- <S>. May be one if Continuity(myclass) >= <S>
---C++: inline ---C++: inline
; ;
Intervals(myclass; C: CurveGen; T : in out Array1OfReal from TColStd; Intervals(myclass; C: HCurve from Adaptor3d; T : in out Array1OfReal from TColStd;
S : Shape from GeomAbs) S : Shape from GeomAbs)
---Purpose: Stores in <T> the parameters bounding the intervals ---Purpose: Stores in <T> the parameters bounding the intervals
-- of continuity <S>. -- of continuity <S>.
@ -95,31 +95,31 @@ is
---C++: inline ---C++: inline
; ;
IsClosed(myclass; C: CurveGen) returns Boolean IsClosed(myclass; C: HCurve from Adaptor3d) returns Boolean
---C++: inline ---C++: inline
; ;
IsPeriodic(myclass; C: CurveGen) returns Boolean IsPeriodic(myclass; C: HCurve from Adaptor3d) returns Boolean
---C++: inline ---C++: inline
; ;
Period(myclass; C: CurveGen) returns Real Period(myclass; C: HCurve from Adaptor3d) returns Real
raises raises
DomainError from Standard -- if the curve is not periodic DomainError from Standard -- if the curve is not periodic
---C++: inline ---C++: inline
; ;
Value(myclass; C: CurveGen; U : Real) returns Pnt from gp Value(myclass; C: HCurve from Adaptor3d; U : Real) returns Pnt from gp
--- Purpose : Computes the point of parameter U on the curve. --- Purpose : Computes the point of parameter U on the curve.
---C++: inline ---C++: inline
; ;
D0 (myclass; C: CurveGen; U : Real; P : out Pnt from gp) D0 (myclass; C: HCurve from Adaptor3d; U : Real; P : out Pnt from gp)
--- Purpose : Computes the point of parameter U on the curve. --- Purpose : Computes the point of parameter U on the curve.
---C++: inline ---C++: inline
; ;
D1 (myclass; C: CurveGen; U : Real; P : out Pnt from gp ; V : out Vec from gp) D1 (myclass; C: HCurve from Adaptor3d; U : Real; P : out Pnt from gp ; V : out Vec from gp)
--- Purpose : Computes the point of parameter U on the curve with its --- Purpose : Computes the point of parameter U on the curve with its
-- first derivative. -- first derivative.
raises raises
@ -129,7 +129,7 @@ is
---C++: inline ---C++: inline
; ;
D2 (myclass; C: CurveGen; U : Real; P : out Pnt from gp; V1, V2 : out Vec from gp) D2 (myclass; C: HCurve from Adaptor3d; U : Real; P : out Pnt from gp; V1, V2 : out Vec from gp)
--- Purpose : --- Purpose :
-- Returns the point P of parameter U, the first and second -- Returns the point P of parameter U, the first and second
-- derivatives V1 and V2. -- derivatives V1 and V2.
@ -140,7 +140,7 @@ is
---C++: inline ---C++: inline
; ;
D3 (myclass; C: CurveGen; U : Real; P : out Pnt from gp; V1, V2, V3 : out Vec from gp) D3 (myclass; C: HCurve from Adaptor3d; U : Real; P : out Pnt from gp; V1, V2, V3 : out Vec from gp)
--- Purpose : --- Purpose :
-- Returns the point P of parameter U, the first, the second -- Returns the point P of parameter U, the first, the second
-- and the third derivative. -- and the third derivative.
@ -151,7 +151,7 @@ is
---C++: inline ---C++: inline
; ;
DN (myclass; C: CurveGen; U : Real; N : Integer) returns Vec from gp DN (myclass; C: HCurve from Adaptor3d; U : Real; N : Integer) returns Vec from gp
--- Purpose : --- Purpose :
-- The returned vector gives the value of the derivative for the -- The returned vector gives the value of the derivative for the
-- order of derivation N. -- order of derivation N.
@ -164,13 +164,13 @@ is
---C++: inline ---C++: inline
; ;
Resolution(myclass; C: CurveGen; R3d : Real) returns Real Resolution(myclass; C: HCurve from Adaptor3d; R3d : Real) returns Real
---Purpose : Returns the parametric resolution corresponding ---Purpose : Returns the parametric resolution corresponding
-- to the real space resolution <R3d>. -- to the real space resolution <R3d>.
---C++: inline ---C++: inline
; ;
GetType(myclass; C: CurveGen) returns CurveType from GeomAbs GetType(myclass; C: HCurve from Adaptor3d) returns CurveType from GeomAbs
---Purpose: Returns the type of the curve in the current ---Purpose: Returns the type of the curve in the current
-- interval : Line, Circle, Ellipse, Hyperbola, -- interval : Line, Circle, Ellipse, Hyperbola,
-- Parabola, BezierCurve, BSplineCurve, OtherCurve. -- Parabola, BezierCurve, BSplineCurve, OtherCurve.
@ -182,43 +182,43 @@ is
-- the corresponding type. -- the corresponding type.
-- --
Line(myclass; C: CurveGen) returns Lin from gp Line(myclass; C: HCurve from Adaptor3d) returns Lin from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Circle(myclass; C: CurveGen) returns Circ from gp Circle(myclass; C: HCurve from Adaptor3d) returns Circ from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Ellipse(myclass; C: CurveGen) returns Elips from gp Ellipse(myclass; C: HCurve from Adaptor3d) returns Elips from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Hyperbola(myclass; C: CurveGen) returns Hypr from gp Hyperbola(myclass; C: HCurve from Adaptor3d) returns Hypr from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Parabola(myclass; C: CurveGen) returns Parab from gp Parabola(myclass; C: HCurve from Adaptor3d) returns Parab from gp
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
Bezier(myclass; C: CurveGen) returns BezierCurve from Geom Bezier(myclass; C: HCurve from Adaptor3d) returns BezierCurve from Geom
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
; ;
BSpline(myclass; C: CurveGen) returns BSplineCurve from Geom BSpline(myclass; C: HCurve from Adaptor3d) returns BSplineCurve from Geom
raises raises
NoSuchObject from Standard NoSuchObject from Standard
---C++: inline ---C++: inline
@ -228,9 +228,9 @@ is
NbSamples(myclass; C: CurveGen; U0,U1: Real from Standard) NbSamples(myclass; C: HCurve from Adaptor3d; U0,U1: Real from Standard)
returns Integer from Standard; returns Integer from Standard;
end HCurveToolGen; end HCurveTool;

5
src/BRepBlend/BRepBlend_HCurveToolGen.gxx → src/BRepBlend/BRepBlend_HCurveTool.cxx
View File

@ -14,7 +14,8 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include CurveGen_hxx #include <BRepBlend_HCurveTool.ixx>
#include <GeomAbs_CurveType.hxx> #include <GeomAbs_CurveType.hxx>
#include <GeomAbs_Shape.hxx> #include <GeomAbs_Shape.hxx>
#include <Geom_BezierCurve.hxx> #include <Geom_BezierCurve.hxx>
@ -24,7 +25,7 @@
//============================================================ //============================================================
Standard_Integer BRepBlend_HCurveToolGen::NbSamples (const CurveGen& C, Standard_Integer BRepBlend_HCurveTool::NbSamples (const Handle(Adaptor3d_HCurve)& C,
const Standard_Real U0, const Standard_Real U0,
const Standard_Real U1) { const Standard_Real U1) {
GeomAbs_CurveType typC = C->GetType(); GeomAbs_CurveType typC = C->GetType();

48
src/BRepBlend/BRepBlend_HCurveToolGen.lxx → src/BRepBlend/BRepBlend_HCurveTool.lxx
View File

@ -14,8 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include CurveGen_hxx
#include <GeomAbs_CurveType.hxx> #include <GeomAbs_CurveType.hxx>
#include <GeomAbs_Shape.hxx> #include <GeomAbs_Shape.hxx>
@ -33,59 +31,59 @@
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
//============================================================ //============================================================
inline Standard_Real BRepBlend_HCurveToolGen::FirstParameter (const CurveGen& C) { inline Standard_Real BRepBlend_HCurveTool::FirstParameter (const Handle(Adaptor3d_HCurve)& C) {
return(C->FirstParameter()); return(C->FirstParameter());
} }
//============================================================ //============================================================
inline Standard_Real BRepBlend_HCurveToolGen::LastParameter (const CurveGen& C) { inline Standard_Real BRepBlend_HCurveTool::LastParameter (const Handle(Adaptor3d_HCurve)& C) {
return(C->LastParameter()); return(C->LastParameter());
} }
//============================================================ //============================================================
inline GeomAbs_Shape BRepBlend_HCurveToolGen::Continuity (const CurveGen& C) { inline GeomAbs_Shape BRepBlend_HCurveTool::Continuity (const Handle(Adaptor3d_HCurve)& C) {
return(C->Continuity()); return(C->Continuity());
} }
//============================================================ //============================================================
inline Standard_Integer BRepBlend_HCurveToolGen::NbIntervals(const CurveGen& C,const GeomAbs_Shape Sh) { inline Standard_Integer BRepBlend_HCurveTool::NbIntervals(const Handle(Adaptor3d_HCurve)& C,const GeomAbs_Shape Sh) {
return(C->NbIntervals(Sh)); return(C->NbIntervals(Sh));
} }
//============================================================ //============================================================
inline void BRepBlend_HCurveToolGen::Intervals(const CurveGen& C, inline void BRepBlend_HCurveTool::Intervals(const Handle(Adaptor3d_HCurve)& C,
TColStd_Array1OfReal& Tab, TColStd_Array1OfReal& Tab,
const GeomAbs_Shape Sh) { const GeomAbs_Shape Sh) {
C->Intervals(Tab,Sh); C->Intervals(Tab,Sh);
} }
//============================================================ //============================================================
inline Standard_Boolean BRepBlend_HCurveToolGen::IsClosed(const CurveGen& C) { inline Standard_Boolean BRepBlend_HCurveTool::IsClosed(const Handle(Adaptor3d_HCurve)& C) {
return(C->IsClosed()); return(C->IsClosed());
} }
//============================================================ //============================================================
inline Standard_Boolean BRepBlend_HCurveToolGen::IsPeriodic(const CurveGen& C) { inline Standard_Boolean BRepBlend_HCurveTool::IsPeriodic(const Handle(Adaptor3d_HCurve)& C) {
return(C->IsPeriodic()); return(C->IsPeriodic());
} }
//============================================================ //============================================================
inline Standard_Real BRepBlend_HCurveToolGen::Period(const CurveGen& C) { inline Standard_Real BRepBlend_HCurveTool::Period(const Handle(Adaptor3d_HCurve)& C) {
return(C->Period()); return(C->Period());
} }
//============================================================ //============================================================
inline gp_Pnt BRepBlend_HCurveToolGen::Value (const CurveGen& C, inline gp_Pnt BRepBlend_HCurveTool::Value (const Handle(Adaptor3d_HCurve)& C,
const Standard_Real U) { const Standard_Real U) {
return(C->Value(U)); return(C->Value(U));
} }
//============================================================ //============================================================
inline void BRepBlend_HCurveToolGen::D0(const CurveGen& C, inline void BRepBlend_HCurveTool::D0(const Handle(Adaptor3d_HCurve)& C,
const Standard_Real U, const Standard_Real U,
gp_Pnt& P) { gp_Pnt& P) {
C->D0(U,P); C->D0(U,P);
} }
//============================================================ //============================================================
inline void BRepBlend_HCurveToolGen::D1 (const CurveGen& C, inline void BRepBlend_HCurveTool::D1 (const Handle(Adaptor3d_HCurve)& C,
const Standard_Real U, const Standard_Real U,
gp_Pnt& P, gp_Pnt& P,
gp_Vec& T) { gp_Vec& T) {
C->D1(U,P,T); C->D1(U,P,T);
} }
//============================================================ //============================================================
inline void BRepBlend_HCurveToolGen::D2 (const CurveGen& C, inline void BRepBlend_HCurveTool::D2 (const Handle(Adaptor3d_HCurve)& C,
const Standard_Real U, const Standard_Real U,
gp_Pnt& P, gp_Pnt& P,
gp_Vec& T, gp_Vec& T,
@ -94,7 +92,7 @@ inline void BRepBlend_HCurveToolGen::D2 (const CurveGen& C,
C->D2(U,P,T,N); C->D2(U,P,T,N);
} }
//============================================================ //============================================================
inline void BRepBlend_HCurveToolGen::D3 (const CurveGen& C, inline void BRepBlend_HCurveTool::D3 (const Handle(Adaptor3d_HCurve)& C,
const Standard_Real U, const Standard_Real U,
gp_Pnt& P, gp_Pnt& P,
gp_Vec& V1, gp_Vec& V1,
@ -104,47 +102,47 @@ inline void BRepBlend_HCurveToolGen::D3 (const CurveGen& C,
C->D3(U,P,V1,V2,V3); C->D3(U,P,V1,V2,V3);
} }
//============================================================ //============================================================
inline gp_Vec BRepBlend_HCurveToolGen::DN (const CurveGen& C, inline gp_Vec BRepBlend_HCurveTool::DN (const Handle(Adaptor3d_HCurve)& C,
const Standard_Real U, const Standard_Real U,
const Standard_Integer N) { const Standard_Integer N) {
return(C->DN(U,N)); return(C->DN(U,N));
} }
//============================================================ //============================================================
inline Standard_Real BRepBlend_HCurveToolGen::Resolution(const CurveGen& C, inline Standard_Real BRepBlend_HCurveTool::Resolution(const Handle(Adaptor3d_HCurve)& C,
const Standard_Real R3d) { const Standard_Real R3d) {
return(C->Resolution(R3d)); return(C->Resolution(R3d));
} }
//============================================================ //============================================================
inline GeomAbs_CurveType BRepBlend_HCurveToolGen::GetType(const CurveGen& C) { inline GeomAbs_CurveType BRepBlend_HCurveTool::GetType(const Handle(Adaptor3d_HCurve)& C) {
return(C->GetType()); return(C->GetType());
} }
//============================================================ //============================================================
inline gp_Lin BRepBlend_HCurveToolGen::Line (const CurveGen& C) { inline gp_Lin BRepBlend_HCurveTool::Line (const Handle(Adaptor3d_HCurve)& C) {
return(C->Line()); return(C->Line());
} }
//============================================================ //============================================================
inline gp_Circ BRepBlend_HCurveToolGen::Circle (const CurveGen& C) { inline gp_Circ BRepBlend_HCurveTool::Circle (const Handle(Adaptor3d_HCurve)& C) {
return(C->Circle()); return(C->Circle());
} }
//============================================================ //============================================================
inline gp_Elips BRepBlend_HCurveToolGen::Ellipse (const CurveGen& C) { inline gp_Elips BRepBlend_HCurveTool::Ellipse (const Handle(Adaptor3d_HCurve)& C) {
return(C->Ellipse()); return(C->Ellipse());
} }
//============================================================ //============================================================
inline gp_Parab BRepBlend_HCurveToolGen::Parabola (const CurveGen& C) { inline gp_Parab BRepBlend_HCurveTool::Parabola (const Handle(Adaptor3d_HCurve)& C) {
return(C->Parabola()); return(C->Parabola());
} }
//============================================================ //============================================================
inline gp_Hypr BRepBlend_HCurveToolGen::Hyperbola (const CurveGen& C) { inline gp_Hypr BRepBlend_HCurveTool::Hyperbola (const Handle(Adaptor3d_HCurve)& C) {
return(C->Hyperbola()); return(C->Hyperbola());
} }
//============================================================ //============================================================
inline Handle(Geom_BezierCurve) BRepBlend_HCurveToolGen::Bezier (const CurveGen& C) { inline Handle(Geom_BezierCurve) BRepBlend_HCurveTool::Bezier (const Handle(Adaptor3d_HCurve)& C) {
return(C->Bezier()); return(C->Bezier());
} }
//============================================================ //============================================================
inline Handle(Geom_BSplineCurve) BRepBlend_HCurveToolGen::BSpline (const CurveGen& C) { inline Handle(Geom_BSplineCurve) BRepBlend_HCurveTool::BSpline (const Handle(Adaptor3d_HCurve)& C) {
return(C->BSpline()); return(C->BSpline());
} }
//============================================================ //============================================================

34
src/Blend/Blend_Line.cdl → src/BRepBlend/BRepBlend_Line.cdl
View File

@ -14,21 +14,13 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class Line from Blend
(TheVertex as any;
TheArc as any;
ThePointOnRst as any; -- as PointOnRst from Blend(TheArc)
TheSequenceOfPointOnRst as any;
TheExtremity as any) -- as Extremity from Blend (TheVertex,TheArc,
-- ThePointOnRst,TheSequenceOfPointOnRst)
class Line from BRepBlend inherits TShared from MMgt
inherits TShared from MMgt
uses Point from Blend, uses Point from Blend,
SequenceOfPoint from Blend, SequenceOfPoint from Blend,
Extremity from BRepBlend,
TypeTrans from IntSurf TypeTrans from IntSurf
@ -39,7 +31,7 @@ is
Create Create
returns mutable Line from Blend; returns mutable Line from BRepBlend;
@ -101,7 +93,7 @@ is
is static; is static;
SetStartPoints(me: mutable; StartPt1,StartPt2: TheExtremity) SetStartPoints(me: mutable; StartPt1,StartPt2: Extremity from BRepBlend)
---Purpose: Sets the values of the start points for the line. ---Purpose: Sets the values of the start points for the line.
---C++: inline ---C++: inline
@ -109,7 +101,7 @@ is
is static; is static;
SetEndPoints(me: mutable; EndPt1,EndPt2: TheExtremity) SetEndPoints(me: mutable; EndPt1,EndPt2: Extremity from BRepBlend)
---Purpose: Sets tne values of the end points for the line. ---Purpose: Sets tne values of the end points for the line.
@ -180,7 +172,7 @@ is
---Purpose: Returns the start point on S1. ---Purpose: Returns the start point on S1.
returns TheExtremity returns Extremity from BRepBlend
---C++: inline ---C++: inline
---C++: return const& ---C++: return const&
@ -191,7 +183,7 @@ is
---Purpose: Returns the start point on S2 ---Purpose: Returns the start point on S2
returns TheExtremity returns Extremity from BRepBlend
---C++: inline ---C++: inline
---C++: return const& ---C++: return const&
@ -202,7 +194,7 @@ is
---Purpose: Returns the end point on S1. ---Purpose: Returns the end point on S1.
returns TheExtremity returns Extremity from BRepBlend
---C++: inline ---C++: inline
---C++: return const& ---C++: return const&
@ -213,7 +205,7 @@ is
---Purpose: Returns the point on S2. ---Purpose: Returns the point on S2.
returns TheExtremity returns Extremity from BRepBlend
---C++: inline ---C++: inline
---C++: return const& ---C++: return const&
@ -235,10 +227,10 @@ fields
seqpt : SequenceOfPoint from Blend; seqpt : SequenceOfPoint from Blend;
tras1 : TypeTrans from IntSurf; tras1 : TypeTrans from IntSurf;
tras2 : TypeTrans from IntSurf; tras2 : TypeTrans from IntSurf;
stp1 : TheExtremity; stp1 : Extremity from BRepBlend;
stp2 : TheExtremity; stp2 : Extremity from BRepBlend;
endp1 : TheExtremity; endp1 : Extremity from BRepBlend;
endp2 : TheExtremity; endp2 : Extremity from BRepBlend;
hass1 : Boolean from Standard; hass1 : Boolean from Standard;
hass2 : Boolean from Standard; hass2 : Boolean from Standard;
end; end;

10
src/Blend/Blend_Line.gxx → src/BRepBlend/BRepBlend_Line.cxx
View File

@ -12,13 +12,15 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
Blend_Line::Blend_Line (): #include <BRepBlend_Line.ixx>
BRepBlend_Line::BRepBlend_Line ():
tras1(IntSurf_Undecided),tras2(IntSurf_Undecided), tras1(IntSurf_Undecided),tras2(IntSurf_Undecided),
hass1(Standard_False),hass2(Standard_False) hass1(Standard_False),hass2(Standard_False)
{} {}
void Blend_Line::Clear () void BRepBlend_Line::Clear ()
{ {
seqpt.Clear(); seqpt.Clear();
hass1 = Standard_False; hass1 = Standard_False;
@ -27,7 +29,7 @@ void Blend_Line::Clear ()
tras2 = IntSurf_Undecided; tras2 = IntSurf_Undecided;
} }
void Blend_Line::Set(const IntSurf_TypeTrans TranS1, void BRepBlend_Line::Set(const IntSurf_TypeTrans TranS1,
const IntSurf_TypeTrans TranS2) const IntSurf_TypeTrans TranS2)
{ {
hass1 = Standard_True; hass1 = Standard_True;
@ -36,7 +38,7 @@ void Blend_Line::Set(const IntSurf_TypeTrans TranS1,
tras2 = TranS2; tras2 = TranS2;
} }
void Blend_Line::Set(const IntSurf_TypeTrans Trans) void BRepBlend_Line::Set(const IntSurf_TypeTrans Trans)
{ {
hass1 = Standard_True; hass1 = Standard_True;
hass2 = Standard_False; hass2 = Standard_False;

34
src/Blend/Blend_Line.lxx → src/BRepBlend/BRepBlend_Line.lxx
View File

@ -16,87 +16,87 @@
#include <Standard_DomainError.hxx> #include <Standard_DomainError.hxx>
inline void Blend_Line::Append(const Blend_Point& P) inline void BRepBlend_Line::Append(const Blend_Point& P)
{ {
seqpt.Append(P); seqpt.Append(P);
} }
inline void Blend_Line::Prepend(const Blend_Point& P) inline void BRepBlend_Line::Prepend(const Blend_Point& P)
{ {
seqpt.Prepend(P); seqpt.Prepend(P);
} }
inline void Blend_Line::InsertBefore(const Standard_Integer Index, inline void BRepBlend_Line::InsertBefore(const Standard_Integer Index,
const Blend_Point& P) const Blend_Point& P)
{ {
seqpt.InsertBefore(Index, P); seqpt.InsertBefore(Index, P);
} }
inline void Blend_Line::Remove(const Standard_Integer FromIndex, inline void BRepBlend_Line::Remove(const Standard_Integer FromIndex,
const Standard_Integer ToIndex) const Standard_Integer ToIndex)
{ {
seqpt.Remove(FromIndex,ToIndex); seqpt.Remove(FromIndex,ToIndex);
} }
inline void Blend_Line::SetStartPoints(const TheExtremity& StartPtOnS1, inline void BRepBlend_Line::SetStartPoints(const BRepBlend_Extremity& StartPtOnS1,
const TheExtremity& StartPtOnS2) const BRepBlend_Extremity& StartPtOnS2)
{ {
stp1 = StartPtOnS1; stp1 = StartPtOnS1;
stp2 = StartPtOnS2; stp2 = StartPtOnS2;
} }
inline void Blend_Line::SetEndPoints(const TheExtremity& EndPtOnS1, inline void BRepBlend_Line::SetEndPoints(const BRepBlend_Extremity& EndPtOnS1,
const TheExtremity& EndPtOnS2) const BRepBlend_Extremity& EndPtOnS2)
{ {
endp1 = EndPtOnS1; endp1 = EndPtOnS1;
endp2 = EndPtOnS2; endp2 = EndPtOnS2;
} }
inline Standard_Integer Blend_Line::NbPoints () const inline Standard_Integer BRepBlend_Line::NbPoints () const
{ {
return seqpt.Length(); return seqpt.Length();
} }
inline const Blend_Point& Blend_Line::Point(const Standard_Integer Index) const inline const Blend_Point& BRepBlend_Line::Point(const Standard_Integer Index) const
{ {
return seqpt(Index); return seqpt(Index);
} }
inline IntSurf_TypeTrans Blend_Line::TransitionOnS1 () const inline IntSurf_TypeTrans BRepBlend_Line::TransitionOnS1 () const
{ {
if (!hass1) {Standard_DomainError::Raise();} if (!hass1) {Standard_DomainError::Raise();}
return tras1; return tras1;
} }
inline IntSurf_TypeTrans Blend_Line::TransitionOnS2 () const inline IntSurf_TypeTrans BRepBlend_Line::TransitionOnS2 () const
{ {
if (!hass2) {Standard_DomainError::Raise();} if (!hass2) {Standard_DomainError::Raise();}
return tras2; return tras2;
} }
inline const TheExtremity& Blend_Line::StartPointOnFirst() const inline const BRepBlend_Extremity& BRepBlend_Line::StartPointOnFirst() const
{ {
return stp1; return stp1;
} }
inline const TheExtremity& Blend_Line::StartPointOnSecond() const inline const BRepBlend_Extremity& BRepBlend_Line::StartPointOnSecond() const
{ {
return stp2; return stp2;
} }
inline const TheExtremity& Blend_Line::EndPointOnFirst() const inline const BRepBlend_Extremity& BRepBlend_Line::EndPointOnFirst() const
{ {
return endp1; return endp1;
} }
inline const TheExtremity& Blend_Line::EndPointOnSecond() const inline const BRepBlend_Extremity& BRepBlend_Line::EndPointOnSecond() const
{ {
return endp2; return endp2;
} }
inline IntSurf_TypeTrans Blend_Line::TransitionOnS () const inline IntSurf_TypeTrans BRepBlend_Line::TransitionOnS () const
{ {
if (!hass1) {Standard_DomainError::Raise();} if (!hass1) {Standard_DomainError::Raise();}
return tras1; return tras1;

18
src/Blend/Blend_PointOnRst.cdl → src/BRepBlend/BRepBlend_PointOnRst.cdl
View File

@ -14,8 +14,7 @@
-- Alternatively, this file may be used under the terms of Open CASCADE -- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement. -- commercial license or contractual agreement.
generic class PointOnRst from Blend class PointOnRst from BRepBlend
(TheArc as any)
---Purpose: Definition of an intersection point between a line ---Purpose: Definition of an intersection point between a line
@ -24,7 +23,8 @@ generic class PointOnRst from Blend
-- the Value method) and logical informations. -- the Value method) and logical informations.
uses Transition from IntSurf uses Transition from IntSurf,
HCurve2d from Adaptor2d
raises DomainError from Standard raises DomainError from Standard
@ -35,21 +35,21 @@ is
---Purpose: Empty constructor. ---Purpose: Empty constructor.
returns PointOnRst from Blend; returns PointOnRst from BRepBlend;
Create( A: TheArc; Param: Real from Standard; Create( A: HCurve2d from Adaptor2d; Param: Real from Standard;
TLine, TArc: Transition from IntSurf) TLine, TArc: Transition from IntSurf)
---Purpose: Creates the PointOnRst on the arc A, at parameter Param, ---Purpose: Creates the PointOnRst on the arc A, at parameter Param,
-- with the transition TLine on the walking line, and -- with the transition TLine on the walking line, and
-- TArc on the arc A. -- TArc on the arc A.
returns PointOnRst from Blend; returns PointOnRst from BRepBlend;
SetArc(me: in out; A: TheArc; Param: Real from Standard; SetArc(me: in out; A: HCurve2d from Adaptor2d; Param: Real from Standard;
TLine, TArc: Transition from IntSurf) TLine, TArc: Transition from IntSurf)
---Purpose: Sets the values of a point which is on the arc ---Purpose: Sets the values of a point which is on the arc
@ -65,7 +65,7 @@ is
---Purpose: Returns the arc of restriction containing the ---Purpose: Returns the arc of restriction containing the
-- vertex. -- vertex.
returns any TheArc returns any HCurve2d from Adaptor2d
---C++: return const& ---C++: return const&
---C++: inline ---C++: inline
@ -109,7 +109,7 @@ is
fields fields
arc : TheArc; arc : HCurve2d from Adaptor2d;
traline : Transition from IntSurf; traline : Transition from IntSurf;
traarc : Transition from IntSurf; traarc : Transition from IntSurf;
prm : Real from Standard; prm : Real from Standard;

8
src/Blend/Blend_PointOnRst.gxx → src/BRepBlend/BRepBlend_PointOnRst.cxx
View File

@ -12,10 +12,12 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
Blend_PointOnRst::Blend_PointOnRst () {} #include <BRepBlend_PointOnRst.ixx>
BRepBlend_PointOnRst::BRepBlend_PointOnRst () {}
Blend_PointOnRst::Blend_PointOnRst(const TheArc& A, BRepBlend_PointOnRst::BRepBlend_PointOnRst(const Handle(Adaptor2d_HCurve2d)& A,
const Standard_Real Param, const Standard_Real Param,
const IntSurf_Transition& TLine, const IntSurf_Transition& TLine,
const IntSurf_Transition& TArc): const IntSurf_Transition& TArc):
@ -23,7 +25,7 @@ Blend_PointOnRst::Blend_PointOnRst(const TheArc& A,
arc(A),traline(TLine),traarc(TArc),prm(Param) arc(A),traline(TLine),traarc(TArc),prm(Param)
{} {}
void Blend_PointOnRst::SetArc(const TheArc& A, void BRepBlend_PointOnRst::SetArc(const Handle(Adaptor2d_HCurve2d)& A,
const Standard_Real Param, const Standard_Real Param,
const IntSurf_Transition& TLine, const IntSurf_Transition& TLine,
const IntSurf_Transition& TArc) const IntSurf_Transition& TArc)

8
src/Blend/Blend_PointOnRst.lxx → src/BRepBlend/BRepBlend_PointOnRst.lxx
View File

@ -14,22 +14,22 @@
#include <Standard_DomainError.hxx> #include <Standard_DomainError.hxx>
inline const TheArc& Blend_PointOnRst::Arc () const inline const Handle_Adaptor2d_HCurve2d& BRepBlend_PointOnRst::Arc () const
{ {
return arc; return arc;
} }
inline const IntSurf_Transition& Blend_PointOnRst::TransitionOnLine () const inline const IntSurf_Transition& BRepBlend_PointOnRst::TransitionOnLine () const
{ {
return traline; return traline;
} }
inline const IntSurf_Transition& Blend_PointOnRst::TransitionOnArc () const inline const IntSurf_Transition& BRepBlend_PointOnRst::TransitionOnArc () const
{ {
return traarc; return traarc;
} }
inline Standard_Real Blend_PointOnRst::ParameterOnArc () const inline Standard_Real BRepBlend_PointOnRst::ParameterOnArc () const
{ {
return prm; return prm;
} }

6
src/Blend/Blend.cdl
View File

@ -55,12 +55,6 @@ is
class Point; class Point;
generic class Extremity;
generic class PointOnRst;
generic class Line;
generic class Walking; generic class Walking;
generic class CSWalking; generic class CSWalking;

11
src/Blend/Blend_CSWalking.cdl
View File

@ -25,15 +25,10 @@ generic class CSWalking from Blend
TheCurveTool as any; TheCurveTool as any;
TheTopolTool as Transient; TheTopolTool as Transient;
TheBlendTool as any; TheBlendTool as any;
ThePointOnRst as any; -- as PointOnRst from Blend(TheArc) ThePointOnRst as any;
TheSeqPointOnRst as any; TheSeqPointOnRst as any;
TheExtremity as any; -- as Extremity from Blend(TheVertex,TheArc, TheExtremity as any;
-- ThePointOnRst,TheSeqPointOnRst) TheLine as Transient)
TheLine as Transient) -- as Line from Blend(TheVertex,TheArc,
-- ThePointOnRst,TheSeqPointOnRst,
-- TheExtremity)
---Purpose: ---Purpose:

10
src/Blend/Blend_Walking.cdl
View File

@ -25,14 +25,10 @@ generic class Walking from Blend
TheCurveTool as any; TheCurveTool as any;
TheTopolTool as Transient; TheTopolTool as Transient;
TheBlendTool as any; TheBlendTool as any;
ThePointOnRst as any; -- as PointOnRst from Blend(TheArc) ThePointOnRst as any;
TheSeqPointOnRst as any; TheSeqPointOnRst as any;
TheExtremity as any; -- as Extremity from Blend(TheVertex,TheArc, TheExtremity as any;
-- ThePointOnRst,TheSeqPointOnRst) TheLine as Transient)
TheLine as Transient) -- as Line from Blend(TheVertex,TheArc,
-- ThePointOnRst,TheSeqPointOnRst,
-- TheExtremity)
---Purpose: ---Purpose: