X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=49611f659d2d1a00d85f4100f89c411b25ad6017;hp=158788613f0b61d911b09f6d7e9bc57c7a69de10;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hpb=264eeb2edd6977ccf2d2bd88cbb210353f63f7c9 diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index 158788613..49611f659 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 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 @@ -44,6 +44,7 @@ #include #include #include +#include #ifdef WIN32 #pragma warning(disable:4251) // Warning DLL Interface ... @@ -86,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. */ @@ -128,16 +132,13 @@ class SMESH_EXPORT SMESH_Mesh bool theMakeRequiredGroups = true ); SMESH_Hypothesis::Hypothesis_Status - AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* error=0) - throw(SALOME_Exception); + AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* error=0); SMESH_Hypothesis::Hypothesis_Status - RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId) - throw(SALOME_Exception); + RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId); const std::list & - GetHypothesisList(const TopoDS_Shape & aSubShape) const - throw(SALOME_Exception); + GetHypothesisList(const TopoDS_Shape & aSubShape) const; const SMESH_Hypothesis * GetHypothesis(const TopoDS_Shape & aSubShape, const SMESH_HypoFilter& aFilter, @@ -163,9 +164,9 @@ class SMESH_EXPORT SMESH_Mesh SMESH_Hypothesis * GetHypothesis(const int aHypID) const; - const std::list & GetLog() throw(SALOME_Exception); + const std::list & GetLog(); - void ClearLog() throw(SALOME_Exception); + void ClearLog(); int GetId() const { return _id; } @@ -179,19 +180,15 @@ class SMESH_EXPORT SMESH_Mesh SMESH_Gen *GetGen() { return _gen; } - SMESH_subMesh *GetSubMesh(const TopoDS_Shape & aSubShape) - throw(SALOME_Exception); + SMESH_subMesh *GetSubMesh(const TopoDS_Shape & aSubShape); - SMESH_subMesh *GetSubMeshContaining(const TopoDS_Shape & aSubShape) const - throw(SALOME_Exception); + SMESH_subMesh *GetSubMeshContaining(const TopoDS_Shape & aSubShape) const; - SMESH_subMesh *GetSubMeshContaining(const int aShapeID) const - throw(SALOME_Exception); + SMESH_subMesh *GetSubMeshContaining(const int aShapeID) const; /*! * \brief Return submeshes of groups containing the given subshape */ - std::list GetGroupSubMeshesContaining(const TopoDS_Shape & shape) const - throw(SALOME_Exception); + std::list GetGroupSubMeshesContaining(const TopoDS_Shape & shape) const; /*! * \brief Say all submeshes that theChangedHyp has been modified */ @@ -210,15 +207,18 @@ class SMESH_EXPORT SMESH_Mesh 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 dimension shapes come first */ const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const; - void SetAutoColor(bool theAutoColor) throw(SALOME_Exception); + void SetAutoColor(bool theAutoColor); - bool GetAutoColor() throw(SALOME_Exception); + bool GetAutoColor(); /*! * \brief Set the flag meaning that the mesh has been edited "manually". @@ -235,6 +235,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 */ @@ -246,59 +251,62 @@ 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 theAllElemsToGroup = false) - throw(SALOME_Exception); + double theZTolerance = -1., + bool theAllElemsToGroup = false); void ExportDAT(const char * file, - const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + const SMESHDS_Mesh* meshPart = 0); void ExportUNV(const char * file, - const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + const SMESHDS_Mesh* meshPart = 0); void ExportSTL(const char * file, const bool isascii, const char * name = 0, - const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + const SMESHDS_Mesh* meshPart = 0); void ExportCGNS(const char * file, const SMESHDS_Mesh* mesh, - const char * meshName = 0); + const char * meshName = 0, + const bool groupElemsByType = false); void ExportGMF(const char * file, const SMESHDS_Mesh* mesh, bool withRequiredGroups = true ); void ExportSAUV(const char *file, const char* theMeshName = NULL, - bool theAutoGroups = true) throw(SALOME_Exception); + bool theAutoGroups = true); double GetComputeProgress() const; - int NbNodes() const throw(SALOME_Exception); - int Nb0DElements() const throw(SALOME_Exception); - int NbBalls() const throw(SALOME_Exception); + int NbNodes() const; + int Nb0DElements() const; + int NbBalls() const; - int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const; - int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - 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(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbBiQuadQuadrangles() const; + int NbBiQuadTriangles() const; + int NbPolygons(SMDSAbs_ElementOrder order = ORDER_ANY) const; - int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); - 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 NbHexagonalPrisms() const throw(SALOME_Exception); - int NbPolyhedrons() const throw(SALOME_Exception); + int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbTriQuadraticHexas() const; + int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbQuadPrisms() const; + int NbBiQuadPrisms() const; + int NbHexagonalPrisms() const; + int NbPolyhedrons() const; - int NbSubMesh() const throw(SALOME_Exception); + int NbSubMesh() const; int NbGroup() const { return _mapGroup.size(); } @@ -306,18 +314,18 @@ class SMESH_EXPORT SMESH_Mesh 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); + SMESH_Group* AddGroup (SMESHDS_GroupBase* groupDS); typedef boost::shared_ptr< SMDS_Iterator > GroupIteratorPtr; GroupIteratorPtr GetGroups() const; std::list GetGroupIds() const; - SMESH_Group* GetGroup (const int theGroupID); + SMESH_Group* GetGroup (const int theGroupID) const; bool RemoveGroup (const int theGroupID); @@ -325,9 +333,11 @@ 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 TopoDS_Shape GetShapeByEntry(const std::string& entry)=0; virtual ~TCallUp() {} }; void SetCallUp( TCallUp * upCaller ); @@ -348,7 +358,7 @@ class SMESH_EXPORT SMESH_Mesh bool IsOrderOK( const SMESH_subMesh* smBefore, const SMESH_subMesh* smAfter ) const; - std::ostream& Dump(ostream & save); + std::ostream& Dump(std::ostream & save); private: