From 04f7bd75e367bee3e21738994251825f9e2f0bbe Mon Sep 17 00:00:00 2001 From: dln Date: Thu, 27 Mar 2014 16:24:53 +0400 Subject: [PATCH] 0024683: Convertation of the generic classes to the non-generic. Part 1 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. --- src/BRepApprox/BRepApprox.cdl | 13 +-- ...xLineGen.cdl => BRepApprox_ApproxLine.cdl} | 34 ++++--- ...xLineGen.gxx => BRepApprox_ApproxLine.cxx} | 71 ++++++++------- ...ToolGen.cdl => BRepApprox_SurfaceTool.cdl} | 89 +++++++++---------- ...ToolGen.gxx => BRepApprox_SurfaceTool.cxx} | 11 ++- ...ToolGen.lxx => BRepApprox_SurfaceTool.lxx} | 73 ++++++++------- src/BRepBlend/BRepBlend.cdl | 32 ++----- .../BRepBlend_Extremity.cdl} | 40 ++++----- .../BRepBlend_Extremity.cxx} | 27 +++--- .../BRepBlend_Extremity.lxx} | 24 ++--- ...ToolGen.cdl => BRepBlend_HCurve2dTool.cdl} | 70 +++++++-------- ...ToolGen.gxx => BRepBlend_HCurve2dTool.cxx} | 5 +- ...ToolGen.lxx => BRepBlend_HCurve2dTool.lxx} | 48 +++++----- ...veToolGen.cdl => BRepBlend_HCurveTool.cdl} | 56 ++++++------ ...veToolGen.gxx => BRepBlend_HCurveTool.cxx} | 5 +- ...veToolGen.lxx => BRepBlend_HCurveTool.lxx} | 48 +++++----- .../BRepBlend_Line.cdl} | 34 +++---- .../BRepBlend_Line.cxx} | 10 ++- .../BRepBlend_Line.lxx} | 34 +++---- .../BRepBlend_PointOnRst.cdl} | 18 ++-- .../BRepBlend_PointOnRst.cxx} | 8 +- .../BRepBlend_PointOnRst.lxx} | 8 +- src/Blend/Blend.cdl | 8 +- src/Blend/Blend_CSWalking.cdl | 11 +-- src/Blend/Blend_Walking.cdl | 10 +-- 25 files changed, 364 insertions(+), 423 deletions(-) rename src/BRepApprox/{BRepApprox_ApproxLineGen.cdl => BRepApprox_ApproxLine.cdl} (62%) rename src/BRepApprox/{BRepApprox_ApproxLineGen.gxx => BRepApprox_ApproxLine.cxx} (57%) rename src/BRepApprox/{BRepApprox_SurfaceToolGen.cdl => BRepApprox_SurfaceTool.cdl} (62%) rename src/BRepApprox/{BRepApprox_SurfaceToolGen.gxx => BRepApprox_SurfaceTool.cxx} (75%) rename src/BRepApprox/{BRepApprox_SurfaceToolGen.lxx => BRepApprox_SurfaceTool.lxx} (52%) rename src/{Blend/Blend_Extremity.cdl => BRepBlend/BRepBlend_Extremity.cdl} (86%) rename src/{Blend/Blend_Extremity.gxx => BRepBlend/BRepBlend_Extremity.cxx} (76%) rename src/{Blend/Blend_Extremity.lxx => BRepBlend/BRepBlend_Extremity.lxx} (60%) rename src/BRepBlend/{BRepBlend_HCurve2dToolGen.cdl => BRepBlend_HCurve2dTool.cdl} (69%) rename src/BRepBlend/{BRepBlend_HCurve2dToolGen.gxx => BRepBlend_HCurve2dTool.cxx} (92%) rename src/BRepBlend/{BRepBlend_HCurve2dToolGen.lxx => BRepBlend_HCurve2dTool.lxx} (64%) rename src/BRepBlend/{BRepBlend_HCurveToolGen.cdl => BRepBlend_HCurveTool.cdl} (73%) rename src/BRepBlend/{BRepBlend_HCurveToolGen.gxx => BRepBlend_HCurveTool.cxx} (92%) rename src/BRepBlend/{BRepBlend_HCurveToolGen.lxx => BRepBlend_HCurveTool.lxx} (65%) rename src/{Blend/Blend_Line.cdl => BRepBlend/BRepBlend_Line.cdl} (86%) rename src/{Blend/Blend_Line.gxx => BRepBlend/BRepBlend_Line.cxx} (84%) rename src/{Blend/Blend_Line.lxx => BRepBlend/BRepBlend_Line.lxx} (55%) rename src/{Blend/Blend_PointOnRst.cdl => BRepBlend/BRepBlend_PointOnRst.cdl} (85%) rename src/{Blend/Blend_PointOnRst.gxx => BRepBlend/BRepBlend_PointOnRst.cxx} (81%) rename src/{Blend/Blend_PointOnRst.lxx => BRepBlend/BRepBlend_PointOnRst.lxx} (72%) diff --git a/src/BRepApprox/BRepApprox.cdl b/src/BRepApprox/BRepApprox.cdl index cbc6dac77d..382e0ec0eb 100644 --- a/src/BRepApprox/BRepApprox.cdl +++ b/src/BRepApprox/BRepApprox.cdl @@ -36,16 +36,9 @@ uses is - generic class ApproxLineGen; - - class ApproxLine instantiates ApproxLineGen from BRepApprox - (BSplineCurve from Geom, - BSplineCurve from Geom2d); - - generic class SurfaceToolGen; - - class SurfaceTool instantiates SurfaceToolGen from BRepApprox - (Surface from BRepAdaptor); + class ApproxLine; + + class SurfaceTool; class Approx instantiates Approx from ApproxInt (Surface from BRepAdaptor, diff --git a/src/BRepApprox/BRepApprox_ApproxLineGen.cdl b/src/BRepApprox/BRepApprox_ApproxLine.cdl similarity index 62% rename from src/BRepApprox/BRepApprox_ApproxLineGen.cdl rename to src/BRepApprox/BRepApprox_ApproxLine.cdl index 83843c2603..2d64b331ab 100644 --- a/src/BRepApprox/BRepApprox_ApproxLineGen.cdl +++ b/src/BRepApprox/BRepApprox_ApproxLine.cdl @@ -14,42 +14,40 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -generic class ApproxLineGen from BRepApprox - (TheCurve as any; - TheCurve2d as any) -inherits TShared from MMgt - - +class ApproxLine from BRepApprox inherits TShared from MMgt + uses PntOn2S from IntSurf, - LineOn2S from IntSurf + LineOn2S from IntSurf, + BSplineCurve from Geom, + BSplineCurve from Geom2d is - Create(CurveXYZ: TheCurve; - CurveUV1: TheCurve2d; - CurveUV2: TheCurve2d) - returns mutable ApproxLineGen from BRepApprox; + Create(CurveXYZ: BSplineCurve from Geom; + CurveUV1: BSplineCurve from Geom2d; + CurveUV2: BSplineCurve from Geom2d) + returns mutable ApproxLine from BRepApprox; Create(lin: LineOn2S from IntSurf; Tang: Boolean from Standard) - returns mutable ApproxLineGen from BRepApprox; + returns mutable ApproxLine from BRepApprox; NbPnts(me) returns Integer from Standard is static; Point(me: mutable; Index: Integer from Standard) + returns PntOn2S from IntSurf is static; fields - curvxyz : TheCurve; - curvuv1 : TheCurve2d; - curvuv2 : TheCurve2d; - pnton2s : PntOn2S from IntSurf; - linon2s : LineOn2S from IntSurf; + myCurveXYZ : BSplineCurve from Geom; + myCurveUV1 : BSplineCurve from Geom2d; + myCurveUV2 : BSplineCurve from Geom2d; + myLineOn2S : LineOn2S from IntSurf; -end ApproxLineGen from BRepApprox; +end ApproxLine from BRepApprox; diff --git a/src/BRepApprox/BRepApprox_ApproxLineGen.gxx b/src/BRepApprox/BRepApprox_ApproxLine.cxx similarity index 57% rename from src/BRepApprox/BRepApprox_ApproxLineGen.gxx rename to src/BRepApprox/BRepApprox_ApproxLine.cxx index 0e72e9ba12..9cb6e63ff4 100644 --- a/src/BRepApprox/BRepApprox_ApproxLineGen.gxx +++ b/src/BRepApprox/BRepApprox_ApproxLine.cxx @@ -14,33 +14,35 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + #include //======================================================================= -//function : BRepApprox_ApproxLineGen +//function : BRepApprox_ApproxLine //purpose : //======================================================================= -BRepApprox_ApproxLineGen::BRepApprox_ApproxLineGen - (const TheCurve& CurveXYZ, - const TheCurve2d& CurveUV1, - const TheCurve2d& CurveUV2) +BRepApprox_ApproxLine::BRepApprox_ApproxLine + (const Handle(Geom_BSplineCurve)& CurveXYZ, + const Handle(Geom2d_BSplineCurve)& CurveUV1, + const Handle(Geom2d_BSplineCurve)& CurveUV2) { - curvxyz = CurveXYZ; - curvuv1 = CurveUV1; - curvuv2 = CurveUV2; + myCurveXYZ = CurveXYZ; + myCurveUV1 = CurveUV1; + myCurveUV2 = CurveUV2; } //======================================================================= -//function : BRepApprox_ApproxLineGen +//function : BRepApprox_ApproxLine //purpose : //======================================================================= -BRepApprox_ApproxLineGen::BRepApprox_ApproxLineGen +BRepApprox_ApproxLine::BRepApprox_ApproxLine (const Handle(IntSurf_LineOn2S)& lin, const Standard_Boolean ) - :linon2s(lin) + :myLineOn2S(lin) { } @@ -49,15 +51,15 @@ BRepApprox_ApproxLineGen::BRepApprox_ApproxLineGen //purpose : //======================================================================= -Standard_Integer BRepApprox_ApproxLineGen::NbPnts() const +Standard_Integer BRepApprox_ApproxLine::NbPnts() const { - if(!curvxyz.IsNull()) - return(curvxyz->NbPoles()); - if(!curvuv1.IsNull()) - return(curvuv1->NbPoles()); - if(!curvuv2.IsNull()) - return(curvuv2->NbPoles()); - return(linon2s->NbPoints()); + if(!myCurveXYZ.IsNull()) + return(myCurveXYZ->NbPoles()); + if(!myCurveUV1.IsNull()) + return(myCurveUV1->NbPoles()); + if(!myCurveUV2.IsNull()) + return(myCurveUV2->NbPoles()); + return(myLineOn2S->NbPoints()); } //======================================================================= @@ -65,27 +67,24 @@ Standard_Integer BRepApprox_ApproxLineGen::NbPnts() const //purpose : //======================================================================= -IntSurf_PntOn2S BRepApprox_ApproxLineGen::Point - (const Standard_Integer Index) +IntSurf_PntOn2S BRepApprox_ApproxLine::Point(const Standard_Integer Index) { - if(!linon2s.IsNull()) { - if(linon2s->NbPoints()) { - return(linon2s->Value(Index)); + if(!myLineOn2S.IsNull()) { + if(myLineOn2S->NbPoints()) { + return(myLineOn2S->Value(Index)); } } gp_Pnt2d P1,P2; gp_Pnt P; - if(!curvxyz.IsNull()) - P = curvxyz->Pole(Index); - if(!curvuv1.IsNull()) - P1 = curvuv1->Pole(Index); - if(!curvuv2.IsNull()) - P2 = curvuv2->Pole(Index); + if(!myCurveXYZ.IsNull()) + P = myCurveXYZ->Pole(Index); + if(!myCurveUV1.IsNull()) + P1 = myCurveUV1->Pole(Index); + if(!myCurveUV2.IsNull()) + P2 = myCurveUV2->Pole(Index); - pnton2s.SetValue(P, - P1.X(), - P1.Y(), - P2.X(), - P2.Y()); - return(pnton2s); + IntSurf_PntOn2S aPntOn2S; + aPntOn2S.SetValue(P, P1.X(), P1.Y(), P2.X(), P2.Y()); + + return aPntOn2S; } diff --git a/src/BRepApprox/BRepApprox_SurfaceToolGen.cdl b/src/BRepApprox/BRepApprox_SurfaceTool.cdl similarity index 62% rename from src/BRepApprox/BRepApprox_SurfaceToolGen.cdl rename to src/BRepApprox/BRepApprox_SurfaceTool.cdl index 93831603e1..ad00acba66 100644 --- a/src/BRepApprox/BRepApprox_SurfaceToolGen.cdl +++ b/src/BRepApprox/BRepApprox_SurfaceTool.cdl @@ -14,9 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -generic class SurfaceToolGen from BRepApprox - (TheSurface as any) - +class SurfaceTool from BRepApprox uses @@ -35,57 +33,58 @@ uses HSurface from Adaptor3d, HCurve from Adaptor3d, Ax1 from gp, - Dir from gp + Dir from gp, + Surface from BRepAdaptor raises NoSuchObject from Standard, OutOfRange from Standard -is +is - FirstUParameter(myclass; S: TheSurface) + FirstUParameter(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Real from Standard; - FirstVParameter(myclass; S: TheSurface) + FirstVParameter(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Real from Standard; - LastUParameter(myclass; S: TheSurface) + LastUParameter(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Real from Standard; - LastVParameter(myclass; S: TheSurface) + LastVParameter(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Real from Standard; - NbUIntervals(myclass; S: TheSurface; + NbUIntervals(myclass; S: Surface from BRepAdaptor; Sh : Shape from GeomAbs) ---C++: inline returns Integer from Standard; - NbVIntervals(myclass; S: TheSurface; + NbVIntervals(myclass; S: Surface from BRepAdaptor; Sh : Shape from GeomAbs) ---C++: inline returns Integer from Standard; - UIntervals(myclass; S : TheSurface; + UIntervals(myclass; S : Surface from BRepAdaptor; T : in out Array1OfReal from TColStd; Sh : Shape from GeomAbs); ---C++: inline - VIntervals(myclass; S : TheSurface; + VIntervals(myclass; S : Surface from BRepAdaptor; T : in out Array1OfReal from TColStd; Sh : Shape from GeomAbs) ; ---C++: inline - UTrim(myclass; S : TheSurface; + UTrim(myclass; S : Surface from BRepAdaptor; First, Last, Tol : Real) ---C++: inline returns HSurface from Adaptor3d @@ -93,7 +92,7 @@ is OutOfRange from Standard; ---Purpose: If >= - VTrim(myclass; S : TheSurface; + VTrim(myclass; S : Surface from BRepAdaptor; First, Last, Tol : Real) ---C++: inline returns HSurface from Adaptor3d @@ -102,62 +101,62 @@ is ---Purpose: If >= - IsUClosed(myclass; S: TheSurface) + IsUClosed(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Boolean from Standard; - IsVClosed(myclass; S: TheSurface) + IsVClosed(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Boolean from Standard; - IsUPeriodic(myclass; S: TheSurface) + IsUPeriodic(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Boolean from Standard; - UPeriod(myclass; S: TheSurface) + UPeriod(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Real from Standard; - IsVPeriodic(myclass; S: TheSurface) + IsVPeriodic(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Boolean from Standard; - VPeriod(myclass; S: TheSurface) + VPeriod(myclass; S: Surface from BRepAdaptor) ---C++: inline returns Real from Standard; - Value(myclass; S : TheSurface; + Value(myclass; S : Surface from BRepAdaptor; u,v : Real from Standard) ---C++: inline returns Pnt from gp; - D0(myclass; S : TheSurface; + D0(myclass; S : Surface from BRepAdaptor; u,v : Real from Standard; P : out Pnt from gp); ---C++: inline - D1(myclass; S : TheSurface; + D1(myclass; S : Surface from BRepAdaptor; u,v : Real from Standard; P : out Pnt from gp; D1u,D1v: out Vec from gp); ---C++: inline - D2(myclass; S : TheSurface; + D2(myclass; S : Surface from BRepAdaptor; u,v : Real from Standard; P : out Pnt from gp; D1U,D1V,D2U,D2V,D2UV: out Vec from gp); ---C++: inline - D3(myclass; S : TheSurface; + D3(myclass; S : Surface from BRepAdaptor; u,v : Real from Standard; P : out Pnt from gp; D1U, D1V, D2U, D2V, D2UV, D3U, D3V, D3UUV, D3UVV: out Vec from gp); ---C++: inline - DN(myclass; S : TheSurface; + DN(myclass; S : Surface from BRepAdaptor; u,v : Real from Standard; Nu,Nv : Integer from Standard) ---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 returns Real from Standard; - VResolution(myclass; S:TheSurface; R3d: Real from Standard) + VResolution(myclass; S:Surface from BRepAdaptor; R3d: Real from Standard) ---C++: inline returns Real from Standard; - GetType(myclass; S: TheSurface) + GetType(myclass; S: Surface from BRepAdaptor) ---C++: inline returns SurfaceType from GeomAbs; - Plane(myclass; S: TheSurface) + Plane(myclass; S: Surface from BRepAdaptor) ---C++: inline 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; ---C++: inline - Cone(myclass; S : TheSurface) returns Cone from gp + Cone(myclass; S : Surface from BRepAdaptor) returns Cone from gp raises NoSuchObject from Standard; ---C++: inline - Torus(myclass; S : TheSurface) returns Torus from gp + Torus(myclass; S : Surface from BRepAdaptor) returns Torus from gp raises NoSuchObject from Standard; ---C++: inline - Sphere(myclass; S : TheSurface) returns Sphere from gp + Sphere(myclass; S : Surface from BRepAdaptor) returns Sphere from gp raises NoSuchObject from Standard; ---C++: inline - Bezier(myclass; S : TheSurface) returns BezierSurface from Geom + Bezier(myclass; S : Surface from BRepAdaptor) returns BezierSurface from Geom raises NoSuchObject from Standard; ---C++: inline - BSpline(myclass; S : TheSurface) returns BSplineSurface from Geom + BSpline(myclass; S : Surface from BRepAdaptor) returns BSplineSurface from Geom raises NoSuchObject from Standard; ---C++: inline - AxeOfRevolution(myclass; S: TheSurface) returns Ax1 from gp + AxeOfRevolution(myclass; S: Surface from BRepAdaptor) returns Ax1 from gp raises NoSuchObject from Standard; ---C++: inline - Direction(myclass; S: TheSurface) returns Dir from gp + Direction(myclass; S: Surface from BRepAdaptor) returns Dir from gp raises NoSuchObject from Standard; ---C++: inline - BasisCurve(myclass; S:TheSurface) returns HCurve from Adaptor3d + BasisCurve(myclass; S:Surface from BRepAdaptor) returns HCurve from Adaptor3d raises NoSuchObject from Standard; ---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 ; diff --git a/src/BRepApprox/BRepApprox_SurfaceToolGen.gxx b/src/BRepApprox/BRepApprox_SurfaceTool.cxx similarity index 75% rename from src/BRepApprox/BRepApprox_SurfaceToolGen.gxx rename to src/BRepApprox/BRepApprox_SurfaceTool.cxx index e05675fb44..15ec9936cf 100644 --- a/src/BRepApprox/BRepApprox_SurfaceToolGen.gxx +++ b/src/BRepApprox/BRepApprox_SurfaceTool.cxx @@ -14,27 +14,26 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include TheSurface_hxx +#include "BRepApprox_SurfaceTool.ixx" - -Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesU (const TheSurface&) +Standard_Integer BRepApprox_SurfaceTool::NbSamplesU (const BRepAdaptor_Surface&) { return(10); } -Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesV (const TheSurface&) +Standard_Integer BRepApprox_SurfaceTool::NbSamplesV (const BRepAdaptor_Surface&) { return(10); } -Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesU (const TheSurface&, +Standard_Integer BRepApprox_SurfaceTool::NbSamplesU (const BRepAdaptor_Surface&, const Standard_Real, const Standard_Real) { return(10); } -Standard_Integer BRepApprox_SurfaceToolGen::NbSamplesV (const TheSurface&, +Standard_Integer BRepApprox_SurfaceTool::NbSamplesV (const BRepAdaptor_Surface&, const Standard_Real, const Standard_Real) { diff --git a/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx b/src/BRepApprox/BRepApprox_SurfaceTool.lxx similarity index 52% rename from src/BRepApprox/BRepApprox_SurfaceToolGen.lxx rename to src/BRepApprox/BRepApprox_SurfaceTool.lxx index b83e77d488..a0bede9f6f 100644 --- a/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx +++ b/src/BRepApprox/BRepApprox_SurfaceTool.lxx @@ -14,7 +14,6 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include TheSurface_hxx #include #include #include @@ -29,44 +28,42 @@ #include #include +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_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, +inline Standard_Integer BRepApprox_SurfaceTool::NbUIntervals(const BRepAdaptor_Surface& Surf, const GeomAbs_Shape 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){ return Surf.NbVIntervals(S); } -inline void BRepApprox_SurfaceToolGen::UIntervals(const TheSurface& Surf, +inline void BRepApprox_SurfaceTool::UIntervals(const BRepAdaptor_Surface& Surf, TColStd_Array1OfReal& Tab, const GeomAbs_Shape 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, const GeomAbs_Shape 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 L, const Standard_Real 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 L, 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(); } -inline Standard_Boolean BRepApprox_SurfaceToolGen::IsVClosed(const TheSurface& S) +inline Standard_Boolean BRepApprox_SurfaceTool::IsVClosed(const BRepAdaptor_Surface& S) { 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(); } -inline Standard_Real BRepApprox_SurfaceToolGen::UPeriod(const TheSurface& S) +inline Standard_Real BRepApprox_SurfaceTool::UPeriod(const BRepAdaptor_Surface& S) { 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(); } -inline Standard_Real BRepApprox_SurfaceToolGen::VPeriod(const TheSurface& S) +inline Standard_Real BRepApprox_SurfaceTool::VPeriod(const BRepAdaptor_Surface& S) { 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 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 V, gp_Pnt& P) @@ -121,7 +118,7 @@ inline void BRepApprox_SurfaceToolGen::D0(const TheSurface& S, 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 V, gp_Pnt& P, @@ -131,7 +128,7 @@ inline void BRepApprox_SurfaceToolGen::D1(const TheSurface& S, 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 V, 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); } -inline void BRepApprox_SurfaceToolGen::D3(const TheSurface& S, +inline void BRepApprox_SurfaceTool::D3(const BRepAdaptor_Surface& S, const Standard_Real U, const Standard_Real V, 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); } -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 V, const Standard_Integer Nu, @@ -170,66 +167,66 @@ inline gp_Vec BRepApprox_SurfaceToolGen::DN(const TheSurface& S, 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) { 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) { 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(); } -inline gp_Pln BRepApprox_SurfaceToolGen::Plane(const TheSurface& S) +inline gp_Pln BRepApprox_SurfaceTool::Plane(const BRepAdaptor_Surface& S) { 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(); } -inline gp_Cone BRepApprox_SurfaceToolGen::Cone(const TheSurface& S) +inline gp_Cone BRepApprox_SurfaceTool::Cone(const BRepAdaptor_Surface& S) { 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(); } -inline gp_Torus BRepApprox_SurfaceToolGen::Torus(const TheSurface& S) +inline gp_Torus BRepApprox_SurfaceTool::Torus(const BRepAdaptor_Surface& S) { 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()); } -inline Handle(Geom_BSplineSurface) BRepApprox_SurfaceToolGen::BSpline(const TheSurface& S) { +inline Handle(Geom_BSplineSurface) BRepApprox_SurfaceTool::BSpline(const BRepAdaptor_Surface& S) { 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()); } -inline gp_Dir BRepApprox_SurfaceToolGen::Direction(const TheSurface& S) { +inline gp_Dir BRepApprox_SurfaceTool::Direction(const BRepAdaptor_Surface& S) { 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()); } diff --git a/src/BRepBlend/BRepBlend.cdl b/src/BRepBlend/BRepBlend.cdl index c1bd0d1c63..61ada2b764 100644 --- a/src/BRepBlend/BRepBlend.cdl +++ b/src/BRepBlend/BRepBlend.cdl @@ -27,14 +27,12 @@ uses Blend, BlendFunc, AppBlend, Approx, Adaptor3d,Adaptor2d, is - generic class HCurveToolGen; - generic class HCurve2dToolGen; + class PointOnRst; + class Extremity; + class Line; - class HCurveTool instantiates HCurveToolGen from BRepBlend ( - HCurve from Adaptor3d); - - class HCurve2dTool instantiates HCurve2dToolGen from BRepBlend ( - HCurve2d from Adaptor2d); + class HCurveTool; + class HCurve2dTool; class BlendTool; @@ -62,29 +60,9 @@ is alias ChAsymInv is ChAsymInv from BlendFunc; - - class PointOnRst instantiates PointOnRst from Blend - (HCurve2d from Adaptor2d); - - class SequenceOfPointOnRst instantiates Sequence from TCollection (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 (HVertex from Adaptor3d, HCurve2d from Adaptor2d, diff --git a/src/Blend/Blend_Extremity.cdl b/src/BRepBlend/BRepBlend_Extremity.cdl similarity index 86% rename from src/Blend/Blend_Extremity.cdl rename to src/BRepBlend/BRepBlend_Extremity.cdl index d1fdb15772..dc1d17ccd1 100644 --- a/src/Blend/Blend_Extremity.cdl +++ b/src/BRepBlend/BRepBlend_Extremity.cdl @@ -14,20 +14,16 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -generic class Extremity from Blend - (TheVertex as any; - TheArc as any; - ThePointOnRst as any; -- as PointOnRst from Blend(TheArc) - TheSequenceOfPointOnRst as any) - - - +class Extremity from BRepBlend ---Purpose: uses Pnt 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, OutOfRange from Standard @@ -36,28 +32,28 @@ is Create - returns Extremity from Blend; + returns Extremity from BRepBlend; Create(P: Pnt from gp; U,V,Param: Real from Standard; Tol: Real from Standard) ---Purpose: Creates an extremity on a surface - returns Extremity from Blend; + returns Extremity from BRepBlend; Create(P: Pnt from gp; 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 -- the vertex . - returns Extremity from Blend; + returns Extremity from BRepBlend; Create(P: Pnt from gp; W, Param: Real from Standard; Tol: Real from Standard) ---Purpose: Creates an extremity on a curve - returns Extremity from Blend; + returns Extremity from BRepBlend; SetValue(me: in out; P: Pnt from gp; @@ -69,7 +65,7 @@ is SetValue(me: in out; P: Pnt from gp; 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 -- extremity matches the vertex . is static; @@ -132,12 +128,12 @@ is -- 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. 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) ---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. - returns any TheVertex + returns any HVertex from Adaptor3d ---C++: inline ---C++: return const& @@ -200,7 +196,7 @@ is ---Purpose: - returns any ThePointOnRst + returns any PointOnRst from BRepBlend ---C++: inline ---C++: return const& @@ -225,8 +221,8 @@ is is static; fields - vtx : TheVertex; - seqpt : TheSequenceOfPointOnRst; + vtx : HVertex from Adaptor3d; + seqpt : SequenceOfPointOnRst from BRepBlend; pt : Pnt from gp; tang : Vec from gp; param : Real from Standard; diff --git a/src/Blend/Blend_Extremity.gxx b/src/BRepBlend/BRepBlend_Extremity.cxx similarity index 76% rename from src/Blend/Blend_Extremity.gxx rename to src/BRepBlend/BRepBlend_Extremity.cxx index e20af8927f..d0ba65148f 100644 --- a/src/Blend/Blend_Extremity.gxx +++ b/src/BRepBlend/BRepBlend_Extremity.cxx @@ -12,7 +12,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -Blend_Extremity::Blend_Extremity (): +#include +#include + +BRepBlend_Extremity::BRepBlend_Extremity (): pt(gp_Pnt(0,0,0)), tang(gp_Vec(0,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 V, 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 V, const Standard_Real Param, const Standard_Real Tol, - const TheVertex& Vtx) : + const Handle(Adaptor3d_HVertex)& Vtx) : vtx(Vtx),pt(P), tang(gp_Vec(0,0,0)), 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 Param, 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 V, 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 V, const Standard_Real Param, const Standard_Real Tol, - const TheVertex& Vtx) + const Handle(Adaptor3d_HVertex)& Vtx) { pt = P; u = U; @@ -90,7 +93,7 @@ void Blend_Extremity::SetValue (const gp_Pnt& P, 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 Param, 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; vtx = V; } -void Blend_Extremity::AddArc (const TheArc& A, +void BRepBlend_Extremity::AddArc (const Handle(Adaptor2d_HCurve2d)& A, const Standard_Real Param, const IntSurf_Transition& TLine, const IntSurf_Transition& TArc) { - seqpt.Append(ThePointOnRst(A,Param,TLine,TArc)); + seqpt.Append(BRepBlend_PointOnRst(A,Param,TLine,TArc)); } diff --git a/src/Blend/Blend_Extremity.lxx b/src/BRepBlend/BRepBlend_Extremity.lxx similarity index 60% rename from src/Blend/Blend_Extremity.lxx rename to src/BRepBlend/BRepBlend_Extremity.lxx index ff34656009..e98eb38040 100644 --- a/src/Blend/Blend_Extremity.lxx +++ b/src/BRepBlend/BRepBlend_Extremity.lxx @@ -14,71 +14,71 @@ #include -inline const gp_Pnt& Blend_Extremity::Value () const +inline const gp_Pnt& BRepBlend_Extremity::Value () const { return pt; } -inline void Blend_Extremity::SetTangent(const gp_Vec& Tangent) +inline void BRepBlend_Extremity::SetTangent(const gp_Vec& Tangent) { hastang = Standard_True; tang = Tangent; } -inline Standard_Boolean Blend_Extremity::HasTangent () const +inline Standard_Boolean BRepBlend_Extremity::HasTangent () const { return hastang; } -inline const gp_Vec& Blend_Extremity::Tangent () const +inline const gp_Vec& BRepBlend_Extremity::Tangent () const { if (!hastang) {Standard_DomainError::Raise();} return tang; } -inline void Blend_Extremity::Parameters(Standard_Real& U, +inline void BRepBlend_Extremity::Parameters(Standard_Real& U, Standard_Real& V) const { U = u; V = v; } -inline Standard_Real Blend_Extremity::Tolerance() const +inline Standard_Real BRepBlend_Extremity::Tolerance() const { return tol; } -inline Standard_Boolean Blend_Extremity::IsVertex() const +inline Standard_Boolean BRepBlend_Extremity::IsVertex() const { return isvtx; } -inline const TheVertex& Blend_Extremity::Vertex () const +inline const Handle_Adaptor3d_HVertex& BRepBlend_Extremity::Vertex () const { if (!isvtx) {Standard_DomainError::Raise();} return vtx; } -inline Standard_Integer Blend_Extremity::NbPointOnRst () const +inline Standard_Integer BRepBlend_Extremity::NbPointOnRst () const { return seqpt.Length(); } -inline const ThePointOnRst& Blend_Extremity::PointOnRst +inline const BRepBlend_PointOnRst& BRepBlend_Extremity::PointOnRst (const Standard_Integer Index) const { return seqpt(Index); } -inline Standard_Real Blend_Extremity::Parameter() const +inline Standard_Real BRepBlend_Extremity::Parameter() const { return u; } -inline Standard_Real Blend_Extremity::ParameterOnGuide() const +inline Standard_Real BRepBlend_Extremity::ParameterOnGuide() const { return param; diff --git a/src/BRepBlend/BRepBlend_HCurve2dToolGen.cdl b/src/BRepBlend/BRepBlend_HCurve2dTool.cdl similarity index 69% rename from src/BRepBlend/BRepBlend_HCurve2dToolGen.cdl rename to src/BRepBlend/BRepBlend_HCurve2dTool.cdl index 33aee57daa..b7122b312f 100644 --- a/src/BRepBlend/BRepBlend_HCurve2dToolGen.cdl +++ b/src/BRepBlend/BRepBlend_HCurve2dTool.cdl @@ -14,22 +14,22 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -generic class HCurve2dToolGen from BRepBlend ( - CurveGen as any) +class HCurve2dTool from BRepBlend uses Array1OfReal from TColStd, Shape from GeomAbs, CurveType from GeomAbs, - Vec2d from gp, - Pnt2d from gp, - Circ2d from gp, - Elips2d from gp, - Hypr2d from gp, - Parab2d from gp, - Lin2d from gp, + Vec2d from gp, + Pnt2d from gp, + Circ2d from gp, + Elips2d from gp, + Hypr2d from gp, + Parab2d from gp, + Lin2d from gp, BezierCurve from Geom2d, - BSplineCurve from Geom2d + BSplineCurve from Geom2d, + HCurve2d from Adaptor2d raises @@ -43,12 +43,12 @@ is -- Global methods - Apply to the whole curve. -- - FirstParameter(myclass; C: CurveGen) returns Real + FirstParameter(myclass; C: HCurve2d from Adaptor2d) returns Real ---C++: inline ; - LastParameter(myclass; C: CurveGen) returns Real + LastParameter(myclass; C: HCurve2d from Adaptor2d) returns Real ---C++: inline ; @@ -72,18 +72,18 @@ is -- use the method Trim(). - Continuity(myclass; C: CurveGen) returns Shape from GeomAbs + Continuity(myclass; C: HCurve2d from Adaptor2d) returns Shape from GeomAbs ---Purpose: ---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 -- . May be one if Continuity(myclass) >= ---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) ---Purpose: Stores in the parameters bounding the intervals -- of continuity . @@ -95,31 +95,31 @@ is ---C++: inline ; - IsClosed(myclass; C: CurveGen) returns Boolean + IsClosed(myclass; C: HCurve2d from Adaptor2d) returns Boolean ---C++: inline ; - IsPeriodic(myclass; C: CurveGen) returns Boolean + IsPeriodic(myclass; C: HCurve2d from Adaptor2d) returns Boolean ---C++: inline ; - Period(myclass; C: CurveGen) returns Real + Period(myclass; C: HCurve2d from Adaptor2d) returns Real raises DomainError from Standard -- if the curve is not periodic ---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. ---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. ---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 -- first derivative. raises @@ -129,7 +129,7 @@ is ---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 : -- Returns the point P of parameter U, the first and second -- derivatives V1 and V2. @@ -140,7 +140,7 @@ is ---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 : -- Returns the point P of parameter U, the first, the second -- and the third derivative. @@ -151,7 +151,7 @@ is ---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 : -- The returned vector gives the value of the derivative for the -- order of derivation N. @@ -164,13 +164,13 @@ is ---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 -- to the real space resolution . ---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 -- interval : Line, Circle, Ellipse, Hyperbola, -- Parabola, BezierCurve, BSplineCurve, OtherCurve. @@ -182,43 +182,43 @@ is -- the corresponding type. -- - Line(myclass; C: CurveGen) returns Lin2d from gp + Line(myclass; C: HCurve2d from Adaptor2d) returns Lin2d from gp raises NoSuchObject from Standard ---C++: inline ; - Circle(myclass; C: CurveGen) returns Circ2d from gp + Circle(myclass; C: HCurve2d from Adaptor2d) returns Circ2d from gp raises NoSuchObject from Standard ---C++: inline ; - Ellipse(myclass; C: CurveGen) returns Elips2d from gp + Ellipse(myclass; C: HCurve2d from Adaptor2d) returns Elips2d from gp raises NoSuchObject from Standard ---C++: inline ; - Hyperbola(myclass; C: CurveGen) returns Hypr2d from gp + Hyperbola(myclass; C: HCurve2d from Adaptor2d) returns Hypr2d from gp raises NoSuchObject from Standard ---C++: inline ; - Parabola(myclass; C: CurveGen) returns Parab2d from gp + Parabola(myclass; C: HCurve2d from Adaptor2d) returns Parab2d from gp raises NoSuchObject from Standard ---C++: inline ; - Bezier(myclass; C: CurveGen) returns BezierCurve from Geom2d + Bezier(myclass; C: HCurve2d from Adaptor2d) returns BezierCurve from Geom2d raises NoSuchObject from Standard ---C++: inline ; - BSpline(myclass; C: CurveGen) returns BSplineCurve from Geom2d + BSpline(myclass; C: HCurve2d from Adaptor2d) returns BSplineCurve from Geom2d raises NoSuchObject from Standard ---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; -end HCurve2dToolGen; +end HCurve2dTool; diff --git a/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx b/src/BRepBlend/BRepBlend_HCurve2dTool.cxx similarity index 92% rename from src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx rename to src/BRepBlend/BRepBlend_HCurve2dTool.cxx index b8c4575f0f..5697f42491 100644 --- a/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx +++ b/src/BRepBlend/BRepBlend_HCurve2dTool.cxx @@ -14,7 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include CurveGen_hxx +#include + #include #include #include @@ -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 U1) { GeomAbs_CurveType typC = C->GetType(); diff --git a/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx b/src/BRepBlend/BRepBlend_HCurve2dTool.lxx similarity index 64% rename from src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx rename to src/BRepBlend/BRepBlend_HCurve2dTool.lxx index afdd09a99a..04654ca2c3 100644 --- a/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx +++ b/src/BRepBlend/BRepBlend_HCurve2dTool.lxx @@ -14,8 +14,6 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include CurveGen_hxx - #include #include @@ -33,59 +31,59 @@ #include //============================================================ -inline Standard_Real BRepBlend_HCurve2dToolGen::FirstParameter (const CurveGen& C) { +inline Standard_Real BRepBlend_HCurve2dTool::FirstParameter (const Handle(Adaptor2d_HCurve2d)& C) { 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()); } //============================================================ -inline GeomAbs_Shape BRepBlend_HCurve2dToolGen::Continuity (const CurveGen& C) { +inline GeomAbs_Shape BRepBlend_HCurve2dTool::Continuity (const Handle(Adaptor2d_HCurve2d)& C) { 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)); } //============================================================ -inline void BRepBlend_HCurve2dToolGen::Intervals(const CurveGen& C, +inline void BRepBlend_HCurve2dTool::Intervals(const Handle(Adaptor2d_HCurve2d)& C, TColStd_Array1OfReal& Tab, const GeomAbs_Shape 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()); } //============================================================ -inline Standard_Boolean BRepBlend_HCurve2dToolGen::IsPeriodic(const CurveGen& C) { +inline Standard_Boolean BRepBlend_HCurve2dTool::IsPeriodic(const Handle(Adaptor2d_HCurve2d)& C) { 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()); } //============================================================ -inline gp_Pnt2d BRepBlend_HCurve2dToolGen::Value (const CurveGen& C, +inline gp_Pnt2d BRepBlend_HCurve2dTool::Value (const Handle(Adaptor2d_HCurve2d)& C, const Standard_Real 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, gp_Pnt2d& 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, gp_Pnt2d& P, gp_Vec2d& 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, gp_Pnt2d& P, gp_Vec2d& T, @@ -94,7 +92,7 @@ inline void BRepBlend_HCurve2dToolGen::D2 (const CurveGen& C, 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, gp_Pnt2d& P, gp_Vec2d& V1, @@ -104,47 +102,47 @@ inline void BRepBlend_HCurve2dToolGen::D3 (const CurveGen& C, 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_Integer 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) { 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()); } //============================================================ -inline gp_Lin2d BRepBlend_HCurve2dToolGen::Line (const CurveGen& C) { +inline gp_Lin2d BRepBlend_HCurve2dTool::Line (const Handle(Adaptor2d_HCurve2d)& C) { 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()); } //============================================================ -inline gp_Elips2d BRepBlend_HCurve2dToolGen::Ellipse (const CurveGen& C) { +inline gp_Elips2d BRepBlend_HCurve2dTool::Ellipse (const Handle(Adaptor2d_HCurve2d)& C) { 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()); } //============================================================ -inline gp_Hypr2d BRepBlend_HCurve2dToolGen::Hyperbola (const CurveGen& C) { +inline gp_Hypr2d BRepBlend_HCurve2dTool::Hyperbola (const Handle(Adaptor2d_HCurve2d)& C) { 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()); } //============================================================ -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()); } //============================================================ diff --git a/src/BRepBlend/BRepBlend_HCurveToolGen.cdl b/src/BRepBlend/BRepBlend_HCurveTool.cdl similarity index 73% rename from src/BRepBlend/BRepBlend_HCurveToolGen.cdl rename to src/BRepBlend/BRepBlend_HCurveTool.cdl index b7fdeffe2d..a4913d494f 100644 --- a/src/BRepBlend/BRepBlend_HCurveToolGen.cdl +++ b/src/BRepBlend/BRepBlend_HCurveTool.cdl @@ -14,8 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -generic class HCurveToolGen from BRepBlend ( - CurveGen as any) +class HCurveTool from BRepBlend uses Array1OfReal from TColStd, @@ -29,7 +28,8 @@ uses Parab from gp, Lin from gp, BezierCurve from Geom, - BSplineCurve from Geom + BSplineCurve from Geom, + HCurve from Adaptor3d raises @@ -43,12 +43,12 @@ is -- Global methods - Apply to the whole curve. -- - FirstParameter(myclass; C: CurveGen) returns Real + FirstParameter(myclass; C: HCurve from Adaptor3d) returns Real ---C++: inline ; - LastParameter(myclass; C: CurveGen) returns Real + LastParameter(myclass; C: HCurve from Adaptor3d) returns Real ---C++: inline ; @@ -72,18 +72,18 @@ is -- use the method Trim(). - Continuity(myclass; C: CurveGen) returns Shape from GeomAbs + Continuity(myclass; C: HCurve from Adaptor3d) returns Shape from GeomAbs ---Purpose: ---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 -- . May be one if Continuity(myclass) >= ---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) ---Purpose: Stores in the parameters bounding the intervals -- of continuity . @@ -95,31 +95,31 @@ is ---C++: inline ; - IsClosed(myclass; C: CurveGen) returns Boolean + IsClosed(myclass; C: HCurve from Adaptor3d) returns Boolean ---C++: inline ; - IsPeriodic(myclass; C: CurveGen) returns Boolean + IsPeriodic(myclass; C: HCurve from Adaptor3d) returns Boolean ---C++: inline ; - Period(myclass; C: CurveGen) returns Real + Period(myclass; C: HCurve from Adaptor3d) returns Real raises DomainError from Standard -- if the curve is not periodic ---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. ---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. ---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 -- first derivative. raises @@ -129,7 +129,7 @@ is ---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 : -- Returns the point P of parameter U, the first and second -- derivatives V1 and V2. @@ -140,7 +140,7 @@ is ---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 : -- Returns the point P of parameter U, the first, the second -- and the third derivative. @@ -151,7 +151,7 @@ is ---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 : -- The returned vector gives the value of the derivative for the -- order of derivation N. @@ -164,13 +164,13 @@ is ---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 -- to the real space resolution . ---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 -- interval : Line, Circle, Ellipse, Hyperbola, -- Parabola, BezierCurve, BSplineCurve, OtherCurve. @@ -182,43 +182,43 @@ is -- the corresponding type. -- - Line(myclass; C: CurveGen) returns Lin from gp + Line(myclass; C: HCurve from Adaptor3d) returns Lin from gp raises NoSuchObject from Standard ---C++: inline ; - Circle(myclass; C: CurveGen) returns Circ from gp + Circle(myclass; C: HCurve from Adaptor3d) returns Circ from gp raises NoSuchObject from Standard ---C++: inline ; - Ellipse(myclass; C: CurveGen) returns Elips from gp + Ellipse(myclass; C: HCurve from Adaptor3d) returns Elips from gp raises NoSuchObject from Standard ---C++: inline ; - Hyperbola(myclass; C: CurveGen) returns Hypr from gp + Hyperbola(myclass; C: HCurve from Adaptor3d) returns Hypr from gp raises NoSuchObject from Standard ---C++: inline ; - Parabola(myclass; C: CurveGen) returns Parab from gp + Parabola(myclass; C: HCurve from Adaptor3d) returns Parab from gp raises NoSuchObject from Standard ---C++: inline ; - Bezier(myclass; C: CurveGen) returns BezierCurve from Geom + Bezier(myclass; C: HCurve from Adaptor3d) returns BezierCurve from Geom raises NoSuchObject from Standard ---C++: inline ; - BSpline(myclass; C: CurveGen) returns BSplineCurve from Geom + BSpline(myclass; C: HCurve from Adaptor3d) returns BSplineCurve from Geom raises NoSuchObject from Standard ---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; -end HCurveToolGen; +end HCurveTool; diff --git a/src/BRepBlend/BRepBlend_HCurveToolGen.gxx b/src/BRepBlend/BRepBlend_HCurveTool.cxx similarity index 92% rename from src/BRepBlend/BRepBlend_HCurveToolGen.gxx rename to src/BRepBlend/BRepBlend_HCurveTool.cxx index 00b5da8aed..7ca6e4c194 100644 --- a/src/BRepBlend/BRepBlend_HCurveToolGen.gxx +++ b/src/BRepBlend/BRepBlend_HCurveTool.cxx @@ -14,7 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include CurveGen_hxx +#include + #include #include #include @@ -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 U1) { GeomAbs_CurveType typC = C->GetType(); diff --git a/src/BRepBlend/BRepBlend_HCurveToolGen.lxx b/src/BRepBlend/BRepBlend_HCurveTool.lxx similarity index 65% rename from src/BRepBlend/BRepBlend_HCurveToolGen.lxx rename to src/BRepBlend/BRepBlend_HCurveTool.lxx index 789aebdf87..9abcc9ddcb 100644 --- a/src/BRepBlend/BRepBlend_HCurveToolGen.lxx +++ b/src/BRepBlend/BRepBlend_HCurveTool.lxx @@ -14,8 +14,6 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include CurveGen_hxx - #include #include @@ -33,59 +31,59 @@ #include //============================================================ -inline Standard_Real BRepBlend_HCurveToolGen::FirstParameter (const CurveGen& C) { +inline Standard_Real BRepBlend_HCurveTool::FirstParameter (const Handle(Adaptor3d_HCurve)& C) { 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()); } //============================================================ -inline GeomAbs_Shape BRepBlend_HCurveToolGen::Continuity (const CurveGen& C) { +inline GeomAbs_Shape BRepBlend_HCurveTool::Continuity (const Handle(Adaptor3d_HCurve)& C) { 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)); } //============================================================ -inline void BRepBlend_HCurveToolGen::Intervals(const CurveGen& C, +inline void BRepBlend_HCurveTool::Intervals(const Handle(Adaptor3d_HCurve)& C, TColStd_Array1OfReal& Tab, const GeomAbs_Shape 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()); } //============================================================ -inline Standard_Boolean BRepBlend_HCurveToolGen::IsPeriodic(const CurveGen& C) { +inline Standard_Boolean BRepBlend_HCurveTool::IsPeriodic(const Handle(Adaptor3d_HCurve)& C) { 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()); } //============================================================ -inline gp_Pnt BRepBlend_HCurveToolGen::Value (const CurveGen& C, +inline gp_Pnt BRepBlend_HCurveTool::Value (const Handle(Adaptor3d_HCurve)& C, const Standard_Real 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, gp_Pnt& 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, gp_Pnt& P, gp_Vec& 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, gp_Pnt& P, gp_Vec& T, @@ -94,7 +92,7 @@ inline void BRepBlend_HCurveToolGen::D2 (const CurveGen& C, 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, gp_Pnt& P, gp_Vec& V1, @@ -104,47 +102,47 @@ inline void BRepBlend_HCurveToolGen::D3 (const CurveGen& C, 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_Integer 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) { 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()); } //============================================================ -inline gp_Lin BRepBlend_HCurveToolGen::Line (const CurveGen& C) { +inline gp_Lin BRepBlend_HCurveTool::Line (const Handle(Adaptor3d_HCurve)& C) { 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()); } //============================================================ -inline gp_Elips BRepBlend_HCurveToolGen::Ellipse (const CurveGen& C) { +inline gp_Elips BRepBlend_HCurveTool::Ellipse (const Handle(Adaptor3d_HCurve)& C) { 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()); } //============================================================ -inline gp_Hypr BRepBlend_HCurveToolGen::Hyperbola (const CurveGen& C) { +inline gp_Hypr BRepBlend_HCurveTool::Hyperbola (const Handle(Adaptor3d_HCurve)& C) { 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()); } //============================================================ -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()); } //============================================================ diff --git a/src/Blend/Blend_Line.cdl b/src/BRepBlend/BRepBlend_Line.cdl similarity index 86% rename from src/Blend/Blend_Line.cdl rename to src/BRepBlend/BRepBlend_Line.cdl index 87abdbdbc5..739c20b931 100644 --- a/src/Blend/Blend_Line.cdl +++ b/src/BRepBlend/BRepBlend_Line.cdl @@ -14,21 +14,13 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- 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) - - -inherits TShared from MMgt +class Line from BRepBlend inherits TShared from MMgt uses Point from Blend, SequenceOfPoint from Blend, + Extremity from BRepBlend, TypeTrans from IntSurf @@ -39,7 +31,7 @@ is Create - returns mutable Line from Blend; + returns mutable Line from BRepBlend; @@ -101,7 +93,7 @@ is 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. ---C++: inline @@ -109,7 +101,7 @@ is 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. @@ -180,7 +172,7 @@ is ---Purpose: Returns the start point on S1. - returns TheExtremity + returns Extremity from BRepBlend ---C++: inline ---C++: return const& @@ -191,7 +183,7 @@ is ---Purpose: Returns the start point on S2 - returns TheExtremity + returns Extremity from BRepBlend ---C++: inline ---C++: return const& @@ -202,7 +194,7 @@ is ---Purpose: Returns the end point on S1. - returns TheExtremity + returns Extremity from BRepBlend ---C++: inline ---C++: return const& @@ -213,7 +205,7 @@ is ---Purpose: Returns the point on S2. - returns TheExtremity + returns Extremity from BRepBlend ---C++: inline ---C++: return const& @@ -235,10 +227,10 @@ fields seqpt : SequenceOfPoint from Blend; tras1 : TypeTrans from IntSurf; tras2 : TypeTrans from IntSurf; - stp1 : TheExtremity; - stp2 : TheExtremity; - endp1 : TheExtremity; - endp2 : TheExtremity; + stp1 : Extremity from BRepBlend; + stp2 : Extremity from BRepBlend; + endp1 : Extremity from BRepBlend; + endp2 : Extremity from BRepBlend; hass1 : Boolean from Standard; hass2 : Boolean from Standard; end; diff --git a/src/Blend/Blend_Line.gxx b/src/BRepBlend/BRepBlend_Line.cxx similarity index 84% rename from src/Blend/Blend_Line.gxx rename to src/BRepBlend/BRepBlend_Line.cxx index 041fed6755..1839d98daa 100644 --- a/src/Blend/Blend_Line.gxx +++ b/src/BRepBlend/BRepBlend_Line.cxx @@ -12,13 +12,15 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -Blend_Line::Blend_Line (): +#include + +BRepBlend_Line::BRepBlend_Line (): tras1(IntSurf_Undecided),tras2(IntSurf_Undecided), hass1(Standard_False),hass2(Standard_False) {} -void Blend_Line::Clear () +void BRepBlend_Line::Clear () { seqpt.Clear(); hass1 = Standard_False; @@ -27,7 +29,7 @@ void Blend_Line::Clear () tras2 = IntSurf_Undecided; } -void Blend_Line::Set(const IntSurf_TypeTrans TranS1, +void BRepBlend_Line::Set(const IntSurf_TypeTrans TranS1, const IntSurf_TypeTrans TranS2) { hass1 = Standard_True; @@ -36,7 +38,7 @@ void Blend_Line::Set(const IntSurf_TypeTrans TranS1, tras2 = TranS2; } -void Blend_Line::Set(const IntSurf_TypeTrans Trans) +void BRepBlend_Line::Set(const IntSurf_TypeTrans Trans) { hass1 = Standard_True; hass2 = Standard_False; diff --git a/src/Blend/Blend_Line.lxx b/src/BRepBlend/BRepBlend_Line.lxx similarity index 55% rename from src/Blend/Blend_Line.lxx rename to src/BRepBlend/BRepBlend_Line.lxx index 4944c2f7aa..e92bd55033 100644 --- a/src/Blend/Blend_Line.lxx +++ b/src/BRepBlend/BRepBlend_Line.lxx @@ -16,87 +16,87 @@ #include -inline void Blend_Line::Append(const Blend_Point& P) +inline void BRepBlend_Line::Append(const Blend_Point& 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); } -inline void Blend_Line::InsertBefore(const Standard_Integer Index, +inline void BRepBlend_Line::InsertBefore(const Standard_Integer Index, const Blend_Point& 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) { seqpt.Remove(FromIndex,ToIndex); } -inline void Blend_Line::SetStartPoints(const TheExtremity& StartPtOnS1, - const TheExtremity& StartPtOnS2) +inline void BRepBlend_Line::SetStartPoints(const BRepBlend_Extremity& StartPtOnS1, + const BRepBlend_Extremity& StartPtOnS2) { stp1 = StartPtOnS1; stp2 = StartPtOnS2; } -inline void Blend_Line::SetEndPoints(const TheExtremity& EndPtOnS1, - const TheExtremity& EndPtOnS2) +inline void BRepBlend_Line::SetEndPoints(const BRepBlend_Extremity& EndPtOnS1, + const BRepBlend_Extremity& EndPtOnS2) { endp1 = EndPtOnS1; endp2 = EndPtOnS2; } -inline Standard_Integer Blend_Line::NbPoints () const +inline Standard_Integer BRepBlend_Line::NbPoints () const { 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); } -inline IntSurf_TypeTrans Blend_Line::TransitionOnS1 () const +inline IntSurf_TypeTrans BRepBlend_Line::TransitionOnS1 () const { if (!hass1) {Standard_DomainError::Raise();} return tras1; } -inline IntSurf_TypeTrans Blend_Line::TransitionOnS2 () const +inline IntSurf_TypeTrans BRepBlend_Line::TransitionOnS2 () const { if (!hass2) {Standard_DomainError::Raise();} return tras2; } -inline const TheExtremity& Blend_Line::StartPointOnFirst() const +inline const BRepBlend_Extremity& BRepBlend_Line::StartPointOnFirst() const { return stp1; } -inline const TheExtremity& Blend_Line::StartPointOnSecond() const +inline const BRepBlend_Extremity& BRepBlend_Line::StartPointOnSecond() const { return stp2; } -inline const TheExtremity& Blend_Line::EndPointOnFirst() const +inline const BRepBlend_Extremity& BRepBlend_Line::EndPointOnFirst() const { return endp1; } -inline const TheExtremity& Blend_Line::EndPointOnSecond() const +inline const BRepBlend_Extremity& BRepBlend_Line::EndPointOnSecond() const { return endp2; } -inline IntSurf_TypeTrans Blend_Line::TransitionOnS () const +inline IntSurf_TypeTrans BRepBlend_Line::TransitionOnS () const { if (!hass1) {Standard_DomainError::Raise();} return tras1; diff --git a/src/Blend/Blend_PointOnRst.cdl b/src/BRepBlend/BRepBlend_PointOnRst.cdl similarity index 85% rename from src/Blend/Blend_PointOnRst.cdl rename to src/BRepBlend/BRepBlend_PointOnRst.cdl index 5235a2954a..04cd7079c4 100644 --- a/src/Blend/Blend_PointOnRst.cdl +++ b/src/BRepBlend/BRepBlend_PointOnRst.cdl @@ -14,8 +14,7 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. -generic class PointOnRst from Blend - (TheArc as any) +class PointOnRst from BRepBlend ---Purpose: Definition of an intersection point between a line @@ -24,7 +23,8 @@ generic class PointOnRst from Blend -- the Value method) and logical informations. -uses Transition from IntSurf +uses Transition from IntSurf, + HCurve2d from Adaptor2d raises DomainError from Standard @@ -35,21 +35,21 @@ is ---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) ---Purpose: Creates the PointOnRst on the arc A, at parameter Param, -- with the transition TLine on the walking line, and -- 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) ---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 -- vertex. - returns any TheArc + returns any HCurve2d from Adaptor2d ---C++: return const& ---C++: inline @@ -109,7 +109,7 @@ is fields - arc : TheArc; + arc : HCurve2d from Adaptor2d; traline : Transition from IntSurf; traarc : Transition from IntSurf; prm : Real from Standard; diff --git a/src/Blend/Blend_PointOnRst.gxx b/src/BRepBlend/BRepBlend_PointOnRst.cxx similarity index 81% rename from src/Blend/Blend_PointOnRst.gxx rename to src/BRepBlend/BRepBlend_PointOnRst.cxx index 1cf28902a5..2e1704901f 100644 --- a/src/Blend/Blend_PointOnRst.gxx +++ b/src/BRepBlend/BRepBlend_PointOnRst.cxx @@ -12,10 +12,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -Blend_PointOnRst::Blend_PointOnRst () {} +#include + +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 IntSurf_Transition& TLine, const IntSurf_Transition& TArc): @@ -23,7 +25,7 @@ Blend_PointOnRst::Blend_PointOnRst(const TheArc& A, 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 IntSurf_Transition& TLine, const IntSurf_Transition& TArc) diff --git a/src/Blend/Blend_PointOnRst.lxx b/src/BRepBlend/BRepBlend_PointOnRst.lxx similarity index 72% rename from src/Blend/Blend_PointOnRst.lxx rename to src/BRepBlend/BRepBlend_PointOnRst.lxx index f8327c86c7..e47d82260e 100644 --- a/src/Blend/Blend_PointOnRst.lxx +++ b/src/BRepBlend/BRepBlend_PointOnRst.lxx @@ -14,22 +14,22 @@ #include -inline const TheArc& Blend_PointOnRst::Arc () const +inline const Handle_Adaptor2d_HCurve2d& BRepBlend_PointOnRst::Arc () const { return arc; } -inline const IntSurf_Transition& Blend_PointOnRst::TransitionOnLine () const +inline const IntSurf_Transition& BRepBlend_PointOnRst::TransitionOnLine () const { return traline; } -inline const IntSurf_Transition& Blend_PointOnRst::TransitionOnArc () const +inline const IntSurf_Transition& BRepBlend_PointOnRst::TransitionOnArc () const { return traarc; } -inline Standard_Real Blend_PointOnRst::ParameterOnArc () const +inline Standard_Real BRepBlend_PointOnRst::ParameterOnArc () const { return prm; } diff --git a/src/Blend/Blend.cdl b/src/Blend/Blend.cdl index 962b2e5756..b64493a32c 100644 --- a/src/Blend/Blend.cdl +++ b/src/Blend/Blend.cdl @@ -19,7 +19,7 @@ package Blend uses IntSurf, TColgp, TColStd, - Adaptor2d, + Adaptor2d, gp, TopAbs, math, @@ -54,12 +54,6 @@ is class Point; - - generic class Extremity; - - generic class PointOnRst; - - generic class Line; generic class Walking; diff --git a/src/Blend/Blend_CSWalking.cdl b/src/Blend/Blend_CSWalking.cdl index 118e231d83..c7eac6e77a 100644 --- a/src/Blend/Blend_CSWalking.cdl +++ b/src/Blend/Blend_CSWalking.cdl @@ -25,15 +25,10 @@ generic class CSWalking from Blend TheCurveTool as any; TheTopolTool as Transient; TheBlendTool as any; - ThePointOnRst as any; -- as PointOnRst from Blend(TheArc) + ThePointOnRst as any; TheSeqPointOnRst as any; - TheExtremity as any; -- as Extremity from Blend(TheVertex,TheArc, - -- ThePointOnRst,TheSeqPointOnRst) - TheLine as Transient) -- as Line from Blend(TheVertex,TheArc, - -- ThePointOnRst,TheSeqPointOnRst, - -- TheExtremity) - - + TheExtremity as any; + TheLine as Transient) ---Purpose: diff --git a/src/Blend/Blend_Walking.cdl b/src/Blend/Blend_Walking.cdl index 899f551ac1..eef32e7f42 100644 --- a/src/Blend/Blend_Walking.cdl +++ b/src/Blend/Blend_Walking.cdl @@ -25,14 +25,10 @@ generic class Walking from Blend TheCurveTool as any; TheTopolTool as Transient; TheBlendTool as any; - ThePointOnRst as any; -- as PointOnRst from Blend(TheArc) + ThePointOnRst as any; TheSeqPointOnRst as any; - TheExtremity as any; -- as Extremity from Blend(TheVertex,TheArc, - -- ThePointOnRst,TheSeqPointOnRst) - TheLine as Transient) -- as Line from Blend(TheVertex,TheArc, - -- ThePointOnRst,TheSeqPointOnRst, - -- TheExtremity) - + TheExtremity as any; + TheLine as Transient) ---Purpose: