OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0024023: Revamp the OCCT Handle -- general

Browse Source 
Missing headers added; includes of headers "Handle_...hxx" removed.

Misuses of macro Handle() and its use in typedefs corrected.

Alias classes Profile and Option are removed from IFSelect; ones defined in MoniTool are used directly.

Removed header files defining only Handle classes (except Image_PixMap_Handle.hxx)

Classes SelectMgr_BaseFrustum and now inherit Standard_Transient and can be manipulated by Handle (not NCollection_Handle)

Fixed reference-type local variable pointing to temporary object

Use of handle in conditional expressions and comparisons to NULL are replaced by call to method IsNull()
This commit is contained in:
abv
2015-06-30 10:25:12 +03:00
parent 35c0599a42
commit c04c30b3ee
311 changed files with 725 additions and 1175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/BRepGProp/BRepGProp_Gauss.cxx
View File

@@ -176,7 +176,7 @@ Standard_Integer BRepGProp_Gauss::MaxSubs(const Standard_Integer theN,
//function : Init
//purpose :
//=======================================================================
void BRepGProp_Gauss::Init(Handle(Vector)& theOutVec,
void BRepGProp_Gauss::Init(NCollection_Handle<math_Vector>& theOutVec,
const Standard_Real theValue,
const Standard_Integer theFirst,
const Standard_Integer theLast)
@@ -227,10 +227,10 @@ Standard_Integer BRepGProp_Gauss::FillIntervalBounds(
const TColStd_Array1OfReal& theKnots,
const Standard_Integer theNumSubs,
InertiaArray& theInerts,
Handle(Vector)& theParam1,
Handle(Vector)& theParam2,
Handle(Vector)& theError,
Handle(Vector)& theCommonError)
NCollection_Handle<math_Vector>& theParam1,
NCollection_Handle<math_Vector>& theParam2,
NCollection_Handle<math_Vector>& theError,
NCollection_Handle<math_Vector>& theCommonError)
{
const Standard_Integer aSize =
Max(theKnots.Upper(), MaxSubs(theKnots.Upper() - 1, theNumSubs));
@@ -550,10 +550,10 @@ Standard_Real BRepGProp_Gauss::Compute(
InertiaArray anInertiaU = new NCollection_Array1<Inertia>(1, SM);
// Prepare Gauss points and weights
Handle(Vector) LGaussP[2];
Handle(Vector) LGaussW[2];
Handle(Vector) UGaussP[2];
Handle(Vector) UGaussW[2];
NCollection_Handle<math_Vector> LGaussP[2];
NCollection_Handle<math_Vector> LGaussW[2];
NCollection_Handle<math_Vector> UGaussP[2];
NCollection_Handle<math_Vector> UGaussW[2];
const Standard_Integer aNbGaussPoint =
RealToInt(Ceiling(ERROR_ALGEBR_RATIO * GPM));
@@ -568,14 +568,14 @@ Standard_Real BRepGProp_Gauss::Compute(
UGaussW[0] = new math_Vector(1, GPM);
UGaussW[1] = new math_Vector(1, aNbGaussPoint);
Handle(Vector) L1 = new math_Vector(1, SM);
Handle(Vector) L2 = new math_Vector(1, SM);
Handle(Vector) U1 = new math_Vector(1, SM);
Handle(Vector) U2 = new math_Vector(1, SM);
NCollection_Handle<math_Vector> L1 = new math_Vector(1, SM);
NCollection_Handle<math_Vector> L2 = new math_Vector(1, SM);
NCollection_Handle<math_Vector> U1 = new math_Vector(1, SM);
NCollection_Handle<math_Vector> U2 = new math_Vector(1, SM);
Handle(Vector) ErrL = new math_Vector(1, SM, 0.0);
Handle(Vector) ErrU = new math_Vector(1, SM, 0.0);
Handle(Vector) ErrUL = new math_Vector(1, SM, 0.0);
NCollection_Handle<math_Vector> ErrL = new math_Vector(1, SM, 0.0);
NCollection_Handle<math_Vector> ErrU = new math_Vector(1, SM, 0.0);
NCollection_Handle<math_Vector> ErrUL = new math_Vector(1, SM, 0.0);
// Face parametrization in U and V direction
Standard_Real BV1, BV2, BU1, BU2;
@@ -746,7 +746,7 @@ Standard_Real BRepGProp_Gauss::Compute(
if (Abs(u2 - u1) < EPS_PARAM)
continue;
Handle(Vector) aDummy;
NCollection_Handle<math_Vector> aDummy;
iUSubEnd = FillIntervalBounds(u1, u2, UKnots, NumSubs, anInertiaU, U1, U2, ErrU, aDummy);
UMaxSubs = BRepGProp_Gauss::MaxSubs(iUSubEnd);

10
src/BRepGProp/BRepGProp_Gauss.hxx
View File

@@ -251,7 +251,7 @@ private: //! @name private methods
const Standard_Integer theCoeff = 32);
static void Init(
Handle(Vector)& theOutVec,
NCollection_Handle<math_Vector>& theOutVec,
const Standard_Real theValue,
const Standard_Integer theFirst = 0,
const Standard_Integer theLast = 0);
@@ -268,10 +268,10 @@ private: //! @name private methods
const TColStd_Array1OfReal& theKnots,
const Standard_Integer theNumSubs,
InertiaArray& theInerts,
Handle(Vector)& theParam1,
Handle(Vector)& theParam2,
Handle(Vector)& theError,
Handle(Vector)& theCommonError);
NCollection_Handle<math_Vector>& theParam1,
NCollection_Handle<math_Vector>& theParam2,
NCollection_Handle<math_Vector>& theError,
NCollection_Handle<math_Vector>& theCommonError);
private: //! @name private fields