X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_SubMesh.hxx;h=bc0ccce2a92ddce1f28bbfe2a991e6dd1d9a69dc;hb=64c772da5a9dd285f16f1f7efa07bb4c7fbdd4c3;hp=bda8f04bb48c4a53e78ec0d0c31a52d8d7472228;hpb=f7fbf1c62246f439c35746c731f64dab57391c1b;p=modules%2Fsmesh.git

diff --git a/src/SMESHDS/SMESHDS_SubMesh.hxx b/src/SMESHDS/SMESHDS_SubMesh.hxx
index bda8f04bb..bc0ccce2a 100644
--- a/src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -27,26 +27,45 @@
 #ifndef _SMESHDS_SubMesh_HeaderFile
 #define _SMESHDS_SubMesh_HeaderFile
 
+#include "SMESH_SMESHDS.hxx"
+
 #include "SMDS_Mesh.hxx"
 #include <set>
 
-using namespace std;
+class SMESHDS_SubMesh;
+typedef SMDS_Iterator<const SMESHDS_SubMesh*> SMESHDS_SubMeshIterator;
+typedef boost::shared_ptr< SMESHDS_SubMeshIterator > SMESHDS_SubMeshIteratorPtr;
 
-class SMESHDS_SubMesh
+class SMESHDS_EXPORT SMESHDS_SubMesh
 {
-  public:
-	void AddElement(const SMDS_MeshElement * ME);
-	void RemoveElement(const SMDS_MeshElement * ME);
-	void AddNode(const SMDS_MeshNode * ME);
-	void RemoveNode(const SMDS_MeshNode * ME);
-	int NbElements() const;
-	SMDS_Iterator<const SMDS_MeshElement*> * GetElements() const;
-	int NbNodes() const;
-	SMDS_Iterator<const SMDS_MeshNode*> * GetNodes() const;
-
-  private:
-	const SMDS_Mesh * myMesh;
-	set<const SMDS_MeshElement*> myElements;
-	set<const SMDS_MeshNode*> myNodes;
+ public:
+
+  bool IsComplexSubmesh() const { return !mySubMeshes.empty(); }
+
+  // if !IsComplexSubmesh()
+  void AddElement(const SMDS_MeshElement * ME);
+  bool RemoveElement(const SMDS_MeshElement * ME); // ret true if ME was in
+  void AddNode(const SMDS_MeshNode * ME);
+  bool RemoveNode(const SMDS_MeshNode * ME);       // ret true if ME was in
+
+  // if IsComplexSubmesh()
+  void AddSubMesh( const SMESHDS_SubMesh* theSubMesh );
+  bool RemoveSubMesh( const SMESHDS_SubMesh* theSubMesh );
+  bool ContainsSubMesh( const SMESHDS_SubMesh* theSubMesh ) const;
+  int  NbSubMeshes() const { return mySubMeshes.size(); }
+  SMESHDS_SubMeshIteratorPtr GetSubMeshIterator() const;
+
+  // for both types
+  int NbElements() const;
+  SMDS_ElemIteratorPtr GetElements() const;
+  int NbNodes() const;
+  SMDS_NodeIteratorPtr GetNodes() const;
+  bool Contains(const SMDS_MeshElement * ME) const;      // check if elem or node is in
+
+ private:
+  //const SMDS_Mesh * myMesh;
+  std::set<const SMDS_MeshElement*> myElements;
+  std::set<const SMDS_MeshNode*>    myNodes;
+  std::set<const SMESHDS_SubMesh*>  mySubMeshes;
 };
 #endif