X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=18c11c894a6b61c1b43fade9ef5f96f87a3d620e;hb=d245f797f1b69aca678fa372391275d7042faa10;hp=84086a3ea730fb50cde1542afe500adbdea0ac8f;hpb=a3ee66b0371b361bf97d6261c61a35995b4595bb;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index 84086a3ea..18c11c894 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -30,32 +30,36 @@ #include "SMESH_SMESH.hxx" #include "SMDSAbs_ElementType.hxx" -#include "SMESHDS_Command.hxx" -#include "SMESHDS_Mesh.hxx" #include "SMESH_ComputeError.hxx" #include "SMESH_Controls.hxx" #include "SMESH_Hypothesis.hxx" +#include "SMDS_Iterator.hxx" #include "Utils_SALOME_Exception.hxx" #include #include +#include #include #include - +#include +#include #ifdef WIN32 #pragma warning(disable:4251) // Warning DLL Interface ... #pragma warning(disable:4290) // Warning Exception ... #endif -class SMESH_Gen; +class SMESHDS_Command; class SMESHDS_Document; +class SMESHDS_GroupBase; +class SMESHDS_Hypothesis; +class SMESHDS_Mesh; +class SMESH_Gen; class SMESH_Group; -class TopTools_ListOfShape; -class SMESH_subMesh; class SMESH_HypoFilter; +class SMESH_subMesh; class TopoDS_Solid; typedef std::list TListOfInt; @@ -63,15 +67,14 @@ typedef std::list TListOfListOfInt; class SMESH_EXPORT SMESH_Mesh { -public: - SMESH_Mesh(int theLocalId, - int theStudyId, + public: + SMESH_Mesh(int theLocalId, SMESH_Gen* theGen, bool theIsEmbeddedMode, SMESHDS_Document* theDocument); - + virtual ~SMESH_Mesh(); - + /*! * \brief Set geometry to be meshed */ @@ -84,6 +87,9 @@ public: * \brief Return true if there is a geometry to be meshed, not PseudoShape() */ bool HasShapeToMesh() const { return _isShapeToMesh; } + + void UndefShapeToMesh() { _isShapeToMesh = false; } + /*! * \brief Return diagonal size of bounding box of shape to mesh. */ @@ -118,7 +124,7 @@ public: int MEDToMesh(const char* theFileName, const char* theMeshName); - int STLToMesh(const char* theFileName); + std::string STLToMesh(const char* theFileName); int CGNSToMesh(const char* theFileName, const int theMeshIndex, std::string& theMeshName); @@ -126,7 +132,7 @@ public: bool theMakeRequiredGroups = true ); SMESH_Hypothesis::Hypothesis_Status - AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId) + AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* error=0) throw(SALOME_Exception); SMESH_Hypothesis::Hypothesis_Status @@ -148,6 +154,17 @@ public: const bool andAncestors, std::list< TopoDS_Shape > * assignedTo=0) const; + const SMESH_Hypothesis * GetHypothesis(const SMESH_subMesh * aSubMesh, + const SMESH_HypoFilter& aFilter, + const bool andAncestors, + TopoDS_Shape* assignedTo=0) const; + + int GetHypotheses(const SMESH_subMesh * aSubMesh, + const SMESH_HypoFilter& aFilter, + std::list< const SMESHDS_Hypothesis * >& aHypList, + const bool andAncestors, + std::list< TopoDS_Shape > * assignedTo=0) const; + SMESH_Hypothesis * GetHypothesis(const int aHypID) const; const std::list & GetLog() throw(SALOME_Exception); @@ -158,8 +175,10 @@ public: bool MeshExists( int meshId ) const; + SMESH_Mesh* FindMesh( int meshId ) const; + SMESHDS_Mesh * GetMeshDS() { return _myMeshDS; } - + const SMESHDS_Mesh * GetMeshDS() const { return _myMeshDS; } SMESH_Gen *GetGen() { return _gen; } @@ -190,14 +209,17 @@ public: bool IsUsedHypothesis(SMESHDS_Hypothesis * anHyp, const SMESH_subMesh * aSubMesh); /*! - * \brief check if a hypothesis alowing notconform mesh is present + * \brief check if a hypothesis allowing notconform mesh is present */ bool IsNotConformAllowed() const; bool IsMainShape(const TopoDS_Shape& theShape) const; + + TopoDS_Shape GetShapeByEntry(const std::string& entry) const; + /*! * \brief Return list of ancestors of theSubShape in the order - * that lower dimention shapes come first + * that lower dimension shapes come first */ const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const; @@ -220,6 +242,11 @@ public: */ bool HasModificationsToDiscard() const; + /*! + * \brief Return true if all sub-meshes are computed OK - to update an icon + */ + bool IsComputedOK(); + /*! * \brief Return data map of descendant to ancestor shapes */ @@ -231,13 +258,15 @@ public: */ bool HasDuplicatedGroupNamesMED(); - void ExportMED(const char * theFile, - const char* theMeshName = NULL, - bool theAutoGroups = true, - int theVersion = 0, + void ExportMED(const char * theFile, + const char* theMeshName = NULL, + bool theAutoGroups = true, + int theVersion = -1, const SMESHDS_Mesh* theMeshPart = 0, bool theAutoDimension = false, - bool theAddODOnVertices = false) + bool theAddODOnVertices = false, + double theZTolerance = -1., + bool theAllElemsToGroup = false) throw(SALOME_Exception); void ExportDAT(const char * file, @@ -246,9 +275,12 @@ public: const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); void ExportSTL(const char * file, const bool isascii, + const char * name = 0, const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); void ExportCGNS(const char * file, - const SMESHDS_Mesh* mesh); + const SMESHDS_Mesh* mesh, + const char * meshName = 0, + const bool groupElemsByType = false); void ExportGMF(const char * file, const SMESHDS_Mesh* mesh, bool withRequiredGroups = true ); @@ -269,7 +301,7 @@ public: int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); int NbBiQuadQuadrangles() const throw(SALOME_Exception); int NbBiQuadTriangles() const throw(SALOME_Exception); - int NbPolygons() const throw(SALOME_Exception); + int NbPolygons(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); @@ -277,6 +309,8 @@ public: int NbTriQuadraticHexas() const throw(SALOME_Exception); int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbQuadPrisms() const throw(SALOME_Exception); + int NbBiQuadPrisms() const throw(SALOME_Exception); int NbHexagonalPrisms() const throw(SALOME_Exception); int NbPolyhedrons() const throw(SALOME_Exception); @@ -284,11 +318,13 @@ public: int NbGroup() const { return _mapGroup.size(); } + int NbMeshes() const; // nb meshes in the Study + SMESH_Group* AddGroup (const SMDSAbs_ElementType theType, const char* theName, - int& theId, - const TopoDS_Shape& theShape=TopoDS_Shape(), - const SMESH_PredicatePtr& thePredicate=SMESH_PredicatePtr()); + const int theId = -1, + const TopoDS_Shape& theShape = TopoDS_Shape(), + const SMESH_PredicatePtr& thePredicate = SMESH_PredicatePtr()); SMESH_Group* AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exception); @@ -297,7 +333,7 @@ public: std::list GetGroupIds() const; - SMESH_Group* GetGroup (const int theGroupID); + SMESH_Group* GetGroup (const int theGroupID) const; bool RemoveGroup (const int theGroupID); @@ -305,9 +341,11 @@ public: struct TCallUp // callback from SMESH to SMESH_I level { - virtual void RemoveGroup (const int theGroupID)=0; - virtual void HypothesisModified ()=0; - virtual void Load ()=0; + virtual void RemoveGroup( const int theGroupID )=0; + virtual void HypothesisModified( int hypID, bool updateIcons )=0; + virtual void Load()=0; + virtual bool IsLoaded()=0; + virtual TopoDS_Shape GetShapeByEntry(const std::string& entry)=0; virtual ~TCallUp() {} }; void SetCallUp( TCallUp * upCaller ); @@ -328,7 +366,7 @@ public: bool IsOrderOK( const SMESH_subMesh* smBefore, const SMESH_subMesh* smAfter ) const; - ostream& Dump(ostream & save); + std::ostream& Dump(std::ostream & save); private: @@ -338,11 +376,9 @@ private: protected: int _id; // id given by creator (unique within the creator instance) - int _studyId; int _groupId; // id generator for group objects int _nbSubShapes; // initial nb of subshapes in the shape to mesh bool _isShapeToMesh;// set to true when a shape is given (only once) - //std::list _subMeshesUsingHypothesisList; SMESHDS_Document * _myDocument; SMESHDS_Mesh * _myMeshDS; SMESH_Gen * _gen;