X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshElementIDFactory.hxx;h=526bcb5a051e773eee12cfe94c3a563a264ce9b4;hp=932ad057cd715fc64e10ec9f9442ddbfdd889699;hb=2387bfa403855b82751bf9f122295b1fc6923a18;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f

diff --git a/src/SMDS/SMDS_MeshElementIDFactory.hxx b/src/SMDS/SMDS_MeshElementIDFactory.hxx
index 932ad057c..526bcb5a0 100644
--- a/src/SMDS/SMDS_MeshElementIDFactory.hxx
+++ b/src/SMDS/SMDS_MeshElementIDFactory.hxx
@@ -28,26 +28,35 @@
 #define _SMDS_MeshElementIDFactory_HeaderFile
 
 #include "SMDS_MeshIDFactory.hxx"
+#include "SMDS_ElemIterator.hxx"
 
-#include <map>
+#include <NCollection_DataMap.hxx>
 
 class SMDS_MeshElement;
 
-typedef std::map<int, SMDS_MeshElement *> SMDS_IdElementMap;
+typedef NCollection_DataMap<int, SMDS_MeshElement *> SMDS_IdElementMap;
 
 class SMDS_MeshElementIDFactory:public SMDS_MeshIDFactory
 {
-  public:
-	SMDS_MeshElementIDFactory();
-	bool BindID(int ID, SMDS_MeshElement * elem);
-	SMDS_MeshElement * MeshElement(int ID);
-	virtual int GetFreeID();
-	virtual void ReleaseID(int ID);
-	int GetMaxID() const;
-	int GetMinID() const;
-        const SMDS_IdElementMap & GetIdElementMap() const { return myIDElements; }
-  private:
-	SMDS_IdElementMap myIDElements;
+public:
+  SMDS_MeshElementIDFactory();
+  bool BindID(int ID, SMDS_MeshElement * elem);
+  SMDS_MeshElement * MeshElement(int ID);
+  virtual int GetFreeID();
+  virtual void ReleaseID(int ID);
+  int GetMaxID() const;
+  int GetMinID() const;
+  SMDS_ElemIteratorPtr elementsIterator() const;
+private:
+  void updateMinMax() const;
+  void updateMinMax(int id) const
+  {
+    if (id > myMax) myMax = id;
+    if (id < myMin) myMin = id;
+  }
+
+  SMDS_IdElementMap myIDElements;
+  mutable int myMin, myMax;
 
 };