X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Hypothesis.cxx;h=2d1e10c165906c40776ccded4f72a2fcf5e6eb45;hb=e576eeb10d8db1c979525eadf52bba91f273c91e;hp=0c08a7ceed0f0dc4ed4e20bf3e68a33f0fc36dfb;hpb=251f8c052dd12dd29922210dc901b295fe999a0e;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Hypothesis.cxx b/src/SMESH/SMESH_Hypothesis.cxx index 0c08a7cee..2d1e10c16 100644 --- a/src/SMESH/SMESH_Hypothesis.cxx +++ b/src/SMESH/SMESH_Hypothesis.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -26,8 +26,12 @@ // Module : SMESH // #include "SMESH_Hypothesis.hxx" + +#include "SMESHDS_Mesh.hxx" #include "SMESH_Gen.hxx" +#include "SMESH_Mesh.hxx" #include "SMESH_subMesh.hxx" + #include "utilities.h" using namespace std; @@ -59,7 +63,6 @@ SMESH_Hypothesis::SMESH_Hypothesis(int hypId, SMESH_Hypothesis::~SMESH_Hypothesis() { - MESSAGE("SMESH_Hypothesis::~SMESH_Hypothesis"); StudyContextStruct* myStudyContext = _gen->GetStudyContext(_studyId); myStudyContext->mapHypothesis[_hypId] = 0; } @@ -78,6 +81,7 @@ int SMESH_Hypothesis::GetDim() const case ALGO_1D: dim = 1; break; case ALGO_2D: dim = 2; break; case ALGO_3D: dim = 3; break; + case ALGO_0D: dim = 0; break; case PARAM_ALGO: dim = ( _param_algo_dim < 0 ) ? -_param_algo_dim : _param_algo_dim; break; } @@ -114,8 +118,6 @@ int SMESH_Hypothesis::GetStudyId() const void SMESH_Hypothesis::NotifySubMeshesHypothesisModification() { - MESSAGE("SMESH_Hypothesis::NotifySubMeshesHypothesisModification"); - // for all meshes in study StudyContextStruct* myStudyContext = _gen->GetStudyContext(_studyId); @@ -123,15 +125,15 @@ void SMESH_Hypothesis::NotifySubMeshesHypothesisModification() for (itm = myStudyContext->mapMesh.begin(); itm != myStudyContext->mapMesh.end(); itm++) - { - SMESH_Mesh* mesh = (*itm).second; - mesh->NotifySubMeshesHypothesisModification( this ); - } + { + SMESH_Mesh* mesh = (*itm).second; + mesh->NotifySubMeshesHypothesisModification( this ); + } } //============================================================================= /*! - * + * */ //============================================================================= @@ -159,7 +161,7 @@ void SMESH_Hypothesis::SetLibName(const char* theLibName) SMESH_Mesh* SMESH_Hypothesis::GetMeshByPersistentID(int id) { StudyContextStruct* myStudyContext = _gen->GetStudyContext(_studyId); - map::iterator itm = itm = myStudyContext->mapMesh.begin(); + map::iterator itm = myStudyContext->mapMesh.begin(); for ( ; itm != myStudyContext->mapMesh.end(); itm++) { SMESH_Mesh* mesh = (*itm).second;