Join modifications from branch OCC_development_for_3_2_0a2

[modules/smesh.git] / src / SMESH / SMESH_Mesh.hxx

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index 0ddd8398bf47afb3dd9451f2a5edc524cbce3e40..93802346db6121aba1e624e5e78950af771710b7 100644 (file)
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -37,7 +37,8 @@
 #include "SMESHDS_Command.hxx"
 #include "SMDSAbs_ElementType.hxx"
 
-#include "NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx"
+//#include "NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx"
+#include "SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx"
 
 #include "Utils_SALOME_Exception.hxx"
 
@@ -68,16 +69,21 @@ class SMESH_Gen;
 class SMESH_Group;
 class TopTools_ListOfShape;
 class SMESH_subMesh;
+class SMESH_HypoFilter;
 
-typedef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape IndexedMapOfChain;
+//typedef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape IndexedMapOfChain;
+typedef SMESH_IndexedDataMapOfShapeIndexedMapOfShape IndexedMapOfChain;
 
 class SMESH_Mesh
 {
   SMESH_Mesh();
   SMESH_Mesh(const SMESH_Mesh&);
 public:
-  SMESH_Mesh(int localId, int studyId, SMESH_Gen * gen,
-            SMESHDS_Document * myDocument);
+  SMESH_Mesh(int theLocalId, 
+            int theStudyId, 
+            SMESH_Gen* theGen,
+            bool theIsEmbeddedMode,
+            SMESHDS_Document* theDocument);
   
   virtual ~SMESH_Mesh();
   
@@ -102,7 +108,16 @@ public:
   const list <const SMESHDS_Hypothesis * >&
   GetHypothesisList(const TopoDS_Shape & aSubShape) const
     throw(SALOME_Exception);
-  
+
+  const SMESH_Hypothesis * GetHypothesis(const TopoDS_Shape &    aSubShape,
+                                         const SMESH_HypoFilter& aFilter,
+                                         const bool              andAncestors) const;
+  
+  int GetHypotheses(const TopoDS_Shape &                aSubShape,
+                    const SMESH_HypoFilter&             aFilter,
+                    list <const SMESHDS_Hypothesis * >& aHypList,
+                    const bool                          andAncestors) const;
+
   const list<SMESHDS_Command*> & GetLog() throw(SALOME_Exception);
   
   void ClearLog() throw(SALOME_Exception);
@@ -119,12 +134,18 @@ public:
   SMESH_subMesh *GetSubMeshContaining(const TopoDS_Shape & aSubShape)
     throw(SALOME_Exception);
   
+  SMESH_subMesh *GetSubMeshContaining(const int aShapeID)
+    throw(SALOME_Exception);
+  
+  void NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* theChangedHyp);
+  // Say all submeshes that theChangedHyp has been modified
+
   const list < SMESH_subMesh * >&
   GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp)
     throw(SALOME_Exception);
   
-  bool IsUsedHypothesis(SMESHDS_Hypothesis * anHyp,
-                       const TopoDS_Shape & aSubShape);
+  bool IsUsedHypothesis(SMESHDS_Hypothesis *  anHyp,
+                       const SMESH_subMesh * aSubMesh);
   // Return True if anHyp is used to mesh aSubShape
   
   bool IsNotConformAllowed() const;
@@ -132,10 +153,15 @@ public:
   
   bool IsMainShape(const TopoDS_Shape& theShape) const;
 
-  const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape);
+  const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const;
   // return list of ancestors of theSubShape in the order
   // that lower dimention shapes come first.
-  
+
+  /*! Check group names for duplications.
+   *  Consider maximum group name length stored in MED file.
+   */
+  bool HasDuplicatedGroupNamesMED();
+
   void ExportMED(const char *file, 
                 const char* theMeshName = NULL, 
                 bool theAutoGroups = true, 
@@ -155,6 +181,8 @@ public:
   int NbTriangles() throw(SALOME_Exception);
   
   int NbQuadrangles() throw(SALOME_Exception);
+
+  int NbPolygons() throw(SALOME_Exception);
   
   int NbVolumes() throw(SALOME_Exception);
   
@@ -163,9 +191,11 @@ public:
   int NbHexas() throw(SALOME_Exception);
   
   int NbPyramids() throw(SALOME_Exception);
-  
+
   int NbPrisms() throw(SALOME_Exception);
   
+  int NbPolyhedrons() throw(SALOME_Exception);
+  
   int NbSubMesh() throw(SALOME_Exception);
   
   int NbGroup() const { return _mapGroup.size(); }
@@ -183,8 +213,8 @@ public:
 
   // Propagation hypothesis management
 
-  bool IsLocal1DHypothesis (const TopoDS_Shape& theEdge);
-  // Returns true, if a local 1D hypothesis is set directly on <theEdge>
+  const SMESH_Hypothesis* IsLocal1DHypothesis (const TopoDS_Shape& theEdge);
+  // Returns a local 1D hypothesis used for theEdge.
 
   bool IsPropagationHypothesis (const TopoDS_Shape& theEdge);
   // Returns true, if a local Propagation hypothesis is set directly on <theEdge>
@@ -196,9 +226,16 @@ public:
   // Returns through <theMainEdge> the edge, from
   // which the 1D hypothesis is propagated on <theEdge>
 
+  bool IsReversedInChain (const TopoDS_Shape& theEdge,
+                          const TopoDS_Shape& theMainEdge);
+  // Returns true if theEdge should be reversed to be
+  // co-directed with theMainEdge
+
   bool RebuildPropagationChains();
   bool RemovePropagationChain (const TopoDS_Shape& theMainEdge);
   bool BuildPropagationChain (const TopoDS_Shape& theMainEdge);
+  
+  SMDSAbs_ElementType GetElementType( const int id, const bool iselem );
 
   //
   
@@ -210,19 +247,17 @@ private:
   //
   
 private:
-  int _id;                                     // id given by creator (unique within the creator instance)
-  int _studyId;
-  int _idDoc;                                  // id given by SMESHDS_Document
-  int _groupId;                                   // id generator for group objects
-  bool _isShapeToMesh;                         // set to true when a shape is given (only once)
-  list<const SMESHDS_Hypothesis *> _subShapeHypothesisList;
-  list <SMESH_subMesh *> _subMeshesUsingHypothesisList;
-  SMESHDS_Document * _myDocument;
-  SMESHDS_Mesh * _myMeshDS;
-  //TopTools_IndexedMapOfShape _subShapes; USE the same map of _myMeshDS
+  int                        _id;           // id given by creator (unique within the creator instance)
+  int                        _studyId;
+  int                        _idDoc;        // id given by SMESHDS_Document
+  int                        _groupId;      // id generator for group objects
+  bool                       _isShapeToMesh;// set to true when a shape is given (only once)
+  list <SMESH_subMesh *>     _subMeshesUsingHypothesisList;
+  SMESHDS_Document *         _myDocument;
+  SMESHDS_Mesh *             _myMeshDS;
   map <int, SMESH_subMesh *> _mapSubMesh;
   map <int, SMESH_Group *>   _mapGroup;
-  SMESH_Gen *_gen;
+  SMESH_Gen *                _gen;
   
   TopTools_IndexedDataMapOfShapeListOfShape _mapAncestors;