X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=0e6e1aabe9df80b3dbca2a3b406b96da9f04df68;hp=a28a67ea5eb7232056768eea7346c9584c2019ae;hb=104ff7b2818ce4d0f8a38d840abd3e5c70190668;hpb=dcab7b2d24224d2d956107e0b8e5a8d8ecdcbea1 diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index a28a67ea5..0e6e1aabe 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.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 // // // @@ -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 & 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 & aHypList, + const bool andAncestors) const; + const list & 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, @@ -148,23 +174,36 @@ public: int NbNodes() throw(SALOME_Exception); - int NbEdges() throw(SALOME_Exception); + /*! + * ElementOrder points out entities of what order are requested + */ + enum ElementOrder { + ORDER_ANY, /*! entities of any order */ + ORDER_LINEAR, /*! entities of 1st order */ + ORDER_QUADRATIC /*! entities of 2nd order */ + }; + + int NbEdges(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); - int NbFaces() throw(SALOME_Exception); + int NbFaces(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); - int NbTriangles() throw(SALOME_Exception); + int NbTriangles(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); - int NbQuadrangles() throw(SALOME_Exception); + int NbQuadrangles(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); + + int NbPolygons() throw(SALOME_Exception); - int NbVolumes() throw(SALOME_Exception); + int NbVolumes(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); - int NbTetras() throw(SALOME_Exception); + int NbTetras(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); - int NbHexas() throw(SALOME_Exception); + int NbHexas(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); - int NbPyramids() throw(SALOME_Exception); + int NbPyramids(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); + + int NbPrisms(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); - int NbPrisms() throw(SALOME_Exception); + int NbPolyhedrons() throw(SALOME_Exception); int NbSubMesh() throw(SALOME_Exception); @@ -183,8 +222,8 @@ public: // Propagation hypothesis management - bool IsLocal1DHypothesis (const TopoDS_Shape& theEdge); - // Returns true, if a local 1D hypothesis is set directly on + 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 @@ -204,6 +243,8 @@ public: bool RebuildPropagationChains(); bool RemovePropagationChain (const TopoDS_Shape& theMainEdge); bool BuildPropagationChain (const TopoDS_Shape& theMainEdge); + + SMDSAbs_ElementType GetElementType( const int id, const bool iselem ); // @@ -215,19 +256,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 _subShapeHypothesisList; - list _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 _subMeshesUsingHypothesisList; + SMESHDS_Document * _myDocument; + SMESHDS_Mesh * _myMeshDS; map _mapSubMesh; map _mapGroup; - SMESH_Gen *_gen; + SMESH_Gen * _gen; TopTools_IndexedDataMapOfShapeListOfShape _mapAncestors;