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=5bd9b9c14476db90d122ac265088b584205e1460;hb=6472eab132825fec572beda8276947593f85ffa1;hpb=f5016d85b7b4b88623723027a1585c6414c4dc66 diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index 5bd9b9c14..7549d2431 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -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 WNT +#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,14 +124,15 @@ 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); - SMESH_ComputeErrorPtr GMFToMesh(const char* theFileName); + SMESH_ComputeErrorPtr GMFToMesh(const char* theFileName, + 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 @@ -143,8 +150,22 @@ public: int GetHypotheses(const TopoDS_Shape & aSubShape, const SMESH_HypoFilter& aFilter, - std::list & aHypList, - const bool andAncestors) const; + std::list< const SMESHDS_Hypothesis * >& aHypList, + 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); @@ -154,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; } @@ -178,22 +201,22 @@ public: */ void NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* theChangedHyp); - const std::list < SMESH_subMesh * >& - GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp) throw(SALOME_Exception); + // const std::list < SMESH_subMesh * >& + // GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp) throw(SALOME_Exception); /*! * \brief Return True if anHyp is used to mesh aSubShape */ 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; @@ -216,6 +239,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 */ @@ -227,11 +255,15 @@ public: */ bool HasDuplicatedGroupNamesMED(); - void ExportMED(const char *file, - const char* theMeshName = NULL, - bool theAutoGroups = true, - int theVersion = 0, - const SMESHDS_Mesh* meshPart = 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, + double theZTolerance = -1., + bool theAllElemsToGroup = false) throw(SALOME_Exception); void ExportDAT(const char * file, @@ -240,58 +272,56 @@ 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); + const SMESHDS_Mesh* mesh, + bool withRequiredGroups = true ); void ExportSAUV(const char *file, const char* theMeshName = NULL, bool theAutoGroups = true) throw(SALOME_Exception); + + double GetComputeProgress() const; int NbNodes() const throw(SALOME_Exception); - int Nb0DElements() const throw(SALOME_Exception); + int NbBalls() const throw(SALOME_Exception); int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); 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 NbPolygons() const throw(SALOME_Exception); + int NbBiQuadTriangles() 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); - 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 NbQuadPrisms() const throw(SALOME_Exception); + int NbBiQuadPrisms() const throw(SALOME_Exception); int NbHexagonalPrisms() const throw(SALOME_Exception); - int NbPolyhedrons() const throw(SALOME_Exception); - int NbBalls() const throw(SALOME_Exception); - int NbSubMesh() const throw(SALOME_Exception); 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); @@ -300,7 +330,7 @@ public: std::list GetGroupIds() const; - SMESH_Group* GetGroup (const int theGroupID); + SMESH_Group* GetGroup (const int theGroupID) const; bool RemoveGroup (const int theGroupID); @@ -308,9 +338,10 @@ 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 ~TCallUp() {} }; void SetCallUp( TCallUp * upCaller ); @@ -325,33 +356,32 @@ public: const TListOfListOfInt& GetMeshOrder() const; // sort submeshes according to stored mesh order - bool SortByMeshOrder(std::list& theListToSort) const; + bool SortByMeshOrder(std::vector& theListToSort) const; // return true if given order of sub-meshes is OK bool IsOrderOK( const SMESH_subMesh* smBefore, const SMESH_subMesh* smAfter ) const; - ostream& Dump(ostream & save); + std::ostream& Dump(std::ostream & save); private: void fillAncestorsMap(const TopoDS_Shape& theShape); - std::list getAncestorsSubMeshes - (const TopoDS_Shape& theSubShape) const; + void getAncestorsSubMeshes(const TopoDS_Shape& theSubShape, + std::vector< SMESH_subMesh* >& theSubMeshes) const; protected: 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 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; - std::map _mapSubMesh; - std::map _mapGroup; + std::map _mapGroup; + + class SubMeshHolder; + SubMeshHolder* _subMeshHolder; bool _isAutoColor; bool _isModified; //!< modified since last total re-compute, issue 0020693 @@ -360,11 +390,13 @@ protected: TopTools_IndexedDataMapOfShapeListOfShape _mapAncestors; + mutable std::vector _ancestorSubMeshes; // to speed up GetHypothes[ei]s() + TListOfListOfInt _mySubMeshOrder; // Struct calling methods at CORBA API implementation level, used to - // 1) make an upper level be consistent with a lower one when group removal - // is invoked by hyp modification (issue 0020918) + // 1) make an upper level (SMESH_I) be consistent with a lower one (SMESH) + // when group removal is invoked by hyp modification (issue 0020918) // 2) to forget not loaded mesh data at hyp modification TCallUp* _callUp;