X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=2864deade7a565b904604cc8e02f82e38d94a2e8;hb=f488d851d8497603ad57ba50438f6423c5f24993;hp=a28a67ea5eb7232056768eea7346c9584c2019ae;hpb=dcab7b2d24224d2d956107e0b8e5a8d8ecdcbea1;p=modules%2Fsmesh.git

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index a28a67ea5..2864deade 100644
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -68,6 +68,7 @@ class SMESH_Gen;
 class SMESH_Group;
 class TopTools_ListOfShape;
 class SMESH_subMesh;
+class SMESH_HypoFilter;
 
 typedef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape IndexedMapOfChain;
 
@@ -102,7 +103,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;
   
+  bool 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);
@@ -132,7 +142,7 @@ 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.
   
@@ -183,8 +193,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>
@@ -215,19 +225,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;