1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00

0024023: Revamp the OCCT Handle -- automatic

Automatic upgrade by command "occt_upgrade . -handle"
This commit is contained in:
abv 2015-07-02 16:30:15 +03:00
parent e7195ab476
commit 35c0599a42
139 changed files with 58 additions and 284 deletions
src
AIS
BOPDS
BRepBuilderAPI
BRepFill
BRepGProp
BRepMesh
BSplCLib
BSplSLib
BinTObjDrivers
BndLib
CDM
Expr
Graphic3d
IVtkDraw
LDOM
MeshTest
MeshVS
Message
MoniTool
NCollection
OpenGl
Poly
Prs3d
QABugs
Select3D

@ -48,8 +48,6 @@ class Bnd_Box;
class gp_Dir;
class TopoDS_Vertex;
class Standard_Transient;
class Handle(Standard_Type);
class Handle(AIS_Relation);
class AIS_LengthDimension;
DEFINE_STANDARD_HANDLE (AIS_LengthDimension, AIS_Dimension)

@ -48,7 +48,7 @@ namespace
}
//! Selectable() method modified to return myAssembly.
virtual Handle_SelectMgr_SelectableObject Selectable() const;
virtual Handle(SelectMgr_SelectableObject) Selectable() const;
Standard_Boolean IsHilighted (const Handle(PrsMgr_PresentationManager)& PM,const Standard_Integer aMode) const;

@ -16,7 +16,6 @@
#define BOPDS_ListOfPaveBlock_HeaderFile
#include <NCollection_List.hxx>
class Handle_BOPDS_PaveBlock;
typedef NCollection_List<Handle(BOPDS_PaveBlock)> BOPDS_ListOfPaveBlock;
typedef BOPDS_ListOfPaveBlock::Iterator BOPDS_ListIteratorOfListOfPaveBlock;

@ -29,8 +29,6 @@
#include <TopoDS_Vertex.hxx>
#include <TopoDS_Wire.hxx>
class Handle(NCollection_IncAllocator);
class Handle(Geom_Surface);
//! This class performs fast sewing of surfaces (faces). It supposes
//! that all surfaces are finite and are naturally restricted by their bounds.

@ -29,8 +29,6 @@
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <GeomAbs_Shape.hxx>
#include <Handle_Geom2d_Curve.hxx>
#include <Handle_Geom_Curve.hxx>
#include <Standard_Real.hxx>
class Standard_DomainError;

@ -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(Handle(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)
Handle(Vector)& theParam1,
Handle(Vector)& theParam2,
Handle(Vector)& theError,
Handle(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];
Handle(Vector) LGaussP[2];
Handle(Vector) LGaussW[2];
Handle(Vector) UGaussP[2];
Handle(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);
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);
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);
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);
// 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;
Handle(Vector) aDummy;
iUSubEnd = FillIntervalBounds(u1, u2, UKnots, NumSubs, anInertiaU, U1, U2, ErrU, aDummy);
UMaxSubs = BRepGProp_Gauss::MaxSubs(iUSubEnd);

@ -52,7 +52,6 @@ class BRepGProp_Gauss
};
typedef NCollection_Handle< NCollection_Array1<Inertia> > InertiaArray;
typedef NCollection_Handle<math_Vector> Handle_Vector;
typedef Standard_Real(*BRepGProp_GaussFunc)(const Standard_Real, const Standard_Real);
public: //! @name public API
@ -252,7 +251,7 @@ private: //! @name private methods
const Standard_Integer theCoeff = 32);
static void Init(
Handle_Vector& theOutVec,
Handle(Vector)& theOutVec,
const Standard_Real theValue,
const Standard_Integer theFirst = 0,
const Standard_Integer theLast = 0);
@ -269,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);
Handle(Vector)& theParam1,
Handle(Vector)& theParam2,
Handle(Vector)& theError,
Handle(Vector)& theCommonError);
private: //! @name private fields

@ -39,7 +39,6 @@
#include <BRepMesh_PairOfIndex.hxx>
#include <BRepMesh_Circle.hxx>
#include <TopTools_ShapeMapHasher.hxx>
#include <Handle_Poly_Triangulation.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Shape.hxx>
@ -48,7 +47,6 @@
class BRepMesh_Vertex;
class TopoDS_Edge;
class TopoDS_Vertex;
class Handle_BRepMesh_FaceAttribute;
class BRepMesh_VertexInspector;
class BRepMesh_CircleInspector;
class BRepMesh_Classifier;
@ -99,7 +97,7 @@ namespace BRepMesh
typedef NCollection_DataMap<Standard_Integer, Standard_Integer> MapOfIntegerInteger;
typedef NCollection_DataMap<TopoDS_Vertex, Standard_Integer, TopTools_ShapeMapHasher> DMapOfVertexInteger;
typedef NCollection_DataMap<TopoDS_Face, Handle_BRepMesh_FaceAttribute, TopTools_ShapeMapHasher> DMapOfFaceAttribute;
typedef NCollection_DataMap<TopoDS_Face, Handle(BRepMesh_FaceAttribute), TopTools_ShapeMapHasher> DMapOfFaceAttribute;
typedef NCollection_DataMap<TopoDS_Shape, BRepMesh_PairOfPolygon, TopTools_ShapeMapHasher> DMapOfShapePairOfPolygon;
typedef NCollection_DataMap<Standard_Integer, gp_Pnt> DMapOfIntegerPnt;
typedef NCollection_DataMap<Standard_Integer, ListOfXY> DMapOfIntegerListOfXY;

@ -20,9 +20,6 @@
#include <Standard_DefineAlloc.hxx>
#include <BRepMesh_IEdgeTool.hxx>
#include <BRepMesh_EdgeParameterProvider.hxx>
#include <Handle_Geom2d_Curve.hxx>
#include <Handle_Poly_PolygonOnTriangulation.hxx>
#include <Handle_Poly_Triangulation.hxx>
#include <TopLoc_Location.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColStd_Array1OfInteger.hxx>

@ -22,9 +22,6 @@
#include <BRepMesh_IEdgeTool.hxx>
#include <BRepMesh_GeomTool.hxx>
#include <BRepMesh_FaceAttribute.hxx>
#include <Handle_Geom_Surface.hxx>
#include <Handle_Geom2d_Curve.hxx>
#include <Handle_BRepAdaptor_HSurface.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>

@ -21,7 +21,6 @@
#include <BRepMesh_Status.hxx>
#include <BRepMesh.hxx>
#include <BRepMesh_DataStructureOfDelaun.hxx>
#include <Handle_BRepAdaptor_HSurface.hxx>
class BRepAdaptor_HSurface;

@ -24,8 +24,6 @@
#include <TopTools_ListOfShape.hxx>
#include <TopTools_MutexForShapeProvider.hxx>
#include <Standard_Transient.hxx>
#include <Handle_BRepAdaptor_HSurface.hxx>
#include <Handle_Geom2d_Curve.hxx>
#include <BRepMesh_Delaun.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <BRepMesh_Triangle.hxx>

@ -23,8 +23,6 @@
#include <Standard_Transient.hxx>
#include <TopTools_MutexForShapeProvider.hxx>
#include <TopTools_DataMapOfShapeReal.hxx>
#include <Handle_BRepAdaptor_HSurface.hxx>
#include <Handle_Poly_Triangulation.hxx>
#include <BRepMesh_Delaun.hxx>
#include <BRepMesh_Triangle.hxx>
#include <BRepMesh_Classifier.hxx>

@ -19,7 +19,6 @@
#include <Standard_Macro.hxx>
#include <GCPnts_TangentialDeflection.hxx>
#include <GeomAbs_IsoType.hxx>
#include <Handle_BRepAdaptor_HSurface.hxx>
#include <TopoDS_Edge.hxx>
#include <Precision.hxx>

@ -21,7 +21,6 @@
#include <TopTools_MapOfShape.hxx>
#include <TopTools_DataMapOfShapeReal.hxx>
#include <BRepMesh_DiscretRoot.hxx>
#include <Handle_Poly_Triangulation.hxx>
#include <BRepMesh.hxx>
#include <vector>

@ -17,7 +17,6 @@
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Macro.hxx>
#include <Handle_Poly_PolygonOnTriangulation.hxx>
class Poly_PolygonOnTriangulation;
@ -62,21 +61,21 @@ public:
}
//! Returns first polygon on triangulation.
inline const Handle_Poly_PolygonOnTriangulation& First() const
inline const Handle(Poly_PolygonOnTriangulation)& First() const
{
return myFirst;
}
//! Returns last polygon on triangulation.
inline const Handle_Poly_PolygonOnTriangulation& Last() const
inline const Handle(Poly_PolygonOnTriangulation)& Last() const
{
return myLast;
}
private:
Handle_Poly_PolygonOnTriangulation myFirst;
Handle_Poly_PolygonOnTriangulation myLast;
Handle(Poly_PolygonOnTriangulation) myFirst;
Handle(Poly_PolygonOnTriangulation) myLast;
};
#endif

@ -18,10 +18,8 @@
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Macro.hxx>
#include <Handle_BRepAdaptor_HSurface.hxx>
#include <BRepMesh_FaceAttribute.hxx>
#include <BRepMesh.hxx>
#include <Handle_Poly_Triangulation.hxx>
class TopoDS_Face;
class TopoDS_Edge;

@ -23,7 +23,7 @@
//! Converts handle of array of Standard_Real into the pointer to Standard_Real
static Standard_Real* ConvertArray(const Handle_TColStd_HArray2OfReal& theHArray)
static Standard_Real* ConvertArray(const Handle(TColStd_HArray2OfReal)& theHArray)
{
const TColStd_Array2OfReal& anArray = theHArray->Array2();
return (Standard_Real*) &(anArray(anArray.LowerRow(), anArray.LowerCol()));

@ -19,8 +19,6 @@
#include <Standard_Type.hxx>
#include <Standard_Transient.hxx>
#include <Handle_TColStd_HArray1OfReal.hxx>
#include <Handle_TColStd_HArray2OfReal.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_Pnt.hxx>

@ -23,7 +23,7 @@
//! Converts handle of array of Standard_Real into the pointer to Standard_Real
static Standard_Real* ConvertArray(const Handle_TColStd_HArray2OfReal& theHArray)
static Standard_Real* ConvertArray(const Handle(TColStd_HArray2OfReal)& theHArray)
{
const TColStd_Array2OfReal& anArray = theHArray->Array2();
return (Standard_Real*) &(anArray(anArray.LowerRow(), anArray.LowerCol()));

@ -21,8 +21,6 @@
#include <TObj_Common.hxx>
#include <Standard_GUID.hxx>
class Handle(BinMDF_ADriverTable);
class Handle(CDM_MessageDriver);
// Class for registering storage/retrieval drivers for TObj Bin persistence
//

@ -22,7 +22,6 @@
#include <BinLDrivers_DocumentRetrievalDriver.hxx>
#include <BinMDF_ADriverTable.hxx>
class Handle(CDM_MessageDriver);
// Retrieval driver of a TObj Bin document
//

@ -22,7 +22,6 @@
#include <BinLDrivers_DocumentStorageDriver.hxx>
#include <BinMDF_ADriverTable.hxx>
class Handle(CDM_MessageDriver);
// Block of comments describing class BinTObjDrivers_DocumentStorageDriver
//

@ -49,7 +49,7 @@ class BndLib_Box2dCurve {
void SetCurve(const Handle(Geom2d_Curve)& aC);
const Handle_Geom2d_Curve& Curve() const;
const Handle(Geom2d_Curve)& Curve() const;
void SetRange(const Standard_Real aT1,
const Standard_Real aT2);
@ -95,10 +95,10 @@ class BndLib_Box2dCurve {
void PerformOnePoint();
//-----------------------------
protected:
Handle_Geom2d_Curve myCurve;
Handle(Geom2d_Curve) myCurve;
Bnd_Box2d myBox;
Standard_Integer myErrorStatus;
Handle_Geom2d_Curve myCurveBase;
Handle(Geom2d_Curve) myCurveBase;
Standard_Real myOffsetBase;
Standard_Boolean myOffsetFlag;
Standard_Real myT1;

@ -20,7 +20,6 @@
#include <TCollection_ExtendedString.hxx>
#include <NCollection_DataMap.hxx>
class Handle(CDM_MetaData);
typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_MetaData),TCollection_ExtendedString> CDM_MetaDataLookUpTable;
typedef NCollection_DataMap<TCollection_ExtendedString,Handle(CDM_MetaData),TCollection_ExtendedString>::Iterator CDM_DataMapIteratorOfMetaDataLookUpTable;

@ -17,7 +17,6 @@
#ifndef Expr_Array1OfNamedUnknown_HeaderFile
#define Expr_Array1OfNamedUnknown_HeaderFile
#include <Handle_Expr_NamedUnknown.hxx>
#include <NCollection_Array1.hxx>
typedef NCollection_Array1<Handle(Expr_NamedUnknown)> Expr_Array1OfNamedUnknown;

@ -25,11 +25,8 @@
#include <Graphic3d_Vec3.hxx>
#include <Graphic3d_ZLayerId.hxx>
#include <Standard_Transient.hxx>
#include <Handle_Graphic3d_GraphicDriver.hxx>
//! Forward declaration.
class Handle(Graphic3d_StructureManager);
class Handle(Graphic3d_CStructure);
//! Low-level graphic structure interface
class Graphic3d_CStructure : public Standard_Transient

@ -31,7 +31,6 @@
#include <Bnd_Box.hxx>
//! Forward declaration
class Handle(Graphic3d_Camera);
//! Camera class provides object-oriented approach to setting up projection
//! and orientation properties of 3D view.

@ -26,8 +26,6 @@
class gp_Pln;
class Graphic3d_AspectFillArea3d;
class Handle(Graphic3d_AspectFillArea3d);
class Handle(Graphic3d_ClipPlane);
//! Container for properties describing graphic driver clipping planes.
//! It is up to application to create instances of this class and specify its

@ -16,7 +16,6 @@
#ifndef _Graphic3d_MapOfStructure
#define _Graphic3d_MapOfStructure
#include <Handle_Graphic3d_Structure.hxx>
#include <NCollection_Map.hxx>
typedef NCollection_Map<Handle(Graphic3d_Structure)> Graphic3d_MapOfStructure;

@ -21,7 +21,6 @@
#include <Graphic3d_TypeOfShaderObject.hxx>
//! Forward declaration
class Handle(Graphic3d_ShaderObject);
//! This class is responsible for managing shader objects.
class Graphic3d_ShaderObject : public Standard_Transient

@ -38,7 +38,7 @@ public:
Standard_EXPORT static void Commands (Draw_Interpretor& theCommands);
private:
Standard_EXPORT static const Handle_MMgt_TShared& WClass();
Standard_EXPORT static const Handle(MMgt_TShared)& WClass();
};
#endif

@ -23,7 +23,6 @@
#include <Standard_Macro.hxx>
#endif
#ifndef _Handle_MMgt_TShared_HeaderFile
#include <Handle_MMgt_TShared.hxx>
#endif
#include <NCollection_DataMap.hxx>
@ -123,6 +122,5 @@ private:
//! Mapping between OCCT topological shape IDs and their correspondent
//! visualization pipelines.
typedef NCollection_DataMap<IVtk_IdType, Handle(IVtkDraw_HighlightAndSelectionPipeline)> ShapePipelineMap;
typedef NCollection_Handle<ShapePipelineMap> Handle(ShapePipelineMap);
#endif

@ -21,7 +21,6 @@
#include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx>
class Handle(LDOM_MemManager);
class LDOM_NullPtr;
class TCollection_AsciiString;
class TCollection_ExtendedString;

@ -17,7 +17,6 @@
#define LDOMString_HeaderFile
#include <LDOMBasicString.hxx>
#include <Handle_LDOM_MemManager.hxx>
// Class LDOMString
// Represents various object types which can be mapped to XML strings

@ -17,7 +17,6 @@
#define LDOM_Document_HeaderFile
#include <LDOM_Element.hxx>
#include <Handle_LDOM_MemManager.hxx>
#include <LDOM_Text.hxx>
#include <LDOM_CDATASection.hxx>
#include <LDOM_Comment.hxx>

@ -126,6 +126,5 @@ class LDOM_MemManager : public MMgt_TShared
DEFINE_STANDARD_RTTI (LDOM_MemManager, MMgt_TShared)
};
#include <Handle_LDOM_MemManager.hxx>
#endif

@ -21,7 +21,6 @@
#include <Standard_Macro.hxx>
#include <Standard_TypeDef.hxx>
#include <Handle_LDOM_MemManager.hxx>
#include <LDOMString.hxx>
class LDOM_BasicNode;

@ -24,7 +24,7 @@
//purpose : Constructor
//=======================================================================
LDOM_SBuffer::LDOM_StringElem::LDOM_StringElem
( const int theLength, const Handle_NCollection_BaseAllocator& theAlloc )
( const int theLength, const Handle(NCollection_BaseAllocator)& theAlloc )
: buf (reinterpret_cast<char*>(theAlloc->Allocate (theLength))),
len (0),
next(0)

@ -53,7 +53,7 @@ class LDOM_SBuffer : public streambuf
DEFINE_NCOLLECTION_ALLOC
LDOM_StringElem(const int, const Handle_NCollection_BaseAllocator&);
LDOM_StringElem(const int, const Handle(NCollection_BaseAllocator)&);
~LDOM_StringElem();
private:

@ -49,7 +49,7 @@ public:
Standard_EXPORT void DrawOn(Draw_Display& theDisplay) const;
Standard_EXPORT virtual Handle_Draw_Drawable3D Copy() const;
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const;
Standard_EXPORT virtual void Dump(Standard_OStream& theStream) const;

@ -21,7 +21,6 @@
#include <Select3D_BndBox3d.hxx>
#include <SelectBasics_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <SelectBasics_SelectingVolumeManager.hxx>
class SelectBasics_EntityOwner;

@ -21,7 +21,6 @@
#include <gp_Pnt.hxx>
#include <Select3D_SensitiveFace.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <Select3D_TypeOfSensitivity.hxx>
class SelectBasics_EntityOwner;

@ -21,7 +21,6 @@
#include <Bnd_Box.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <Select3D_BndBox3d.hxx>

@ -25,7 +25,6 @@
#include <gp_XY.hxx>
#include <NCollection_List.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <Select3D_BndBox3d.hxx>
@ -51,7 +50,7 @@ public:
const TColgp_Array1OfPnt& theNodes,
const Handle(MeshVS_HArray1OfSequenceOfInteger)& theTopo);
Standard_EXPORT virtual Handle_Select3D_SensitiveEntity GetConnected() Standard_OVERRIDE;
Standard_EXPORT virtual Handle(Select3D_SensitiveEntity) GetConnected() Standard_OVERRIDE;
Standard_EXPORT virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
SelectBasics_PickResult& thePickResult) Standard_OVERRIDE;

@ -21,7 +21,6 @@
#include <gp_Pnt.hxx>
#include <Select3D_SensitiveSegment.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
class SelectBasics_EntityOwner;
class gp_Pnt;

@ -18,9 +18,7 @@
#include <NCollection_Array1.hxx>
#include <NCollection_Handle.hxx>
typedef NCollection_Handle<Message_Msg> Handle(Message_Msg);
typedef NCollection_Array1<Handle(Message_Msg)> Message_ArrayOfMsg;
typedef NCollection_Handle<Message_ArrayOfMsg> Handle(Message_ArrayOfMsg);
typedef Handle(Message_ArrayOfMsg) Message_HArrayOfMsg;
#endif // _Message_HArrayOfMsg_HeaderFile

@ -21,7 +21,6 @@
#include <MoniTool_MTHasher.hxx>
#include <NCollection_DataMap.hxx>
class Handle(MoniTool_Timer);
typedef NCollection_DataMap<Standard_CString,Handle(MoniTool_Timer),MoniTool_MTHasher> MoniTool_DataMapOfTimer;
typedef NCollection_DataMap<Standard_CString,Handle(MoniTool_Timer),MoniTool_MTHasher>::Iterator MoniTool_DataMapIteratorOfDataMapOfTimer;

@ -18,7 +18,6 @@
#include <TCollection_HAsciiString.hxx>
class Handle(MoniTool_TypedValue);
typedef Handle(TCollection_HAsciiString) (*MoniTool_ValueInterpret) (const Handle(MoniTool_TypedValue)& typval,
const Handle(TCollection_HAsciiString)& val,

@ -31,7 +31,6 @@
#include <Standard_Type.hxx>
#include <NCollection_TypeDef.hxx>
class Handle(NCollection_BaseAllocator);
/**
* Purpose: Basic class for memory allocation wizards.

@ -18,7 +18,6 @@
#include <NCollection_BaseAllocator.hxx>
class Handle(NCollection_HeapAllocator);
/**
* Allocator that uses the global dynamic heap (malloc / free).

@ -17,7 +17,6 @@
#define _Handle_OpenGl_Context_Header
#include <Standard_Type.hxx>
#include <Handle_Standard_Transient.hxx>
class OpenGl_Context;
DEFINE_STANDARD_HANDLE(OpenGl_Context, Standard_Transient)

@ -17,7 +17,6 @@
#define _Handle_OpenGl_GraphicDriver_Header
#include <Standard_Type.hxx>
#include <Handle_Graphic3d_GraphicDriver.hxx>
class OpenGl_GraphicDriver;

@ -16,7 +16,6 @@
#ifndef _Handle_OpenGl_PointSprite_Header
#define _Handle_OpenGl_PointSprite_Header
#include <Handle_OpenGl_Texture.hxx>
class OpenGl_PointSprite;
DEFINE_STANDARD_HANDLE(OpenGl_PointSprite, OpenGl_Texture)

@ -17,7 +17,6 @@
#define _Handle_OpenGl_View_Header
#include <Standard_Type.hxx>
#include <Handle_MMgt_TShared.hxx>
class OpenGl_View;

@ -17,7 +17,6 @@
#define _Handle_OpenGl_Window_Header
#include <Standard_Type.hxx>
#include <Handle_MMgt_TShared.hxx>
class OpenGl_Window;

@ -17,7 +17,6 @@
#define _Handle_OpenGl_Workspace_Header
#include <Standard_Type.hxx>
#include <Handle_OpenGl_Window.hxx>
class OpenGl_Workspace;

@ -21,9 +21,6 @@
#include <Aspect_PolygonOffsetMode.hxx>
#include <TCollection_AsciiString.hxx>
#include <Handle_Graphic3d_TextureParams.hxx>
#include <Handle_OpenGl_ShaderProgram.hxx>
#include <Handle_OpenGl_Texture.hxx>
#include <OpenGl_AspectLine.hxx>
#include <OpenGl_Element.hxx>

@ -22,7 +22,6 @@
#include <Aspect_TypeOfLine.hxx>
#include <Graphic3d_CAspectLine.hxx>
#include <Handle_OpenGl_ShaderProgram.hxx>
#include <OpenGl_Element.hxx>

@ -22,8 +22,6 @@
#include <TCollection_AsciiString.hxx>
#include <OpenGl_Element.hxx>
#include <Handle_OpenGl_PointSprite.hxx>
#include <Handle_OpenGl_ShaderProgram.hxx>
#include <Image_PixMap_Handle.hxx>

@ -25,7 +25,6 @@
#include <TCollection_AsciiString.hxx>
#include <OpenGl_Element.hxx>
#include <Handle_OpenGl_ShaderProgram.hxx>
//! Text representation parameters
class OpenGl_AspectText : public OpenGl_Element

@ -22,8 +22,6 @@
#include <Graphic3d_SequenceOfGroup.hxx>
// Forward declaration
class Handle(OpenGl_Workspace);
class Handle(Graphic3d_ClipPlane);
DEFINE_STANDARD_HANDLE (OpenGl_CappingAlgoFilter, OpenGl_RenderFilter)

@ -22,7 +22,6 @@
#include <OpenGl_Matrix.hxx>
#include <Graphic3d_ClipPlane.hxx>
class Handle(OpenGl_Context);
DEFINE_STANDARD_HANDLE (OpenGl_CappingPlaneResource, OpenGl_Resource)

@ -18,7 +18,6 @@
#include <Standard_Type.hxx>
#include <Standard_Transient.hxx>
#include <Handle_Standard_Transient.hxx>
//! Class to define graphic driver capabilities.
//! Notice that these options will be ignored if particular functionality does not provided by GL driver

@ -23,7 +23,6 @@
#include <NCollection_Handle.hxx>
#include <Standard_TypeDef.hxx>
#include <OpenGl_Matrix.hxx>
#include <Handle_OpenGl_Workspace.hxx>
//! This class contains logics related to tracking and modification of clipping plane
//! state for particular OpenGl context. It contains information about enabled

@ -21,11 +21,6 @@
#include <Aspect_Display.hxx>
#include <Aspect_RenderingContext.hxx>
#include <Aspect_TypeOfLine.hxx>
#include <Handle_OpenGl_Context.hxx>
#include <Handle_OpenGl_FrameBuffer.hxx>
#include <Handle_OpenGl_Sampler.hxx>
#include <Handle_OpenGl_ShaderManager.hxx>
#include <Handle_OpenGl_ShaderProgram.hxx>
#include <NCollection_DataMap.hxx>
#include <NCollection_Map.hxx>
#include <NCollection_Handle.hxx>
@ -652,11 +647,8 @@ private: // system-dependent fields
private: // context info
typedef NCollection_DataMap<TCollection_AsciiString, Standard_Integer> OpenGl_DelayReleaseMap;
typedef NCollection_Handle<OpenGl_DelayReleaseMap> Handle(OpenGl_DelayReleaseMap);
typedef NCollection_DataMap<TCollection_AsciiString, Handle(OpenGl_Resource)> OpenGl_ResourcesMap;
typedef NCollection_Handle<OpenGl_ResourcesMap> Handle(OpenGl_ResourcesMap);
typedef NCollection_List<Handle(OpenGl_Resource)> OpenGl_ResourcesStack;
typedef NCollection_Handle<OpenGl_ResourcesStack> Handle(OpenGl_ResourcesStack);
Handle(OpenGl_ResourcesMap) mySharedResources; //!< shared resources with unique identification key
Handle(OpenGl_DelayReleaseMap) myDelayed; //!< shared resources for delayed release

@ -16,8 +16,6 @@
#ifndef OpenGl_Element_Header
#define OpenGl_Element_Header
#include <Handle_OpenGl_Context.hxx>
#include <Handle_OpenGl_Workspace.hxx>
#include <OpenGl_RenderFilter.hxx>
//! Base interface for drawable elements.

@ -16,7 +16,6 @@
#include <OpenGl_Element.hxx>
#include <OpenGl_Vec.hxx>
#include <Handle_OpenGl_Workspace.hxx>
class gp_Ax2;

@ -22,7 +22,6 @@
#include <Standard_Boolean.hxx>
#include <InterfaceGraphic.hxx>
#include <Handle_OpenGl_FrameBuffer.hxx>
//! Class implements FrameBuffer Object (FBO) resource
//! intended for off-screen rendering.

@ -17,7 +17,6 @@
#define _OpenGl_GraphicDriver_HeaderFile
#include <Graphic3d_GraphicDriver.hxx>
#include <Handle_OpenGl_GraphicDriver.hxx>
#include <OpenGl_Context.hxx>
#include <OpenGl_PrinterContext.hxx>
@ -27,8 +26,6 @@
#include <TColStd_HArray1OfReal.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <Quantity_NameOfColor.hxx>
#include <Handle_OpenGl_View.hxx>
#include <Handle_OpenGl_Workspace.hxx>
#include <Aspect_Display.hxx>
#include <Aspect_DisplayConnection.hxx>
@ -66,7 +63,6 @@ class Quantity_Color;
class Graphic3d_Vertex;
class TCollection_ExtendedString;
class Image_PixMap;
class Handle(OpenGl_Workspace);
class OpenGl_Element;
class OpenGl_Structure;
class OpenGl_Text;

@ -21,14 +21,12 @@
#include <InterfaceGraphic_telem.hxx>
#include <Handle_OpenGl_Workspace.hxx>
#include <OpenGl_BVHClipPrimitiveSet.hxx>
#include <OpenGl_BVHTreeSelector.hxx>
#include <Graphic3d_ZLayerSettings.hxx>
#include <OpenGl_GlCore11.hxx>
class Handle(OpenGl_Workspace);
struct OpenGl_GlobalLayerSettings
{

@ -25,7 +25,6 @@
#include <NCollection_DataMap.hxx>
class OpenGl_Structure;
class Handle(OpenGl_Workspace);
typedef NCollection_Sequence<OpenGl_Layer> OpenGl_SequenceOfLayers;
typedef NCollection_DataMap<int, int> OpenGl_LayerSeqIds;

@ -23,7 +23,6 @@
#include <Font_FontAspect.hxx>
class OpenGl_Context;
class Handle(OpenGl_Context);
class OpenGl_LineAttributes : public OpenGl_Resource
{

@ -16,7 +16,6 @@
#define _OpenGl_PointSprite_H__
#include <OpenGl_Texture.hxx>
#include <Handle_OpenGl_PointSprite.hxx>
//! Point sprite resource. On modern hardware it will be texture with extra parameters.
//! On ancient hardware sprites will be drawn using bitmaps.

@ -28,7 +28,6 @@
#include <OpenGl_Element.hxx>
class OpenGl_GraphicDriver;
class Handle(OpenGl_ShaderProgram);
//! Class for rendering of arbitrary primitive array.
class OpenGl_PrimitiveArray : public OpenGl_Element

@ -18,7 +18,6 @@
#include <Standard_Type.hxx>
#include <TColStd_Array2OfReal.hxx>
#include <Handle_Standard_Transient.hxx>
#include <OpenGl_Vec.hxx>
//! Class provides specific information for redrawing view to offscreen buffer

@ -19,7 +19,6 @@
#include <Standard_Type.hxx>
class Standard_Transient;
class Handle(Standard_Type);
class OpenGl_Context;
//! Interface for OpenGl resource with following meaning:

@ -17,7 +17,6 @@
#define OPENGL_SAMPLER_H
#include <OpenGl_Context.hxx>
#include <Handle_OpenGl_Sampler.hxx>
//! Class implements OpenGL sampler object resource that
//! stores the sampling parameters for a texture access.

@ -22,7 +22,6 @@
#include <NCollection_DataMap.hxx>
#include <NCollection_Sequence.hxx>
#include <Handle_OpenGl_ShaderManager.hxx>
#include <OpenGl_SetOfShaderPrograms.hxx>
#include <OpenGl_ShaderStates.hxx>
#include <OpenGl_AspectFace.hxx>

@ -16,7 +16,6 @@
#ifndef _OpenGl_ShaderObject_Header
#define _OpenGl_ShaderObject_Header
#include <Handle_OpenGl_ShaderObject.hxx>
#include <Graphic3d_ShaderObject.hxx>
#include <OpenGl_GlCore20.hxx>
#include <OpenGl_Resource.hxx>

@ -28,7 +28,6 @@
#include <OpenGl_Vec.hxx>
#include <OpenGl_Matrix.hxx>
#include <OpenGl_ShaderObject.hxx>
#include <Handle_OpenGl_ShaderProgram.hxx>
//! The enumeration of OCCT-specific OpenGL/GLSL variables.
enum OpenGl_StateVariable

@ -27,7 +27,6 @@
#include <Graphic3d_HorizontalTextAlignment.hxx>
#include <Graphic3d_VerticalTextAlignment.hxx>
class Handle(OpenGl_PrinterContext);
//! Text rendering
class OpenGl_Text : public OpenGl_Element

@ -17,11 +17,8 @@
#include <OpenGl_GlCore13.hxx>
#include <OpenGl_Resource.hxx>
#include <Handle_OpenGl_Texture.hxx>
#include <Graphic3d_TypeOfTexture.hxx>
#include <Handle_Graphic3d_TextureParams.hxx>
class Handle(OpenGl_Context);
class OpenGl_Context;
class Image_PixMap;

@ -48,11 +48,6 @@
#include <OpenGl_Trihedron.hxx>
#include <OpenGl_GraduatedTrihedron.hxx>
#include <Handle_OpenGl_Context.hxx>
#include <Handle_OpenGl_GraphicDriver.hxx>
#include <Handle_OpenGl_Workspace.hxx>
#include <Handle_OpenGl_View.hxx>
#include <Handle_OpenGl_Texture.hxx>
struct OPENGL_ZCLIP
{
@ -76,7 +71,6 @@ struct OPENGL_FOG
struct OpenGl_Matrix;
class OpenGl_Structure;
class Handle(OpenGl_PrinterContext);
class OpenGl_StateCounter;
class OpenGl_View : public MMgt_TShared

@ -20,9 +20,6 @@
#include <InterfaceGraphic_Aspect.hxx>
#include <OpenGl_Caps.hxx>
#include <Handle_OpenGl_Context.hxx>
#include <Handle_OpenGl_Window.hxx>
#include <Handle_OpenGl_GraphicDriver.hxx>
#include <MMgt_TShared.hxx>

@ -19,7 +19,6 @@
#include <map>
#include <set>
#include <Handle_OpenGl_Workspace.hxx>
#include <OpenGl_Window.hxx>
#include <TColStd_Array2OfReal.hxx>
@ -29,7 +28,6 @@
#include <Graphic3d_TypeOfTexture.hxx>
#include <Graphic3d_PtrFrameBuffer.hxx>
#include <Graphic3d_BufferType.hxx>
#include <Handle_Graphic3d_TextureParams.hxx>
#include <Aspect_CLayer2d.hxx>
#include <Aspect_Handle.hxx>
@ -53,8 +51,6 @@
#include <OpenGl_LineAttributes.hxx>
#include <OpenGl_CappingAlgo.hxx>
#include <Handle_OpenGl_View.hxx>
#include <Handle_OpenGl_Texture.hxx>
#include <OpenGl_ShaderObject.hxx>
#include <OpenGl_ShaderProgram.hxx>

@ -22,7 +22,6 @@
#include <Poly_CoherentLink.hxx>
#include <NCollection_Vector.hxx>
class Handle(Poly_CoherentTriangulation);
class Poly_CoherentTriangulation;
template <class A> class NCollection_List;

@ -23,7 +23,6 @@
#include <NCollection_BaseAllocator.hxx>
#include <NCollection_List.hxx>
class Handle(NCollection_IncAllocator);
/**
* Make loops from a set of connected links. A link is represented by

@ -18,21 +18,12 @@
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Handle_Prs3d_IsoAspect.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Boolean.hxx>
#include <Handle_Prs3d_LineAspect.hxx>
#include <Handle_Prs3d_TextAspect.hxx>
#include <Handle_Prs3d_ShadingAspect.hxx>
#include <Quantity_Length.hxx>
#include <Aspect_TypeOfDeflection.hxx>
#include <Standard_Real.hxx>
#include <Handle_Prs3d_PointAspect.hxx>
#include <Prs3d_VertexDrawMode.hxx>
#include <Handle_Prs3d_PlaneAspect.hxx>
#include <Handle_Prs3d_ArrowAspect.hxx>
#include <Handle_Prs3d_DatumAspect.hxx>
#include <Handle_Prs3d_DimensionAspect.hxx>
#include <Prs3d_DimensionUnits.hxx>
#include <Prs3d_TypeOfHLR.hxx>
#include <MMgt_TShared.hxx>

@ -22,8 +22,6 @@
class Adaptor3d_Curve;
class TopoDS_Edge;
class TopoDS_Shape;
class Handle(BRepAdaptor_HSurface);
class Handle(Prs3d_Drawer);
class Prs3d_WFShape : Prs3d_Root
{

@ -1975,7 +1975,6 @@ static Standard_Integer OCC24667 (Draw_Interpretor& di, Standard_Integer n, cons
return 0;
}
#include <Handle_BRepTools_NurbsConvertModification.hxx>
#include <BRepPrimAPI_MakeCylinder.hxx>
#include <BRepBuilderAPI_Copy.hxx>
#include <BRepTools_NurbsConvertModification.hxx>
@ -1985,7 +1984,7 @@ static TopoDS_Shape CreateTestShape (int& theShapeNb)
BRep_Builder aBuilder;
aBuilder.MakeCompound (aComp);
//NURBS modifier is used to increase footprint of each shape
Handle_BRepTools_NurbsConvertModification aNurbsModif = new BRepTools_NurbsConvertModification;
Handle(BRepTools_NurbsConvertModification) aNurbsModif = new BRepTools_NurbsConvertModification;
TopoDS_Shape aRefShape = BRepPrimAPI_MakeCylinder (50., 100.).Solid();
BRepTools_Modifier aModifier (aRefShape, aNurbsModif);
if (aModifier.IsDone()) {

@ -3,7 +3,6 @@
#include <NCollection_Sequence.hxx>
class Handle(Select3D_SensitiveEntity);
typedef NCollection_Sequence<Handle(Select3D_SensitiveEntity)> Select3D_EntitySequence;
typedef NCollection_Sequence<Handle(Select3D_SensitiveEntity)>::Iterator Select3D_EntitySequenceIter;

@ -18,7 +18,6 @@
#include <NCollection_Vector.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <TColStd_HArray1OfInteger.hxx>
@ -92,7 +91,7 @@ protected:
protected:
Select3D_VectorOfHPoly myPlanarPolygons; //!< Vector of planar polygons
Handle_TColStd_HArray1OfInteger myPolygonsIdxs; //!< Indexes array for BVH calculation
Handle(TColStd_HArray1OfInteger) myPolygonsIdxs; //!< Indexes array for BVH calculation
gp_Pnt myCOG; //!< Center of the point set
Select3D_BndBox3d myBndBox; //!< Bounding box of the point set
};

@ -24,7 +24,6 @@
#include <Bnd_Box.hxx>
#include <gp_Pnt.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <SelectMgr_SelectingVolumeManager.hxx>
#include <Standard_OStream.hxx>

@ -25,8 +25,6 @@
#include <Select3D_SensitivePoly.hxx>
#include <Select3D_Pnt.hxx>
#include <Handle_Geom_Circle.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <SelectMgr_SelectingVolumeManager.hxx>
#include <Select3D_TypeOfSensitivity.hxx>
@ -112,7 +110,7 @@ private:
Select3D_TypeOfSensitivity mySensType; //!< True if type of selection is interior, false otherwise
gp_Pnt myCenter3D; //!< Center of a circle
Handle_Geom_Circle myCircle; //!< Points of the circle
Handle(Geom_Circle) myCircle; //!< Points of the circle
Standard_Real myStart; //!< Sensitive arc parameter
Standard_Real myEnd; //!< Sensitive arc parameter
};

@ -22,9 +22,7 @@
#include <Standard_Type.hxx>
#include <Geom_Curve.hxx>
#include <Handle_Geom_Curve.hxx>
#include <Select3D_SensitivePoly.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <Standard_Boolean.hxx>
#include <SelectMgr_SelectingVolumeManager.hxx>
@ -77,7 +75,7 @@ private:
private:
Handle_Geom_Curve myCurve; //!< Curve points
Handle(Geom_Curve) myCurve; //!< Curve points
};
DEFINE_STANDARD_HANDLE(Select3D_SensitiveCurve, Select3D_SensitivePoly)

@ -21,7 +21,6 @@
#include <Standard_Type.hxx>
#include <SelectBasics_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <SelectMgr_SelectingVolumeManager.hxx>
@ -31,7 +30,6 @@
#include <TopLoc_Location.hxx>
class Select3D_SensitiveEntity;
class Handle(Select3D_SensitiveEntity);
class SelectBasics_EntityOwner;
//! Abstract framework to define 3D sensitive entities.

@ -25,7 +25,6 @@
#include <Select3D_TypeOfSensitivity.hxx>
#include <Select3D_SensitiveSet.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <Standard_Boolean.hxx>
#include <SelectBasics_SelectingVolumeManager.hxx>

@ -25,7 +25,6 @@
#include <Select3D_EntitySequence.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <Select3D_SensitiveSet.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <SelectMgr_SelectingVolumeManager.hxx>
class SelectBasics_EntityOwner;

@ -23,7 +23,6 @@
#include <Select3D_Pnt.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <Standard_Boolean.hxx>
#include <SelectMgr_SelectingVolumeManager.hxx>
#include <Standard_Real.hxx>

Some files were not shown because too many files have changed in this diff Show More