X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_SubMesh.hxx;h=ac3cd1c3f81b79ea618a963aa2ccb5c2983dda37;hb=87fd8ca50b1fe004fc046c66c5b5df6199861981;hp=53802ecb4b6ac68557c070646ab06f898e5707de;hpb=2d46bce2985c40bfac0593abad88d590a8efca48;p=modules%2Fsmesh.git

diff --git a/src/SMESHDS/SMESHDS_SubMesh.hxx b/src/SMESHDS/SMESHDS_SubMesh.hxx
index 53802ecb4..ac3cd1c3f 100644
--- a/src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.hxx
@@ -28,33 +28,42 @@
 #define _SMESHDS_SubMesh_HeaderFile
 
 #include "SMDS_Mesh.hxx"
-#include <vector>
 #include <set>
 
-using namespace std;
+#if defined WNT && defined WIN32 && defined SMESHDS_EXPORTS
+#define SMESHDS_WNT_EXPORT __declspec( dllexport )
+#else
+#define SMESHDS_WNT_EXPORT
+#endif
 
-class SMESHDS_SubMesh
+class SMESHDS_WNT_EXPORT SMESHDS_SubMesh
 {
-  public:
-	SMESHDS_SubMesh(const SMDS_Mesh * M);
-	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;
-	const set<const SMDS_MeshElement*> & GetElements();
-	const vector<int> & GetIDElements();
-	int NbNodes() const;
-	const set<const SMDS_MeshNode*> & GetNodes() const;
-	const vector<int> & GetIDNodes();
-	 ~SMESHDS_SubMesh();
-  private:
-	const SMDS_Mesh * myMesh;
-	set<const SMDS_MeshElement*> myElements;
-	set<const SMDS_MeshNode*> myNodes;
-	bool myListOfEltIDIsUpdate;
-	vector<int> myListOfEltID;
-	bool myListOfNodeIDIsUpdate;
-	vector<int> myListOfNodeID;
+ 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;
+
+  // 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