X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMAlgo%2FGEOMAlgo_Tools.hxx;h=30ff7cc51184a4502404fc4c77b4ff762ad13ceb;hb=772bb150e4e097cc43f244c99b7846ee9aad411f;hp=aa122e022bb13bff3a16d78219f79177135b851f;hpb=aa829b078e5ae308a86fe8c28de055a3e29131e6;p=modules%2Fgeom.git diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.hxx b/src/GEOMAlgo/GEOMAlgo_Tools.hxx index aa122e022..30ff7cc51 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.hxx @@ -22,6 +22,15 @@ #ifndef _GEOMAlgo_Tools_HeaderFile #define _GEOMAlgo_Tools_HeaderFile +#include + +#ifndef _Standard_HeaderFile +#include +#endif +#ifndef _Standard_Macro_HeaderFile +#include +#endif + #ifndef _Standard_Boolean_HeaderFile #include #endif @@ -31,6 +40,13 @@ #ifndef _Standard_Real_HeaderFile #include #endif + +#if OCC_VERSION_LARGE > 0x06050200 +#ifndef _Handle_IntTools_Context_HeaderFile +#include +#endif +#endif + #ifndef _Handle_Geom_Surface_HeaderFile #include #endif @@ -45,91 +61,93 @@ class TopoDS_Edge; class TopoDS_Face; class Geom_Surface; -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -class GEOMAlgo_Tools { +class GEOMAlgo_Tools { public: - void* operator new(size_t,void* anAddress) - { - return anAddress; - } - void* operator new(size_t size) - { - return Standard::Allocate(size); - } - void operator delete(void *anAddress) - { - if (anAddress) Standard::Free((Standard_Address&)anAddress); - } - - // Methods PUBLIC - // - - Standard_EXPORT static Standard_Boolean IsCompositeShape(const TopoDS_Shape& aS) ; - - Standard_EXPORT static Standard_Integer RefineSDShapes(GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD,const Standard_Real aTol,IntTools_Context& aCtx) ; - - Standard_EXPORT static Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE,const Standard_Real aTol,TopTools_IndexedDataMapOfShapeListOfShape& aMEE,IntTools_Context& aCtx) ; - - Standard_EXPORT static Standard_Integer FindSDShapes(const TopoDS_Shape& aE1,const TopTools_ListOfShape& aLE,const Standard_Real aTol,TopTools_ListOfShape& aLESD,IntTools_Context& aCtx) ; + void* operator new(size_t,void* anAddress) + { + return anAddress; + } + void* operator new(size_t size) + { + return Standard::Allocate(size); + } + void operator delete(void *anAddress) + { + if (anAddress) Standard::Free((Standard_Address&)anAddress); + } + + Standard_EXPORT static Standard_Boolean IsCompositeShape(const TopoDS_Shape& aS); + + Standard_EXPORT static Standard_Integer RefineSDShapes (GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD, + const Standard_Real aTol, +#if OCC_VERSION_LARGE > 0x06050200 + const Handle(IntTools_Context)& aCtx); +#else + IntTools_Context& aCtx); +#endif - Standard_EXPORT static Standard_Boolean ProjectPointOnShape(const gp_Pnt& aP1,const TopoDS_Shape& aS,gp_Pnt& aP2,IntTools_Context& aCtx) ; + Standard_EXPORT static Standard_Integer FindSDShapes (const TopTools_ListOfShape& aLE, + const Standard_Real aTol, + TopTools_IndexedDataMapOfShapeListOfShape& aMEE, +#if OCC_VERSION_LARGE > 0x06050200 + const Handle(IntTools_Context)& aCtx); +#else + IntTools_Context& aCtx); +#endif - Standard_EXPORT static void PointOnShape(const TopoDS_Shape& aS,gp_Pnt& aP3D) ; + Standard_EXPORT static Standard_Integer FindSDShapes (const TopoDS_Shape& aE1, + const TopTools_ListOfShape& aLE, + const Standard_Real aTol, + TopTools_ListOfShape& aLESD, +#if OCC_VERSION_LARGE > 0x06050200 + const Handle(IntTools_Context)& aCtx); +#else + IntTools_Context& aCtx); +#endif - Standard_EXPORT static void PointOnEdge(const TopoDS_Edge& aE,gp_Pnt& aP3D) ; + Standard_EXPORT static Standard_Boolean ProjectPointOnShape (const gp_Pnt& aP1, + const TopoDS_Shape& aS, + gp_Pnt& aP2, +#if OCC_VERSION_LARGE > 0x06050200 + const Handle(IntTools_Context)& aCtx); +#else + IntTools_Context& aCtx); +#endif - Standard_EXPORT static void PointOnEdge(const TopoDS_Edge& aE,const Standard_Real aT,gp_Pnt& aP3D) ; + Standard_EXPORT static void PointOnShape(const TopoDS_Shape& aS,gp_Pnt& aP3D); - Standard_EXPORT static void PointOnFace(const TopoDS_Face& aF,gp_Pnt& aP3D) ; + Standard_EXPORT static void PointOnEdge(const TopoDS_Edge& aE,gp_Pnt& aP3D); - Standard_EXPORT static void PointOnFace(const TopoDS_Face& aF,const Standard_Real aU,const Standard_Real aV,gp_Pnt& aP3D) ; + Standard_EXPORT static void PointOnEdge(const TopoDS_Edge& aE,const Standard_Real aT,gp_Pnt& aP3D); - Standard_EXPORT static void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE,const TopoDS_Face& aF,const Standard_Real aU1,const Standard_Real aU2) ; + Standard_EXPORT static void PointOnFace(const TopoDS_Face& aF,gp_Pnt& aP3D); - Standard_EXPORT static Standard_Boolean IsUPeriodic(const Handle(Geom_Surface)& aS) ; + Standard_EXPORT static void PointOnFace(const TopoDS_Face& aF,const Standard_Real aU,const Standard_Real aV,gp_Pnt& aP3D); - Standard_EXPORT static Standard_Boolean CorrectWires(const TopoDS_Shape& aS) ; + Standard_EXPORT static void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE,const TopoDS_Face& aF,const Standard_Real aU1,const Standard_Real aU2); - Standard_EXPORT static Standard_Integer BuildPCurveForEdgeOnFace(const TopoDS_Edge& aE,const TopoDS_Edge& aEold,const TopoDS_Face& aF,IntTools_Context& aCtx) ; + Standard_EXPORT static Standard_Boolean IsUPeriodic(const Handle(Geom_Surface)& aS); + Standard_EXPORT static Standard_Boolean CorrectWires(const TopoDS_Shape& aS); + Standard_EXPORT static Standard_Integer BuildPCurveForEdgeOnFace (const TopoDS_Edge& aE, + const TopoDS_Edge& aEold, + const TopoDS_Face& aF, +#if OCC_VERSION_LARGE > 0x06050200 + const Handle(IntTools_Context)& aCtx); +#else + IntTools_Context& aCtx); +#endif protected: - // Methods PROTECTED - // - - - // Fields PROTECTED - // - - -private: - - // Methods PRIVATE - // - - - // Fields PRIVATE - // - +private: }; - - - - // other Inline functions and methods (like "C++: function call" methods) - #endif