X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.hxx;h=b8b98a8a808c734f91d19a67b66d0b81eada2cc7;hb=499f29d24922cec66e41b41a0039a954993bc6df;hp=cb81415e1012ce14fdfd002f9e7cf359b0dabf6e;hpb=e884e4cd7eaad1ea8139d278835c7722a9225176;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx index cb81415e1..b8b98a8a8 100644 --- a/src/SMESH/SMESH_Gen.hxx +++ b/src/SMESH/SMESH_Gen.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2022 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 @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH : implementaion of SMESH idl descriptions +// SMESH SMESH : implementation of SMESH idl descriptions // File : SMESH_Gen.hxx // Author : Paul RASCLE, EDF // Module : SMESH @@ -32,21 +32,23 @@ #include "Utils_SALOME_Exception.hxx" -#include "SMESH_Hypothesis.hxx" -#include "SMESH_ComputeError.hxx" #include "SMESH_Algo.hxx" -#include "SMESH_Mesh.hxx" - -#include "chrono.hxx" - -#include +#include "SMESH_ComputeError.hxx" #include #include +#include #include #include +#include +#include + class SMESHDS_Document; +class SMESH_Algo; +class SMESH_Mesh; +class TopoDS_Shape; +class SMESH_subMesh; typedef SMESH_Hypothesis::Hypothesis_Status TAlgoStateErrorName; @@ -59,37 +61,44 @@ typedef struct studyContextStruct typedef std::set TSetOfInt; -class SMESH_EXPORT SMESH_Gen +class SMESH_EXPORT SMESH_Gen { public: SMESH_Gen(); ~SMESH_Gen(); - SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode) - throw(SALOME_Exception); + SMESH_Mesh* CreateMesh(bool theIsEmbeddedMode); + enum ComputeFlags + { + SHAPE_ONLY = 1, // to ignore algo->OnlyUnaryInput() feature and to compute a given shape only. + UPWARD = 2, // to compute from vertices up to more complex shape (internal usage) + COMPACT_MESH = 4, // to compact the mesh at the end + SHAPE_ONLY_UPWARD = 3 // SHAPE_ONLY | UPWARD + }; /*! * \brief Computes aMesh on aShape - * \param aShapeOnly - if true, algo->OnlyUnaryInput() feature is ignored and - * only \a aShape is computed. - * \param anUpward - compute from vertices up to more complex shape (internal usage) - * \param aDim - upper level dimension of the mesh computation + * \param aMesh - the mesh. + * \param aShape - the shape. + * \param aFlags - ComputeFlags. By default compute the whole mesh and compact at the end. + * \param aDim - upper level dimension of the mesh computation (for preview) * \param aShapesId - list of shapes with computed mesh entities (elements or nodes) - * \retval bool - true if none submesh failed to compute + * \param anAllowedSubShapes - shapes to mesh only. Mesh all if empty or nullptr + * \retval bool - true if none sub-mesh failed to compute */ - bool Compute(::SMESH_Mesh & aMesh, - const TopoDS_Shape & aShape, - const bool aShapeOnly=false, - const bool anUpward=false, - const ::MeshDimension aDim=::MeshDim_3D, - TSetOfInt* aShapesId=0); - -#ifdef WITH_SMESH_CANCEL_COMPUTE + bool Compute(::SMESH_Mesh & aMesh, + const TopoDS_Shape & aShape, + const int aFlags = COMPACT_MESH, + const ::MeshDimension aDim=::MeshDim_3D, + TSetOfInt* aShapesId=0, + TopTools_IndexedMapOfShape* anAllowedSubShapes=0); + void PrepareCompute(::SMESH_Mesh & aMesh, const TopoDS_Shape & aShape); void CancelCompute(::SMESH_Mesh & aMesh, const TopoDS_Shape & aShape); -#endif + + const SMESH_subMesh* GetCurrentSubMesh() const; /*! * \brief evaluates size of prospective mesh on a shape @@ -127,7 +136,7 @@ public: int _algoDim; bool _isGlobalAlgo; - TAlgoStateError(): _algoDim(0),_algo(0),_name(SMESH_Hypothesis::HYP_OK) {} + TAlgoStateError(): _name(SMESH_Hypothesis::HYP_OK), _algo(0), _algoDim(0) {} void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal) { _name = name; _algo = algo; _algoDim = algo->GetDim(); _isGlobalAlgo = isGlobal; } void Set(TAlgoStateErrorName name, const int algoDim, bool isGlobal) @@ -140,13 +149,15 @@ public: // if Compute() would fail because of some algo bad state // theErrors list contains problems description - StudyContextStruct *GetStudyContext(int studyId); + StudyContextStruct *GetStudyContext(); static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType); - static int GetShapeDim(const TopoDS_Shape & aShape) + static int GetShapeDim(const TopoDS_Shape & aShape) { return GetShapeDim( aShape.ShapeType() ); } + static int GetFlatShapeDim(const TopoDS_Shape &aShape); SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0); + SMESH_Algo* GetAlgo(SMESH_subMesh * aSubMesh, TopoDS_Shape* assignedTo=0); static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh); @@ -154,16 +165,10 @@ public: int GetANewId(); - std::map < int, SMESH_Algo * >_mapAlgo; - std::map < int, SMESH_0D_Algo * >_map0D_Algo; - std::map < int, SMESH_1D_Algo * >_map1D_Algo; - std::map < int, SMESH_2D_Algo * >_map2D_Algo; - std::map < int, SMESH_3D_Algo * >_map3D_Algo; - private: int _localId; // unique Id of created objects, within SMESH_Gen entity - std::map < int, StudyContextStruct * >_mapStudyContext; + StudyContextStruct* _studyContext; // hypotheses managing int _hypId; @@ -171,14 +176,14 @@ private: // number of segments per diagonal of boundary box of geometry by which // default segment length of appropriate 1D hypotheses is defined int _segmentation; - // default of segments + // default number of segments int _nbSegments; - counters *_counters; -#ifdef WITH_SMESH_CANCEL_COMPUTE - volatile bool _compute_canceled; - SMESH_subMesh* _sm_current; -#endif + void setCurrentSubMesh(SMESH_subMesh* sm); + void resetCurrentSubMesh(); + + volatile bool _compute_canceled; + std::list< SMESH_subMesh* > _sm_current; }; #endif