X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=7549d243118c6fbdfbc1e9ce0e536cb7ba8d953a;hp=d39976736a2b3db9477b4f4500c42c1aaaa73b07;hb=6472eab132825fec572beda8276947593f85ffa1;hpb=6bac08c1a81f34d3f21c550bd92f83654b2546a5 diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index d39976736..7549d2431 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 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; @@ -65,7 +69,6 @@ class SMESH_EXPORT SMESH_Mesh { public: SMESH_Mesh(int theLocalId, - int theStudyId, SMESH_Gen* theGen, bool theIsEmbeddedMode, SMESHDS_Document* theDocument); @@ -84,6 +87,9 @@ class SMESH_EXPORT SMESH_Mesh * \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 @@ class SMESH_EXPORT SMESH_Mesh 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); @@ -169,8 +175,10 @@ class SMESH_EXPORT SMESH_Mesh 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; } @@ -201,14 +209,14 @@ class SMESH_EXPORT SMESH_Mesh 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; /*! * \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; @@ -231,6 +239,11 @@ class SMESH_EXPORT SMESH_Mesh */ 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 */ @@ -242,13 +255,15 @@ class SMESH_EXPORT SMESH_Mesh */ 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, @@ -257,9 +272,12 @@ class SMESH_EXPORT SMESH_Mesh 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 ); @@ -280,7 +298,7 @@ class SMESH_EXPORT SMESH_Mesh 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); @@ -288,6 +306,8 @@ class SMESH_EXPORT SMESH_Mesh 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); @@ -295,11 +315,13 @@ class SMESH_EXPORT SMESH_Mesh 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); @@ -308,7 +330,7 @@ class SMESH_EXPORT SMESH_Mesh std::list GetGroupIds() const; - SMESH_Group* GetGroup (const int theGroupID); + SMESH_Group* GetGroup (const int theGroupID) const; bool RemoveGroup (const int theGroupID); @@ -316,9 +338,10 @@ class SMESH_EXPORT SMESH_Mesh 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 ~TCallUp() {} }; void SetCallUp( TCallUp * upCaller ); @@ -339,7 +362,7 @@ class SMESH_EXPORT SMESH_Mesh bool IsOrderOK( const SMESH_subMesh* smBefore, const SMESH_subMesh* smAfter ) const; - ostream& Dump(ostream & save); + std::ostream& Dump(std::ostream & save); private: @@ -349,11 +372,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;