ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to OCCT6.5.1 development version

Browse Source
This commit is contained in:
jfa 2011-09-13 12:44:54 +00:00
parent 28c48d7e24
commit 50704013d0
25 changed files with 231 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile #ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile
#define _GEOM_DataMapOfAsciiStringTransient_HeaderFile #define _GEOM_DataMapOfAsciiStringTransient_HeaderFile
@ -38,6 +37,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class TCollection_AsciiString; class TCollection_AsciiString;
@ -45,7 +45,6 @@ class Standard_Transient;
class GEOM_DataMapNodeOfDataMapOfAsciiStringTransient; class GEOM_DataMapNodeOfDataMapOfAsciiStringTransient;
class GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient; class GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -53,6 +52,8 @@ class GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOM_DataMapOfAsciiStringTransient : public TCollection_BasicMap { class GEOM_DataMapOfAsciiStringTransient : public TCollection_BasicMap {
public: public:
@ -69,6 +70,7 @@ public:
{ {
if (anAddress) Standard::Free((Standard_Address&)anAddress); if (anAddress) Standard::Free((Standard_Address&)anAddress);
} }
// Methods PUBLIC // Methods PUBLIC
// //
Standard_EXPORT GEOM_DataMapOfAsciiStringTransient(const Standard_Integer NbBuckets = 1); Standard_EXPORT GEOM_DataMapOfAsciiStringTransient(const Standard_Integer NbBuckets = 1);
@ -100,40 +102,18 @@ Standard_EXPORT Handle_Standard_Transient& ChangeFind(const TCollection_AsciiS
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const TCollection_AsciiString& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const TCollection_AsciiString& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT GEOM_DataMapOfAsciiStringTransient(const GEOM_DataMapOfAsciiStringTransient& Other); Standard_EXPORT GEOM_DataMapOfAsciiStringTransient(const GEOM_DataMapOfAsciiStringTransient& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

89
src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
View File

@ -15,7 +15,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile #ifndef _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
#define _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile #define _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
@ -32,6 +31,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class TopoDS_Shape; class TopoDS_Shape;
@ -39,7 +39,6 @@ class TopTools_OrientedShapeMapHasher;
class GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape; class GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape;
class GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape; class GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -47,9 +46,10 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfOrientedShapeShape : public TCollection_BasicMap { class GEOMAlgo_DataMapOfOrientedShapeShape : public TCollection_BasicMap
{
public: public:
void* operator new(size_t,void* anAddress) void* operator new(size_t,void* anAddress)
@ -64,91 +64,56 @@ public:
{ {
if (anAddress) Standard::Free((Standard_Address&)anAddress); if (anAddress) Standard::Free((Standard_Address&)anAddress);
} }
// Methods PUBLIC // Methods PUBLIC
// //
Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape(const Standard_Integer NbBuckets = 1);
Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape(const Standard_Integer NbBuckets = 1); Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape& Assign(const GEOMAlgo_DataMapOfOrientedShapeShape& Other) ;
Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape& Assign(const GEOMAlgo_DataMapOfOrientedShapeShape& Other) ;
GEOMAlgo_DataMapOfOrientedShapeShape& operator =(const GEOMAlgo_DataMapOfOrientedShapeShape& Other) GEOMAlgo_DataMapOfOrientedShapeShape& operator =(const GEOMAlgo_DataMapOfOrientedShapeShape& Other)
{ {
return Assign(Other); return Assign(Other);
} }
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ;
Standard_EXPORT void Clear() ;
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ; ~GEOMAlgo_DataMapOfOrientedShapeShape()
{
Standard_EXPORT void Clear() ;
~GEOMAlgo_DataMapOfOrientedShapeShape()
{
Clear(); Clear();
} }
Standard_EXPORT Standard_Boolean Bind(const TopoDS_Shape& K,const TopoDS_Shape& I) ;
Standard_EXPORT Standard_Boolean IsBound(const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Boolean UnBind(const TopoDS_Shape& K) ;
Standard_EXPORT const TopoDS_Shape& Find(const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Boolean Bind(const TopoDS_Shape& K,const TopoDS_Shape& I) ;
Standard_EXPORT Standard_Boolean IsBound(const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Boolean UnBind(const TopoDS_Shape& K) ;
Standard_EXPORT const TopoDS_Shape& Find(const TopoDS_Shape& K) const;
const TopoDS_Shape& operator()(const TopoDS_Shape& K) const const TopoDS_Shape& operator()(const TopoDS_Shape& K) const
{ {
return Find(K); return Find(K);
} }
Standard_EXPORT TopoDS_Shape& ChangeFind(const TopoDS_Shape& K) ;
Standard_EXPORT TopoDS_Shape& ChangeFind(const TopoDS_Shape& K) ;
TopoDS_Shape& operator()(const TopoDS_Shape& K) TopoDS_Shape& operator()(const TopoDS_Shape& K)
{ {
return ChangeFind(K); return ChangeFind(K);
} }
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const TopoDS_Shape& K);
#endif
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape(const GEOMAlgo_DataMapOfOrientedShapeShape& Other); Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape(const GEOMAlgo_DataMapOfOrientedShapeShape& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

49
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile #ifndef _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
#define _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile #define _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class GEOMAlgo_PassKey; class GEOMAlgo_PassKey;
@ -42,7 +42,6 @@ class GEOMAlgo_PassKeyMapHasher;
class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger; class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger;
class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger; class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -50,6 +49,7 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfPassKeyInteger : public TCollection_BasicMap { class GEOMAlgo_DataMapOfPassKeyInteger : public TCollection_BasicMap {
@ -67,91 +67,56 @@ public:
{ {
if (anAddress) Standard::Free((Standard_Address&)anAddress); if (anAddress) Standard::Free((Standard_Address&)anAddress);
} }
// Methods PUBLIC // Methods PUBLIC
// //
Standard_EXPORT GEOMAlgo_DataMapOfPassKeyInteger(const Standard_Integer NbBuckets = 1); Standard_EXPORT GEOMAlgo_DataMapOfPassKeyInteger(const Standard_Integer NbBuckets = 1);
Standard_EXPORT GEOMAlgo_DataMapOfPassKeyInteger& Assign(const GEOMAlgo_DataMapOfPassKeyInteger& Other) ; Standard_EXPORT GEOMAlgo_DataMapOfPassKeyInteger& Assign(const GEOMAlgo_DataMapOfPassKeyInteger& Other) ;
GEOMAlgo_DataMapOfPassKeyInteger& operator =(const GEOMAlgo_DataMapOfPassKeyInteger& Other) GEOMAlgo_DataMapOfPassKeyInteger& operator =(const GEOMAlgo_DataMapOfPassKeyInteger& Other)
{ {
return Assign(Other); return Assign(Other);
} }
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ; Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ;
Standard_EXPORT void Clear() ; Standard_EXPORT void Clear() ;
~GEOMAlgo_DataMapOfPassKeyInteger() ~GEOMAlgo_DataMapOfPassKeyInteger()
{ {
Clear(); Clear();
} }
Standard_EXPORT Standard_Boolean Bind(const GEOMAlgo_PassKey& K,const Standard_Integer& I) ; Standard_EXPORT Standard_Boolean Bind(const GEOMAlgo_PassKey& K,const Standard_Integer& I) ;
Standard_EXPORT Standard_Boolean IsBound(const GEOMAlgo_PassKey& K) const; Standard_EXPORT Standard_Boolean IsBound(const GEOMAlgo_PassKey& K) const;
Standard_EXPORT Standard_Boolean UnBind(const GEOMAlgo_PassKey& K) ; Standard_EXPORT Standard_Boolean UnBind(const GEOMAlgo_PassKey& K) ;
Standard_EXPORT const Standard_Integer& Find(const GEOMAlgo_PassKey& K) const; Standard_EXPORT const Standard_Integer& Find(const GEOMAlgo_PassKey& K) const;
const Standard_Integer& operator()(const GEOMAlgo_PassKey& K) const const Standard_Integer& operator()(const GEOMAlgo_PassKey& K) const
{ {
return Find(K); return Find(K);
} }
Standard_EXPORT Standard_Integer& ChangeFind(const GEOMAlgo_PassKey& K) ; Standard_EXPORT Standard_Integer& ChangeFind(const GEOMAlgo_PassKey& K) ;
Standard_Integer& operator()(const GEOMAlgo_PassKey& K) Standard_Integer& operator()(const GEOMAlgo_PassKey& K)
{ {
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const GEOMAlgo_PassKey& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const GEOMAlgo_PassKey& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT GEOMAlgo_DataMapOfPassKeyInteger(const GEOMAlgo_DataMapOfPassKeyInteger& Other); Standard_EXPORT GEOMAlgo_DataMapOfPassKeyInteger(const GEOMAlgo_DataMapOfPassKeyInteger& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

49
src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
View File

@ -15,7 +15,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile #ifndef _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
#define _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile #define _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
@ -32,6 +31,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class GEOMAlgo_PassKeyShape; class GEOMAlgo_PassKeyShape;
@ -40,7 +40,6 @@ class GEOMAlgo_PassKeyShapeMapHasher;
class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape; class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape;
class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape; class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -48,6 +47,7 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfPassKeyShapeShape : public TCollection_BasicMap { class GEOMAlgo_DataMapOfPassKeyShapeShape : public TCollection_BasicMap {
@ -65,91 +65,56 @@ public:
{ {
if (anAddress) Standard::Free((Standard_Address&)anAddress); if (anAddress) Standard::Free((Standard_Address&)anAddress);
} }
// Methods PUBLIC // Methods PUBLIC
// //
Standard_EXPORT GEOMAlgo_DataMapOfPassKeyShapeShape(const Standard_Integer NbBuckets = 1); Standard_EXPORT GEOMAlgo_DataMapOfPassKeyShapeShape(const Standard_Integer NbBuckets = 1);
Standard_EXPORT GEOMAlgo_DataMapOfPassKeyShapeShape& Assign(const GEOMAlgo_DataMapOfPassKeyShapeShape& Other) ; Standard_EXPORT GEOMAlgo_DataMapOfPassKeyShapeShape& Assign(const GEOMAlgo_DataMapOfPassKeyShapeShape& Other) ;
GEOMAlgo_DataMapOfPassKeyShapeShape& operator =(const GEOMAlgo_DataMapOfPassKeyShapeShape& Other) GEOMAlgo_DataMapOfPassKeyShapeShape& operator =(const GEOMAlgo_DataMapOfPassKeyShapeShape& Other)
{ {
return Assign(Other); return Assign(Other);
} }
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ; Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ;
Standard_EXPORT void Clear() ; Standard_EXPORT void Clear() ;
~GEOMAlgo_DataMapOfPassKeyShapeShape() ~GEOMAlgo_DataMapOfPassKeyShapeShape()
{ {
Clear(); Clear();
} }
Standard_EXPORT Standard_Boolean Bind(const GEOMAlgo_PassKeyShape& K,const TopoDS_Shape& I) ; Standard_EXPORT Standard_Boolean Bind(const GEOMAlgo_PassKeyShape& K,const TopoDS_Shape& I) ;
Standard_EXPORT Standard_Boolean IsBound(const GEOMAlgo_PassKeyShape& K) const; Standard_EXPORT Standard_Boolean IsBound(const GEOMAlgo_PassKeyShape& K) const;
Standard_EXPORT Standard_Boolean UnBind(const GEOMAlgo_PassKeyShape& K) ; Standard_EXPORT Standard_Boolean UnBind(const GEOMAlgo_PassKeyShape& K) ;
Standard_EXPORT const TopoDS_Shape& Find(const GEOMAlgo_PassKeyShape& K) const; Standard_EXPORT const TopoDS_Shape& Find(const GEOMAlgo_PassKeyShape& K) const;
const TopoDS_Shape& operator()(const GEOMAlgo_PassKeyShape& K) const const TopoDS_Shape& operator()(const GEOMAlgo_PassKeyShape& K) const
{ {
return Find(K); return Find(K);
} }
Standard_EXPORT TopoDS_Shape& ChangeFind(const GEOMAlgo_PassKeyShape& K) ; Standard_EXPORT TopoDS_Shape& ChangeFind(const GEOMAlgo_PassKeyShape& K) ;
TopoDS_Shape& operator()(const GEOMAlgo_PassKeyShape& K) TopoDS_Shape& operator()(const GEOMAlgo_PassKeyShape& K)
{ {
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const GEOMAlgo_PassKeyShape& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const GEOMAlgo_PassKeyShape& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT GEOMAlgo_DataMapOfPassKeyShapeShape(const GEOMAlgo_DataMapOfPassKeyShapeShape& Other); Standard_EXPORT GEOMAlgo_DataMapOfPassKeyShapeShape(const GEOMAlgo_DataMapOfPassKeyShapeShape& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

45
src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile #ifndef _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
#define _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile #define _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
@ -38,6 +37,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class TopTools_ListOfShape; class TopTools_ListOfShape;
@ -45,7 +45,6 @@ class TColStd_MapRealHasher;
class GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape; class GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape;
class GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape; class GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -53,6 +52,7 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfRealListOfShape : public TCollection_BasicMap { class GEOMAlgo_DataMapOfRealListOfShape : public TCollection_BasicMap {
@ -83,8 +83,6 @@ Standard_EXPORT GEOMAlgo_DataMapOfRealListOfShape& Assign(const GEOMAlgo_DataM
return Assign(Other); return Assign(Other);
} }
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ; Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ;
@ -94,67 +92,36 @@ Standard_EXPORT void Clear() ;
Clear(); Clear();
} }
Standard_EXPORT Standard_Boolean Bind(const Standard_Real& K,const TopTools_ListOfShape& I) ; Standard_EXPORT Standard_Boolean Bind(const Standard_Real& K,const TopTools_ListOfShape& I) ;
Standard_EXPORT Standard_Boolean IsBound(const Standard_Real& K) const; Standard_EXPORT Standard_Boolean IsBound(const Standard_Real& K) const;
Standard_EXPORT Standard_Boolean UnBind(const Standard_Real& K) ; Standard_EXPORT Standard_Boolean UnBind(const Standard_Real& K) ;
Standard_EXPORT const TopTools_ListOfShape& Find(const Standard_Real& K) const; Standard_EXPORT const TopTools_ListOfShape& Find(const Standard_Real& K) const;
const TopTools_ListOfShape& operator()(const Standard_Real& K) const const TopTools_ListOfShape& operator()(const Standard_Real& K) const
{ {
return Find(K); return Find(K);
} }
Standard_EXPORT TopTools_ListOfShape& ChangeFind(const Standard_Real& K) ; Standard_EXPORT TopTools_ListOfShape& ChangeFind(const Standard_Real& K) ;
TopTools_ListOfShape& operator()(const Standard_Real& K) TopTools_ListOfShape& operator()(const Standard_Real& K)
{ {
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const Standard_Real& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const Standard_Real& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT GEOMAlgo_DataMapOfRealListOfShape(const GEOMAlgo_DataMapOfRealListOfShape& Other); Standard_EXPORT GEOMAlgo_DataMapOfRealListOfShape(const GEOMAlgo_DataMapOfRealListOfShape& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

25
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeMapOfShape.hxx
View File

@ -41,6 +41,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class TopoDS_Shape; class TopoDS_Shape;
@ -49,7 +50,7 @@ class TopTools_ShapeMapHasher;
class GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape; class GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape;
class GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape; class GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape;
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfShapeMapOfShape : public TCollection_BasicMap { class GEOMAlgo_DataMapOfShapeMapOfShape : public TCollection_BasicMap {
public: public:
@ -102,31 +103,17 @@ public:
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const TopoDS_Shape& K);
#endif
protected:
private: private:
Standard_EXPORT GEOMAlgo_DataMapOfShapeMapOfShape(const GEOMAlgo_DataMapOfShapeMapOfShape& Other); Standard_EXPORT GEOMAlgo_DataMapOfShapeMapOfShape(const GEOMAlgo_DataMapOfShapeMapOfShape& Other);
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
#endif #endif

25
src/GEOMAlgo/GEOMAlgo_DataMapOfShapePnt.hxx
View File

@ -41,6 +41,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class TopoDS_Shape; class TopoDS_Shape;
@ -49,7 +50,7 @@ class TopTools_ShapeMapHasher;
class GEOMAlgo_DataMapNodeOfDataMapOfShapePnt; class GEOMAlgo_DataMapNodeOfDataMapOfShapePnt;
class GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt; class GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt;
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfShapePnt : public TCollection_BasicMap { class GEOMAlgo_DataMapOfShapePnt : public TCollection_BasicMap {
public: public:
@ -102,31 +103,17 @@ public:
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const TopoDS_Shape& K);
#endif
protected:
private: private:
Standard_EXPORT GEOMAlgo_DataMapOfShapePnt(const GEOMAlgo_DataMapOfShapePnt& Other); Standard_EXPORT GEOMAlgo_DataMapOfShapePnt(const GEOMAlgo_DataMapOfShapePnt& Other);
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
#endif #endif

26
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_DataMapOfShapeReal_HeaderFile #ifndef _GEOMAlgo_DataMapOfShapeReal_HeaderFile
#define _GEOMAlgo_DataMapOfShapeReal_HeaderFile #define _GEOMAlgo_DataMapOfShapeReal_HeaderFile
@ -38,6 +37,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class TopoDS_Shape; class TopoDS_Shape;
@ -45,7 +45,6 @@ class TopTools_ShapeMapHasher;
class GEOMAlgo_DataMapNodeOfDataMapOfShapeReal; class GEOMAlgo_DataMapNodeOfDataMapOfShapeReal;
class GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal; class GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -53,6 +52,7 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfShapeReal : public TCollection_BasicMap { class GEOMAlgo_DataMapOfShapeReal : public TCollection_BasicMap {
@ -119,20 +119,10 @@ Standard_EXPORT Standard_Real& ChangeFind(const TopoDS_Shape& K) ;
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const TopoDS_Shape& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
@ -149,10 +139,6 @@ Standard_EXPORT GEOMAlgo_DataMapOfShapeReal(const GEOMAlgo_DataMapOfShapeReal& O
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //

7
src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
View File

@ -50,6 +50,8 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_DataMapOfShapeShapeSet : public TCollection_BasicMap { class GEOMAlgo_DataMapOfShapeShapeSet : public TCollection_BasicMap {
public: public:
@ -102,6 +104,11 @@ public:
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const TopoDS_Shape& K);
#endif
private: private:
Standard_EXPORT GEOMAlgo_DataMapOfShapeShapeSet(const GEOMAlgo_DataMapOfShapeShapeSet& Other); Standard_EXPORT GEOMAlgo_DataMapOfShapeShapeSet(const GEOMAlgo_DataMapOfShapeShapeSet& Other);
}; };

55
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile #ifndef _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
#define _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile #define _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -42,7 +42,6 @@ class TopoDS_Shape;
class TColStd_MapIntegerHasher; class TColStd_MapIntegerHasher;
class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape; class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -50,6 +49,7 @@ class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_IndexedDataMapOfIntegerShape : public TCollection_BasicMap { class GEOMAlgo_IndexedDataMapOfIntegerShape : public TCollection_BasicMap {
@ -67,106 +67,65 @@ public:
{ {
if (anAddress) Standard::Free((Standard_Address&)anAddress); if (anAddress) Standard::Free((Standard_Address&)anAddress);
} }
// Methods PUBLIC // Methods PUBLIC
// //
Standard_EXPORT GEOMAlgo_IndexedDataMapOfIntegerShape(const Standard_Integer NbBuckets = 1); Standard_EXPORT GEOMAlgo_IndexedDataMapOfIntegerShape(const Standard_Integer NbBuckets = 1);
Standard_EXPORT GEOMAlgo_IndexedDataMapOfIntegerShape& Assign(const GEOMAlgo_IndexedDataMapOfIntegerShape& Other) ; Standard_EXPORT GEOMAlgo_IndexedDataMapOfIntegerShape& Assign(const GEOMAlgo_IndexedDataMapOfIntegerShape& Other) ;
GEOMAlgo_IndexedDataMapOfIntegerShape& operator =(const GEOMAlgo_IndexedDataMapOfIntegerShape& Other) GEOMAlgo_IndexedDataMapOfIntegerShape& operator =(const GEOMAlgo_IndexedDataMapOfIntegerShape& Other)
{ {
return Assign(Other); return Assign(Other);
} }
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ; Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ;
Standard_EXPORT void Clear() ; Standard_EXPORT void Clear() ;
~GEOMAlgo_IndexedDataMapOfIntegerShape() ~GEOMAlgo_IndexedDataMapOfIntegerShape()
{ {
Clear(); Clear();
} }
Standard_EXPORT Standard_Integer Add(const Standard_Integer& K,const TopoDS_Shape& I) ; Standard_EXPORT Standard_Integer Add(const Standard_Integer& K,const TopoDS_Shape& I) ;
Standard_EXPORT void Substitute(const Standard_Integer I,const Standard_Integer& K,const TopoDS_Shape& T) ; Standard_EXPORT void Substitute(const Standard_Integer I,const Standard_Integer& K,const TopoDS_Shape& T) ;
Standard_EXPORT void RemoveLast() ; Standard_EXPORT void RemoveLast() ;
Standard_EXPORT Standard_Boolean Contains(const Standard_Integer& K) const; Standard_EXPORT Standard_Boolean Contains(const Standard_Integer& K) const;
Standard_EXPORT const Standard_Integer& FindKey(const Standard_Integer I) const; Standard_EXPORT const Standard_Integer& FindKey(const Standard_Integer I) const;
Standard_EXPORT const TopoDS_Shape& FindFromIndex(const Standard_Integer I) const; Standard_EXPORT const TopoDS_Shape& FindFromIndex(const Standard_Integer I) const;
const TopoDS_Shape& operator ()(const Standard_Integer I) const const TopoDS_Shape& operator ()(const Standard_Integer I) const
{ {
return FindFromIndex(I); return FindFromIndex(I);
} }
Standard_EXPORT TopoDS_Shape& ChangeFromIndex(const Standard_Integer I) ; Standard_EXPORT TopoDS_Shape& ChangeFromIndex(const Standard_Integer I) ;
TopoDS_Shape& operator ()(const Standard_Integer I) TopoDS_Shape& operator ()(const Standard_Integer I)
{ {
return ChangeFromIndex(I); return ChangeFromIndex(I);
} }
Standard_EXPORT Standard_Integer FindIndex(const Standard_Integer& K) const; Standard_EXPORT Standard_Integer FindIndex(const Standard_Integer& K) const;
Standard_EXPORT const TopoDS_Shape& FindFromKey(const Standard_Integer& K) const; Standard_EXPORT const TopoDS_Shape& FindFromKey(const Standard_Integer& K) const;
Standard_EXPORT TopoDS_Shape& ChangeFromKey(const Standard_Integer& K) ; Standard_EXPORT TopoDS_Shape& ChangeFromKey(const Standard_Integer& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const Standard_Integer& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const Standard_Integer& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT GEOMAlgo_IndexedDataMapOfIntegerShape(const GEOMAlgo_IndexedDataMapOfIntegerShape& Other); Standard_EXPORT GEOMAlgo_IndexedDataMapOfIntegerShape(const GEOMAlgo_IndexedDataMapOfIntegerShape& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

7
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile
#define _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile #define _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile
@ -51,6 +50,8 @@ class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_IndexedDataMapOfPassKeyListOfShape : public TCollection_BasicMap { class GEOMAlgo_IndexedDataMapOfPassKeyListOfShape : public TCollection_BasicMap {
public: public:
@ -104,6 +105,10 @@ Standard_EXPORT Standard_Integer FindIndex(const GEOMAlgo_PassKey& K) const;
Standard_EXPORT const TopTools_ListOfShape& FindFromKey(const GEOMAlgo_PassKey& K) const; Standard_EXPORT const TopTools_ListOfShape& FindFromKey(const GEOMAlgo_PassKey& K) const;
Standard_EXPORT TopTools_ListOfShape& ChangeFromKey(const GEOMAlgo_PassKey& K) ; Standard_EXPORT TopTools_ListOfShape& ChangeFromKey(const GEOMAlgo_PassKey& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const GEOMAlgo_PassKey& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const GEOMAlgo_PassKey& K);
#endif

9
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
#define _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile #define _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
@ -51,6 +50,7 @@ class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape : public TCollection_BasicMap { class GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape : public TCollection_BasicMap {
@ -133,9 +133,10 @@ Standard_EXPORT const TopTools_ListOfShape& FindFromKey(const GEOMAlgo_PassKeyS
Standard_EXPORT TopTools_ListOfShape& ChangeFromKey(const GEOMAlgo_PassKeyShape& K) ; Standard_EXPORT TopTools_ListOfShape& ChangeFromKey(const GEOMAlgo_PassKeyShape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const GEOMAlgo_PassKeyShape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const GEOMAlgo_PassKeyShape& K);
#endif
protected: protected:

11
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile #ifndef _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
#define _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile #define _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile
@ -51,6 +50,7 @@ class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_IndexedDataMapOfShapeBox : public TCollection_BasicMap { class GEOMAlgo_IndexedDataMapOfShapeBox : public TCollection_BasicMap {
@ -129,13 +129,12 @@ Standard_EXPORT Standard_Integer FindIndex(const TopoDS_Shape& K) const;
Standard_EXPORT const Bnd_Box& FindFromKey(const TopoDS_Shape& K) const; Standard_EXPORT const Bnd_Box& FindFromKey(const TopoDS_Shape& K) const;
Standard_EXPORT Bnd_Box& ChangeFromKey(const TopoDS_Shape& K) ; Standard_EXPORT Bnd_Box& ChangeFromKey(const TopoDS_Shape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const TopoDS_Shape& K);
#endif
protected: protected:

9
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
View File

@ -15,7 +15,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile #ifndef _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
#define _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile #define _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
@ -48,6 +47,7 @@ class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_IndexedDataMapOfShapeShapeInfo : public TCollection_BasicMap { class GEOMAlgo_IndexedDataMapOfShapeShapeInfo : public TCollection_BasicMap {
@ -130,9 +130,10 @@ Standard_EXPORT const GEOMAlgo_ShapeInfo& FindFromKey(const TopoDS_Shape& K) co
Standard_EXPORT GEOMAlgo_ShapeInfo& ChangeFromKey(const TopoDS_Shape& K) ; Standard_EXPORT GEOMAlgo_ShapeInfo& ChangeFromKey(const TopoDS_Shape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const TopoDS_Shape& K);
#endif
protected: protected:

11
src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
#define _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile #define _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
@ -53,6 +52,7 @@ class GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class GEOMAlgo_IndexedDataMapOfShapeState : public TCollection_BasicMap { class GEOMAlgo_IndexedDataMapOfShapeState : public TCollection_BasicMap {
@ -131,13 +131,12 @@ Standard_EXPORT Standard_Integer FindIndex(const TopoDS_Shape& K) const;
Standard_EXPORT const TopAbs_State& FindFromKey(const TopoDS_Shape& K) const; Standard_EXPORT const TopAbs_State& FindFromKey(const TopoDS_Shape& K) const;
Standard_EXPORT TopAbs_State& ChangeFromKey(const TopoDS_Shape& K) ; Standard_EXPORT TopAbs_State& ChangeFromKey(const TopoDS_Shape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const TopoDS_Shape& K);
#endif
protected: protected:

102
src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
View File

@ -15,7 +15,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile #ifndef _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
#define _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile #define _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
@ -32,6 +31,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class TColStd_MapOfInteger; class TColStd_MapOfInteger;
@ -39,7 +39,6 @@ class TColStd_MapIntegerHasher;
class NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger; class NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger;
class NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger; class NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -47,108 +46,69 @@ class NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTDS_DataMapOfIntegerMapOfInteger : public TCollection_BasicMap { class NMTDS_DataMapOfIntegerMapOfInteger : public TCollection_BasicMap
{
public: public:
void* operator new(size_t,void* anAddress) void* operator new(size_t,void* anAddress)
{ { return anAddress; }
return anAddress;
}
void* operator new(size_t size) void* operator new(size_t size)
{ { return Standard::Allocate(size); }
return Standard::Allocate(size);
}
void operator delete(void *anAddress) void operator delete(void *anAddress)
{ { if (anAddress) Standard::Free((Standard_Address&)anAddress); }
if (anAddress) Standard::Free((Standard_Address&)anAddress);
}
// Methods PUBLIC // Methods PUBLIC
// //
Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger(const Standard_Integer NbBuckets = 1);
Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger(const Standard_Integer NbBuckets = 1); Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger& Assign(const NMTDS_DataMapOfIntegerMapOfInteger& Other);
Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger& Assign(const NMTDS_DataMapOfIntegerMapOfInteger& Other) ;
NMTDS_DataMapOfIntegerMapOfInteger& operator =(const NMTDS_DataMapOfIntegerMapOfInteger& Other) NMTDS_DataMapOfIntegerMapOfInteger& operator =(const NMTDS_DataMapOfIntegerMapOfInteger& Other)
{ {
return Assign(Other); return Assign(Other);
} }
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets);
Standard_EXPORT void Clear();
Standard_EXPORT void ReSize(const Standard_Integer NbBuckets) ; ~NMTDS_DataMapOfIntegerMapOfInteger()
{
Standard_EXPORT void Clear() ;
~NMTDS_DataMapOfIntegerMapOfInteger()
{
Clear(); Clear();
} }
Standard_EXPORT Standard_Boolean Bind (const Standard_Integer& K,const TColStd_MapOfInteger& I);
Standard_EXPORT Standard_Boolean IsBound (const Standard_Integer& K) const;
Standard_EXPORT Standard_Boolean UnBind (const Standard_Integer& K);
Standard_EXPORT const TColStd_MapOfInteger& Find (const Standard_Integer& K) const;
Standard_EXPORT Standard_Boolean Bind(const Standard_Integer& K,const TColStd_MapOfInteger& I) ;
Standard_EXPORT Standard_Boolean IsBound(const Standard_Integer& K) const;
Standard_EXPORT Standard_Boolean UnBind(const Standard_Integer& K) ;
Standard_EXPORT const TColStd_MapOfInteger& Find(const Standard_Integer& K) const;
const TColStd_MapOfInteger& operator()(const Standard_Integer& K) const const TColStd_MapOfInteger& operator()(const Standard_Integer& K) const
{ {
return Find(K); return Find(K);
} }
Standard_EXPORT TColStd_MapOfInteger& ChangeFind(const Standard_Integer& K);
Standard_EXPORT TColStd_MapOfInteger& ChangeFind(const Standard_Integer& K) ;
TColStd_MapOfInteger& operator()(const Standard_Integer& K) TColStd_MapOfInteger& operator()(const Standard_Integer& K)
{ {
return ChangeFind(K); return ChangeFind(K);
} }
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const Standard_Integer& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const Standard_Integer& K);
#endif
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger(const NMTDS_DataMapOfIntegerMapOfInteger& Other);
Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger(const NMTDS_DataMapOfIntegerMapOfInteger& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

32
src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile #ifndef _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
#define _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile #define _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -42,7 +42,6 @@ class BooleanOperations_IndexedDataMapOfShapeInteger;
class TColStd_MapIntegerHasher; class TColStd_MapIntegerHasher;
class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger; class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -50,6 +49,7 @@ class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInte
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger : public TCollection_BasicMap { class NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger : public TCollection_BasicMap {
@ -132,41 +132,21 @@ Standard_EXPORT const BooleanOperations_IndexedDataMapOfShapeInteger& FindFromK
Standard_EXPORT BooleanOperations_IndexedDataMapOfShapeInteger& ChangeFromKey(const Standard_Integer& K) ; Standard_EXPORT BooleanOperations_IndexedDataMapOfShapeInteger& ChangeFromKey(const Standard_Integer& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const Standard_Integer& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const Standard_Integer& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger(const NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger& Other); Standard_EXPORT NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger(const NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

21
src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile #ifndef _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
#define _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile #define _NMTDS_IndexedDataMapOfIntegerShape_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -42,7 +42,6 @@ class TopoDS_Shape;
class TColStd_MapIntegerHasher; class TColStd_MapIntegerHasher;
class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape; class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -50,6 +49,7 @@ class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTDS_IndexedDataMapOfIntegerShape : public TCollection_BasicMap { class NMTDS_IndexedDataMapOfIntegerShape : public TCollection_BasicMap {
@ -132,19 +132,10 @@ Standard_EXPORT const TopoDS_Shape& FindFromKey(const Standard_Integer& K) cons
Standard_EXPORT TopoDS_Shape& ChangeFromKey(const Standard_Integer& K) ; Standard_EXPORT TopoDS_Shape& ChangeFromKey(const Standard_Integer& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const Standard_Integer& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const Standard_Integer& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:

32
src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
View File

@ -15,7 +15,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile #ifndef _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
#define _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile #define _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
@ -32,6 +31,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -40,7 +40,6 @@ class NMTDS_BndSphere;
class TopTools_ShapeMapHasher; class TopTools_ShapeMapHasher;
class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere; class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -48,6 +47,7 @@ class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTDS_IndexedDataMapOfShapeBndSphere : public TCollection_BasicMap { class NMTDS_IndexedDataMapOfShapeBndSphere : public TCollection_BasicMap {
@ -130,41 +130,21 @@ Standard_EXPORT const NMTDS_BndSphere& FindFromKey(const TopoDS_Shape& K) const
Standard_EXPORT NMTDS_BndSphere& ChangeFromKey(const TopoDS_Shape& K) ; Standard_EXPORT NMTDS_BndSphere& ChangeFromKey(const TopoDS_Shape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const TopoDS_Shape& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:
// Methods PRIVATE // Methods PRIVATE
// //
Standard_EXPORT NMTDS_IndexedDataMapOfShapeBndSphere(const NMTDS_IndexedDataMapOfShapeBndSphere& Other); Standard_EXPORT NMTDS_IndexedDataMapOfShapeBndSphere(const NMTDS_IndexedDataMapOfShapeBndSphere& Other);
// Fields PRIVATE
//
}; };
// other Inline functions and methods (like "C++: function call" methods) // other Inline functions and methods (like "C++: function call" methods)
// //
#endif #endif

11
src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTDS_IndexedDataMapOfShapeBox_HeaderFile #ifndef _NMTDS_IndexedDataMapOfShapeBox_HeaderFile
#define _NMTDS_IndexedDataMapOfShapeBox_HeaderFile #define _NMTDS_IndexedDataMapOfShapeBox_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -43,7 +43,6 @@ class Bnd_Box;
class TopTools_ShapeMapHasher; class TopTools_ShapeMapHasher;
class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox; class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -51,6 +50,7 @@ class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTDS_IndexedDataMapOfShapeBox : public TCollection_BasicMap { class NMTDS_IndexedDataMapOfShapeBox : public TCollection_BasicMap {
@ -133,9 +133,10 @@ Standard_EXPORT const Bnd_Box& FindFromKey(const TopoDS_Shape& K) const;
Standard_EXPORT Bnd_Box& ChangeFromKey(const TopoDS_Shape& K) ; Standard_EXPORT Bnd_Box& ChangeFromKey(const TopoDS_Shape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const TopoDS_Shape& K);
#endif
protected: protected:

12
src/NMTTools/NMTTools_DataMapOfIntegerFaceInfo.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTTools_DataMapOfIntegerFaceInfo_HeaderFile #ifndef _NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
#define _NMTTools_DataMapOfIntegerFaceInfo_HeaderFile #define _NMTTools_DataMapOfIntegerFaceInfo_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class NMTTools_FaceInfo; class NMTTools_FaceInfo;
@ -42,7 +42,6 @@ class TColStd_MapIntegerHasher;
class NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo; class NMTTools_DataMapNodeOfDataMapOfIntegerFaceInfo;
class NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo; class NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -50,6 +49,7 @@ class NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTTools_DataMapOfIntegerFaceInfo : public TCollection_BasicMap { class NMTTools_DataMapOfIntegerFaceInfo : public TCollection_BasicMap {
@ -116,10 +116,10 @@ Standard_EXPORT NMTTools_FaceInfo& ChangeFind(const Standard_Integer& K) ;
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const Standard_Integer& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const Standard_Integer& K);
#endif
protected: protected:

22
src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile #ifndef _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
#define _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile #define _NMTTools_DataMapOfIntegerListOfPaveBlock_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_NoSuchObject; class Standard_NoSuchObject;
class BOPTools_ListOfPaveBlock; class BOPTools_ListOfPaveBlock;
@ -42,7 +42,6 @@ class TColStd_MapIntegerHasher;
class NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock; class NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock;
class NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock; class NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -50,6 +49,7 @@ class NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTTools_DataMapOfIntegerListOfPaveBlock : public TCollection_BasicMap { class NMTTools_DataMapOfIntegerListOfPaveBlock : public TCollection_BasicMap {
@ -116,20 +116,10 @@ Standard_EXPORT BOPTools_ListOfPaveBlock& ChangeFind(const Standard_Integer& K
return ChangeFind(K); return ChangeFind(K);
} }
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address Find1 (const Standard_Integer& K) const;
Standard_EXPORT Standard_Address ChangeFind1 (const Standard_Integer& K);
#endif
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private: private:

11
src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile #ifndef _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
#define _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile #define _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -42,7 +42,6 @@ class TColStd_IndexedMapOfInteger;
class TColStd_MapIntegerHasher; class TColStd_MapIntegerHasher;
class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger; class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -50,6 +49,7 @@ class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTTools_IndexedDataMapOfIndexedMapOfInteger : public TCollection_BasicMap { class NMTTools_IndexedDataMapOfIndexedMapOfInteger : public TCollection_BasicMap {
@ -132,9 +132,10 @@ Standard_EXPORT const TColStd_IndexedMapOfInteger& FindFromKey(const Standard_I
Standard_EXPORT TColStd_IndexedMapOfInteger& ChangeFromKey(const Standard_Integer& K) ; Standard_EXPORT TColStd_IndexedMapOfInteger& ChangeFromKey(const Standard_Integer& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const Standard_Integer& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const Standard_Integer& K);
#endif
protected: protected:

11
src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile #ifndef _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
#define _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile #define _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -43,7 +43,6 @@ class TopTools_IndexedMapOfShape;
class TopTools_ShapeMapHasher; class TopTools_ShapeMapHasher;
class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape; class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -51,6 +50,7 @@ class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTTools_IndexedDataMapOfShapeIndexedMapOfShape : public TCollection_BasicMap { class NMTTools_IndexedDataMapOfShapeIndexedMapOfShape : public TCollection_BasicMap {
@ -133,9 +133,10 @@ Standard_EXPORT const TopTools_IndexedMapOfShape& FindFromKey(const TopoDS_Shap
Standard_EXPORT TopTools_IndexedMapOfShape& ChangeFromKey(const TopoDS_Shape& K) ; Standard_EXPORT TopTools_IndexedMapOfShape& ChangeFromKey(const TopoDS_Shape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const TopoDS_Shape& K);
#endif
protected: protected:

11
src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile #ifndef _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
#define _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile #define _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile
@ -35,6 +34,7 @@
#ifndef _Standard_Boolean_HeaderFile #ifndef _Standard_Boolean_HeaderFile
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#endif #endif
class Standard_DomainError; class Standard_DomainError;
class Standard_OutOfRange; class Standard_OutOfRange;
class Standard_NoSuchObject; class Standard_NoSuchObject;
@ -43,7 +43,6 @@ class BOPTools_PaveBlock;
class TopTools_ShapeMapHasher; class TopTools_ShapeMapHasher;
class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock; class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock;
#ifndef _Standard_HeaderFile #ifndef _Standard_HeaderFile
#include <Standard.hxx> #include <Standard.hxx>
#endif #endif
@ -51,6 +50,7 @@ class NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#include <Basics_OCCTVersion.hxx>
class NMTTools_IndexedDataMapOfShapePaveBlock : public TCollection_BasicMap { class NMTTools_IndexedDataMapOfShapePaveBlock : public TCollection_BasicMap {
@ -133,9 +133,10 @@ Standard_EXPORT const BOPTools_PaveBlock& FindFromKey(const TopoDS_Shape& K) co
Standard_EXPORT BOPTools_PaveBlock& ChangeFromKey(const TopoDS_Shape& K) ; Standard_EXPORT BOPTools_PaveBlock& ChangeFromKey(const TopoDS_Shape& K) ;
#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
Standard_EXPORT Standard_Address FindFromKey1 (const TopoDS_Shape& K) const;
Standard_EXPORT Standard_Address ChangeFromKey1 (const TopoDS_Shape& K);
#endif
protected: protected: