X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_subMesh.hxx;h=03dd98e491b9448c9cf04a8396f070004b62890f;hb=b8d0c082d520aaddf1ef96a26d4c92bb44877357;hp=ef3cb629f46f3da9e982fa4f59f3bcfb81e9f01c;hpb=e74c29b7867ca230102fc580d831dda6b81b3b4c;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_subMesh.hxx b/src/SMESH/SMESH_subMesh.hxx index ef3cb629f..03dd98e49 100644 --- a/src/SMESH/SMESH_subMesh.hxx +++ b/src/SMESH/SMESH_subMesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 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 @@ -48,7 +48,7 @@ class SMESH_Hypothesis; class SMESH_Mesh; class SMESH_subMesh; class SMESH_subMeshEventListener; -class SMESH_subMeshEventListenerData; +struct SMESH_subMeshEventListenerData; typedef SMESH_subMeshEventListener EventListener; typedef SMESH_subMeshEventListenerData EventListenerData; @@ -126,7 +126,7 @@ class SMESH_EXPORT SMESH_subMesh // ================================================================== /*! - * \brief Sets an event listener and its data to a submesh + * \brief Set an event listener and its data to a submesh * \param listener - the listener to store * \param data - the listener data to store * \param where - the submesh to store the listener and it's data @@ -238,14 +238,14 @@ public: // return true if theHypothesis can be attached to me: // its dimension is checked - static bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis, + static bool IsApplicableHypothesis(const SMESH_Hypothesis* theHypothesis, const TopAbs_ShapeEnum theShapeType); - bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis) const; + bool IsApplicableHypothesis(const SMESH_Hypothesis* theHypothesis) const; // return true if theHypothesis can be used to mesh me: // its shape type is checked - SMESH_Hypothesis::Hypothesis_Status CheckConcurentHypothesis (const int theHypType); + SMESH_Hypothesis::Hypothesis_Status CheckConcurrentHypothesis (const int theHypType); // check if there are several applicable hypothesis on fathers /*! @@ -261,7 +261,7 @@ public: * none mesh entity is bound to it */ void SetIsAlwaysComputed(bool isAlCo); - bool IsAlwaysComputed() { return _alwaysComputed; } + bool IsAlwaysComputed() const { return _alwaysComputed; } bool SubMeshesComputed(bool * isFailedToCompute=0) const; @@ -332,6 +332,7 @@ protected: std::vector< SMESH_subMesh * > _ancestors; SMESH_Algo * _algo; // the algorithm found by last *StateEngine() call + TopoDS_Shape _algoShape; // shape the algorithm is assigned to algo_state _algoState; compute_state _computeState; SMESH_ComputeErrorPtr _computeError;