X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_SubMesh.hxx;h=902b65daf167634a5ac3783ded74983b7d83398c;hb=0fc0831670e27a5611b941c52dc152fd63964515;hp=2caffb10b15b8e91a117f79f85abfaf3701feee2;hpb=b7a7d49664daa32e1befb558280e13ed0bde37c9;p=modules%2Fsmesh.git

diff --git a/src/SMESHDS/SMESHDS_SubMesh.hxx b/src/SMESHDS/SMESHDS_SubMesh.hxx
index 2caffb10b..902b65daf 100644
--- a/src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -29,6 +29,7 @@
 
 #include "SMESH_SMESHDS.hxx"
 
+#include "SMDS_ElementHolder.hxx"
 #include "SMDS_Mesh.hxx"
 #include <vector>
 
@@ -42,10 +43,10 @@ typedef boost::shared_ptr< SMESHDS_SubMeshIterator > SMESHDS_SubMeshIteratorPtr;
 
 class SMESHDS_Mesh;
 
-class SMESHDS_EXPORT SMESHDS_SubMesh
+class SMESHDS_EXPORT SMESHDS_SubMesh : public SMDS_ElementHolder
 {
  public:
-  SMESHDS_SubMesh(SMESHDS_Mesh *parent, int index);
+  SMESHDS_SubMesh(const SMESHDS_Mesh *parent, int index);
   virtual ~SMESHDS_SubMesh();
 
   virtual bool IsComplexSubmesh() const { return !mySubMeshes.empty(); }
@@ -55,8 +56,6 @@ class SMESHDS_EXPORT SMESHDS_SubMesh
   virtual bool RemoveElement(const SMDS_MeshElement * ME); // ret true if ME was in
   virtual void AddNode(const SMDS_MeshNode * ME);
   virtual bool RemoveNode(const SMDS_MeshNode * ME);       // ret true if ME was in
-  //virtual const SMDS_MeshElement* GetElement( size_t idInShape ) const;
-  //virtual const SMDS_MeshNode*    GetNode   ( size_t idInShape ) const;
 
   // if IsComplexSubmesh()
   void AddSubMesh( const SMESHDS_SubMesh* theSubMesh );
@@ -80,13 +79,21 @@ class SMESHDS_EXPORT SMESHDS_SubMesh
   SMESHDS_Mesh* GetParent() const { return const_cast< SMESHDS_Mesh*>( myParent ); }
   int           GetID()     const { return myIndex; }
 
+ protected: // methods of SMDS_ElementHolder
+
+  virtual SMDS_ElemIteratorPtr getElements();
+  virtual void tmpClear();
+  virtual void add( const SMDS_MeshElement* element );
+  virtual void compact() {}
+
  private:
 
-  int             myIndex;
-  int             myNbElements;
-  int             myNbNodes;
-  SMESHDS_Mesh *  myParent;
-  TSubMeshSet     mySubMeshes;
+  int                     myIndex;
+  int                     myNbElements;
+  int                     myNbNodes;
+  const SMDS_MeshElement* my1stElemNode[2]; // elem and node with least ID, to optimize iteration
+  const SMESHDS_Mesh *    myParent;
+  TSubMeshSet             mySubMeshes;
 
 };
 #endif