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

diff --git a/src/SMESHDS/SMESHDS_SubMesh.hxx b/src/SMESHDS/SMESHDS_SubMesh.hxx
index 53802ecb4..f416047ac 100644
--- a/src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.hxx
@@ -1,60 +1,75 @@
-//  SMESH SMESHDS : management of mesh data and SMESH document
+//  Copyright (C) 2007-2011  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
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  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 
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
 //
+//  You should have received a copy of the GNU Lesser General Public
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SMESH SMESHDS : management of mesh data and SMESH document
 //  File   : SMESHDS_SubMesh.hxx
 //  Module : SMESH
-
+//
 #ifndef _SMESHDS_SubMesh_HeaderFile
 #define _SMESHDS_SubMesh_HeaderFile
 
+#include "SMESH_SMESHDS.hxx"
+
 #include "SMDS_Mesh.hxx"
-#include <vector>
 #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:
-	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, bool isElemDeleted); // ret true if ME was in
+  void AddNode(const SMDS_MeshNode * ME);
+  bool RemoveNode(const SMDS_MeshNode * ME, bool isNodeDeleted);       // 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
+
+  // clear the contents
+  void Clear();
+
+ private:
+
+  typedef std::set<const SMDS_MeshElement*, TIDCompare > TElemSet;
+  TElemSet myElements, myNodes;
+
+  std::set<const SMESHDS_SubMesh*> mySubMeshes;
 };
 #endif