Skip to content

Commit f5c5a0c

Browse files
adam-urbanczykadam-urbanczyk
committed
Update headers again
1 parent f0b6e96 commit f5c5a0c

939 files changed

Lines changed: 15373 additions & 16642 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎opencascade/AIS_InteractiveContext.hxx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
#include <Prs3d_TypeOfHighlight.hxx>
3838
#include <PrsMgr_PresentationManager.hxx>
3939
#include <SelectMgr_AndOrFilter.hxx>
40-
#include <SelectMgr_IndexedMapOfOwner.hxx>
40+
#include <NCollection_IndexedMap.hxx>
41+
#include <NCollection_Shared.hxx>
4142
#include <SelectMgr_Filter.hxx>
4243
#include <SelectMgr_PickingStrategy.hxx>
4344
#include <SelectMgr_SelectionManager.hxx>
@@ -48,6 +49,7 @@
4849
#include <Standard_Integer.hxx>
4950
#include <NCollection_Sequence.hxx>
5051
#include <Quantity_Color.hxx>
52+
class SelectMgr_EntityOwner;
5153

5254
class V3d_Viewer;
5355
class V3d_View;
@@ -484,7 +486,7 @@ public: //! @name iteration through detected entities
484486
{
485487
if (!myDetectedSeq.IsEmpty())
486488
{
487-
myCurDetected = myDetectedSeq.Lower();
489+
myCurDetected = NCollection_Sequence<int>::Lower();
488490
}
489491
}
490492

@@ -493,7 +495,8 @@ public: //! @name iteration through detected entities
493495
//! @sa DetectedCurrentOwner(), InitDetected(), NextDetected().
494496
bool MoreDetected() const
495497
{
496-
return myCurDetected >= myDetectedSeq.Lower() && myCurDetected <= myDetectedSeq.Upper();
498+
return myCurDetected >= NCollection_Sequence<int>::Lower()
499+
&& myCurDetected <= myDetectedSeq.Upper();
497500
}
498501

499502
//! Gets next current object during iteration through mouse-detected interactive objects.

‎opencascade/AIS_Line.hxx‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,35 @@ public:
4646
//! Constructs an infinite line.
4747
const occ::handle<Geom_Line>& Line() const { return myComponent; }
4848

49+
//! Returns the starting point of the line set by SetPoints.
50+
//! @return handle to the start point
51+
const occ::handle<Geom_Point>& StartPoint() const { return myStartPoint; }
52+
53+
//! Returns the end point of the line set by SetPoints.
54+
//! @return handle to the end point
55+
const occ::handle<Geom_Point>& EndPoint() const { return myEndPoint; }
56+
4957
//! Returns the starting point thePStart and the end point thePEnd of the line set by SetPoints.
58+
//! @deprecated Use StartPoint() and EndPoint() instead.
59+
Standard_DEPRECATED("Use StartPoint() and EndPoint() instead")
5060
void Points(occ::handle<Geom_Point>& thePStart, occ::handle<Geom_Point>& thePEnd) const
5161
{
52-
thePStart = myStartPoint;
53-
thePEnd = myEndPoint;
62+
thePStart = StartPoint();
63+
thePEnd = EndPoint();
5464
}
5565

56-
//! instantiates an infinite line.
66+
//! Sets the infinite line.
67+
//! @param[in] theLine the geometric line
5768
void SetLine(const occ::handle<Geom_Line>& theLine)
5869
{
5970
myComponent = theLine;
6071
myLineIsSegment = false;
6172
}
6273

63-
//! Sets the starting point thePStart and ending point thePEnd of the
74+
//! Sets the starting point and ending point of the
6475
//! infinite line to create a finite line segment.
76+
//! @param[in] thePStart the starting point
77+
//! @param[in] thePEnd the ending point
6578
void SetPoints(const occ::handle<Geom_Point>& thePStart, const occ::handle<Geom_Point>& thePEnd)
6679
{
6780
myStartPoint = thePStart;

‎opencascade/AIS_Selection.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public:
7878
const NCollection_List<occ::handle<SelectMgr_EntityOwner>>& Objects() const { return myresult; }
7979

8080
//! Return the number of selected objects.
81-
int Extent() const { return myresult.Size(); }
81+
int Extent() const { return myresult.Length(); }
8282

8383
//! Return true if list of selected objects is empty.
8484
bool IsEmpty() const { return myresult.IsEmpty(); }

‎opencascade/APIHeaderSection_MakeHeader.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public:
4949

5050
//! Cancels the former definition and gives a FileName
5151
//! To be used when a Model has no well defined Header
52-
Standard_EXPORT void Init(const char* nameval);
52+
Standard_EXPORT void Init(const char* const nameval);
5353

5454
//! Returns True if all data have been defined (see also
5555
//! HasFn, HasFs, HasFd)

‎opencascade/Adaptor2d_Curve2d.hxx‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#ifndef _Adaptor2d_Curve2d_HeaderFile
1818
#define _Adaptor2d_Curve2d_HeaderFile
1919

20+
#include <Geom2d_Curve.hxx>
2021
#include <GeomAbs_CurveType.hxx>
2122
#include <GeomAbs_Shape.hxx>
2223
#include <gp_Lin2d.hxx>
@@ -29,8 +30,6 @@
2930
#include <Standard_Handle.hxx>
3031
#include <NCollection_Array1.hxx>
3132

32-
class gp_Pnt2d;
33-
class gp_Vec2d;
3433
class Geom2d_BezierCurve;
3534
class Geom2d_BSplineCurve;
3635

@@ -152,6 +151,27 @@ public:
152151
Standard_EXPORT virtual occ::handle<Geom2d_BezierCurve> Bezier() const;
153152

154153
Standard_EXPORT virtual occ::handle<Geom2d_BSplineCurve> BSpline() const;
154+
155+
//! Computes the point of parameter U on the curve.
156+
//! Raises an exception on failure.
157+
[[nodiscard]] Standard_EXPORT virtual gp_Pnt2d EvalD0(const double theU) const;
158+
159+
//! Computes the point and first derivative at parameter U.
160+
//! Raises an exception on failure.
161+
[[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD1 EvalD1(const double theU) const;
162+
163+
//! Computes the point and first two derivatives at parameter U.
164+
//! Raises an exception on failure.
165+
[[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD2 EvalD2(const double theU) const;
166+
167+
//! Computes the point and first three derivatives at parameter U.
168+
//! Raises an exception on failure.
169+
[[nodiscard]] Standard_EXPORT virtual Geom2d_Curve::ResD3 EvalD3(const double theU) const;
170+
171+
//! Computes the Nth derivative at parameter U.
172+
//! Raises an exception on failure.
173+
[[nodiscard]] Standard_EXPORT virtual gp_Vec2d EvalDN(const double theU, const int theN) const;
174+
155175
Standard_EXPORT ~Adaptor2d_Curve2d() override;
156176
};
157177

‎opencascade/Adaptor3d_Curve.hxx‎

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#ifndef _Adaptor3d_Curve_HeaderFile
1818
#define _Adaptor3d_Curve_HeaderFile
1919

20+
#include <Geom_Curve.hxx>
2021
#include <gp_Circ.hxx>
2122
#include <gp_Elips.hxx>
2223
#include <gp_Hypr.hxx>
@@ -28,8 +29,6 @@
2829
#include <NCollection_Array1.hxx>
2930
#include <GeomAbs_CurveType.hxx>
3031

31-
class gp_Pnt;
32-
class gp_Vec;
3332
class Geom_BezierCurve;
3433
class Geom_BSplineCurve;
3534
class Geom_OffsetCurve;
@@ -87,39 +86,53 @@ public:
8786
Standard_EXPORT virtual double Period() const;
8887

8988
//! Computes the point of parameter U on the curve.
90-
Standard_EXPORT virtual gp_Pnt Value(const double U) const;
89+
gp_Pnt Value(const double theU) const { return EvalD0(theU); }
9190

9291
//! Computes the point of parameter U on the curve.
93-
Standard_EXPORT virtual void D0(const double U, gp_Pnt& P) const;
92+
void D0(const double theU, gp_Pnt& theP) const { theP = EvalD0(theU); }
9493

9594
//! Computes the point of parameter U on the curve with its
9695
//! first derivative.
9796
//! Raised if the continuity of the current interval
9897
//! is not C1.
99-
Standard_EXPORT virtual void D1(const double U, gp_Pnt& P, gp_Vec& V) const;
98+
void D1(const double theU, gp_Pnt& theP, gp_Vec& theV) const
99+
{
100+
const Geom_Curve::ResD1 aRes = EvalD1(theU);
101+
theP = aRes.Point;
102+
theV = aRes.D1;
103+
}
100104

101105
//! Returns the point P of parameter U, the first and second
102106
//! derivatives V1 and V2.
103107
//! Raised if the continuity of the current interval
104108
//! is not C2.
105-
Standard_EXPORT virtual void D2(const double U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const;
109+
void D2(const double theU, gp_Pnt& theP, gp_Vec& theV1, gp_Vec& theV2) const
110+
{
111+
const Geom_Curve::ResD2 aRes = EvalD2(theU);
112+
theP = aRes.Point;
113+
theV1 = aRes.D1;
114+
theV2 = aRes.D2;
115+
}
106116

107117
//! Returns the point P of parameter U, the first, the second
108118
//! and the third derivative.
109119
//! Raised if the continuity of the current interval
110120
//! is not C3.
111-
Standard_EXPORT virtual void D3(const double U,
112-
gp_Pnt& P,
113-
gp_Vec& V1,
114-
gp_Vec& V2,
115-
gp_Vec& V3) const;
121+
void D3(const double theU, gp_Pnt& theP, gp_Vec& theV1, gp_Vec& theV2, gp_Vec& theV3) const
122+
{
123+
const Geom_Curve::ResD3 aRes = EvalD3(theU);
124+
theP = aRes.Point;
125+
theV1 = aRes.D1;
126+
theV2 = aRes.D2;
127+
theV3 = aRes.D3;
128+
}
116129

117130
//! The returned vector gives the value of the derivative for the
118131
//! order of derivation N.
119132
//! Raised if the continuity of the current interval
120133
//! is not CN.
121134
//! Raised if N < 1.
122-
Standard_EXPORT virtual gp_Vec DN(const double U, const int N) const;
135+
gp_Vec DN(const double theU, const int theN) const { return EvalDN(theU, theN); }
123136

124137
//! Returns the parametric resolution corresponding
125138
//! to the real space resolution <R3d>.
@@ -154,6 +167,26 @@ public:
154167

155168
Standard_EXPORT virtual occ::handle<Geom_OffsetCurve> OffsetCurve() const;
156169

170+
//! Computes the point of parameter U on the curve.
171+
//! Raises an exception on failure.
172+
[[nodiscard]] Standard_EXPORT virtual gp_Pnt EvalD0(const double theU) const;
173+
174+
//! Computes the point and first derivative at parameter U.
175+
//! Raises an exception on failure.
176+
[[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD1 EvalD1(const double theU) const;
177+
178+
//! Computes the point and first two derivatives at parameter U.
179+
//! Raises an exception on failure.
180+
[[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD2 EvalD2(const double theU) const;
181+
182+
//! Computes the point and first three derivatives at parameter U.
183+
//! Raises an exception on failure.
184+
[[nodiscard]] Standard_EXPORT virtual Geom_Curve::ResD3 EvalD3(const double theU) const;
185+
186+
//! Computes the Nth derivative at parameter U.
187+
//! Raises an exception on failure.
188+
[[nodiscard]] Standard_EXPORT virtual gp_Vec EvalDN(const double theU, const int theN) const;
189+
157190
Standard_EXPORT ~Adaptor3d_Curve() override;
158191
};
159192

‎opencascade/Adaptor3d_CurveOnSurface.hxx‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -96,40 +96,20 @@ public:
9696

9797
Standard_EXPORT double Period() const override;
9898

99-
//! Computes the point of parameter U on the curve.
100-
Standard_EXPORT gp_Pnt Value(const double U) const override;
101-
102-
//! Computes the point of parameter U on the curve.
103-
Standard_EXPORT void D0(const double U, gp_Pnt& P) const override;
104-
105-
//! Computes the point of parameter U on the curve with its
106-
//! first derivative.
107-
//! Raised if the continuity of the current interval
108-
//! is not C1.
109-
Standard_EXPORT void D1(const double U, gp_Pnt& P, gp_Vec& V) const override;
110-
111-
//! Returns the point P of parameter U, the first and second
112-
//! derivatives V1 and V2.
113-
//! Raised if the continuity of the current interval
114-
//! is not C2.
115-
Standard_EXPORT void D2(const double U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const override;
116-
117-
//! Returns the point P of parameter U, the first, the second
118-
//! and the third derivative.
119-
//! Raised if the continuity of the current interval
120-
//! is not C3.
121-
Standard_EXPORT void D3(const double U,
122-
gp_Pnt& P,
123-
gp_Vec& V1,
124-
gp_Vec& V2,
125-
gp_Vec& V3) const override;
126-
127-
//! The returned vector gives the value of the derivative for the
128-
//! order of derivation N.
129-
//! Raised if the continuity of the current interval
130-
//! is not CN.
131-
//! Raised if N < 1.
132-
Standard_EXPORT gp_Vec DN(const double U, const int N) const override;
99+
//! Point evaluation. Raises an exception on failure.
100+
[[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
101+
102+
//! D1 evaluation. Raises an exception on failure.
103+
[[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
104+
105+
//! D2 evaluation. Raises an exception on failure.
106+
[[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
107+
108+
//! D3 evaluation. Raises an exception on failure.
109+
[[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
110+
111+
//! DN evaluation. Raises an exception on failure.
112+
[[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
133113

134114
//! Returns the parametric resolution corresponding
135115
//! to the real space resolution <R3d>.

‎opencascade/Adaptor3d_IsoCurve.hxx‎

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define _Adaptor3d_IsoCurve_HeaderFile
1919

2020
#include <Adaptor3d_Surface.hxx>
21+
#include <Geom_Curve.hxx>
2122
#include <GeomAbs_IsoType.hxx>
2223

2324
//! Defines an isoparametric curve on a surface. The
@@ -104,39 +105,25 @@ public:
104105

105106
Standard_EXPORT double Period() const override;
106107

107-
//! Computes the point of parameter U on the curve.
108-
Standard_EXPORT gp_Pnt Value(const double U) const override;
109-
110-
//! Computes the point of parameter U on the curve.
111-
Standard_EXPORT void D0(const double U, gp_Pnt& P) const override;
112-
113-
//! Computes the point of parameter U on the curve with its
114-
//! first derivative.
115-
//! Raised if the continuity of the current interval
116-
//! is not C1.
117-
Standard_EXPORT void D1(const double U, gp_Pnt& P, gp_Vec& V) const override;
118-
119-
//! Returns the point P of parameter U, the first and second
120-
//! derivatives V1 and V2.
121-
//! Raised if the continuity of the current interval
122-
//! is not C2.
123-
Standard_EXPORT void D2(const double U, gp_Pnt& P, gp_Vec& V1, gp_Vec& V2) const override;
124-
125-
//! Returns the point P of parameter U, the first, the second
126-
//! and the third derivative.
127-
//! Raised if the continuity of the current interval
128-
//! is not C3.
129-
Standard_EXPORT void D3(const double U,
130-
gp_Pnt& P,
131-
gp_Vec& V1,
132-
gp_Vec& V2,
133-
gp_Vec& V3) const override;
134-
135-
//! The returned vector gives the value of the derivative for the
136-
//! order of derivation N.
108+
//! Computes the point of parameter theU on the curve.
109+
[[nodiscard]] Standard_EXPORT gp_Pnt EvalD0(const double theU) const final;
110+
111+
//! Computes the point of parameter theU on the curve with its first derivative.
112+
//! Raised if the continuity of the current interval is not C1.
113+
[[nodiscard]] Standard_EXPORT Geom_Curve::ResD1 EvalD1(const double theU) const final;
114+
115+
//! Returns the point and the first and second derivatives at parameter theU.
116+
//! Raised if the continuity of the current interval is not C2.
117+
[[nodiscard]] Standard_EXPORT Geom_Curve::ResD2 EvalD2(const double theU) const final;
118+
119+
//! Returns the point and the first, second and third derivatives at parameter theU.
120+
//! Raised if the continuity of the current interval is not C3.
121+
[[nodiscard]] Standard_EXPORT Geom_Curve::ResD3 EvalD3(const double theU) const final;
122+
123+
//! Returns the derivative of order theN at parameter theU.
137124
//! Raised if the continuity of the current interval is not CN.
138-
//! Raised if N < 1.
139-
Standard_EXPORT gp_Vec DN(const double U, const int N) const override;
125+
//! Raised if theN < 1.
126+
[[nodiscard]] Standard_EXPORT gp_Vec EvalDN(const double theU, const int theN) const final;
140127

141128
//! Returns the parametric resolution corresponding
142129
//! to the real space resolution <R3d>.

0 commit comments

Comments
 (0)