Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge multi-study removal branch.
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Hypothesis.cxx
diff --git
a/src/SMESH/SMESH_Hypothesis.cxx
b/src/SMESH/SMESH_Hypothesis.cxx
index fafd29b4b75a4cdacbee83d0c072862db91d2be9..991eb2e94b316490ea7c39c0fe6733b678b4b314 100644
(file)
--- a/
src/SMESH/SMESH_Hypothesis.cxx
+++ b/
src/SMESH/SMESH_Hypothesis.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-25,30
+25,30
@@
// Author : Paul RASCLE, EDF
// Module : SMESH
//
// Author : Paul RASCLE, EDF
// Module : SMESH
//
-#include "SMESH_Hypothesis.hxx"
+
#include "SMESH_Gen.hxx"
#include "SMESH_Gen.hxx"
-#include "SMESH_subMesh.hxx"
-#include "utilities.h"
+
+#include "SMESHDS_Mesh.hxx"
+#include "SMESH_Hypothesis.hxx"
+#include "SMESH_Mesh.hxx"
using namespace std;
//=============================================================================
/*!
using namespace std;
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
SMESH_Hypothesis::SMESH_Hypothesis(int hypId,
*/
//=============================================================================
SMESH_Hypothesis::SMESH_Hypothesis(int hypId,
- int studyId,
SMESH_Gen* gen) : SMESHDS_Hypothesis(hypId)
{
SMESH_Gen* gen) : SMESHDS_Hypothesis(hypId)
{
- _gen = gen;
- _studyId = studyId;
- StudyContextStruct* myStudyContext = _gen->GetStudyContext(_studyId);
- myStudyContext->mapHypothesis[_hypId] = this;
- _type = PARAM_ALGO;
- _shapeType = 0; // to be set by algo with TopAbs_Enum
+ _gen = gen;
+ _type = PARAM_ALGO;
+ _shapeType = 0; // to be set by algo with TopAbs_Enum
_param_algo_dim = -1; // to be set by algo parameter
_param_algo_dim = -1; // to be set by algo parameter
+ StudyContextStruct* myStudyContext = gen->GetStudyContext();
+ myStudyContext->mapHypothesis[hypId] = this;
}
//=============================================================================
}
//=============================================================================
@@
-59,9
+59,11
@@
SMESH_Hypothesis::SMESH_Hypothesis(int hypId,
SMESH_Hypothesis::~SMESH_Hypothesis()
{
SMESH_Hypothesis::~SMESH_Hypothesis()
{
- MESSAGE("SMESH_Hypothesis::~SMESH_Hypothesis");
- StudyContextStruct* myStudyContext = _gen->GetStudyContext(_studyId);
- myStudyContext->mapHypothesis[_hypId] = 0;
+ if ( _gen )
+ {
+ StudyContextStruct* myStudyContext = _gen->GetStudyContext();
+ myStudyContext->mapHypothesis[_hypId] = 0;
+ }
}
//=============================================================================
}
//=============================================================================
@@
-74,19
+76,20
@@
int SMESH_Hypothesis::GetDim() const
{
int dim = 0;
switch (_type)
{
int dim = 0;
switch (_type)
- {
- case ALGO_1D: dim = 1; break;
- case ALGO_2D: dim = 2; break;
- case ALGO_3D: dim = 3; break;
- case PARAM_ALGO:
- dim = ( _param_algo_dim < 0 ) ? -_param_algo_dim : _param_algo_dim; break;
- }
+ {
+ 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;
+ }
return dim;
}
//=============================================================================
/*!
return dim;
}
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================
@@
-101,37
+104,24
@@
int SMESH_Hypothesis::GetShapeType() const
*/
//=============================================================================
*/
//=============================================================================
-int SMESH_Hypothesis::GetStudyId() const
-{
- return _studyId;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void SMESH_Hypothesis::NotifySubMeshesHypothesisModification()
{
void SMESH_Hypothesis::NotifySubMeshesHypothesisModification()
{
- MESSAGE("SMESH_Hypothesis::NotifySubMeshesHypothesisModification");
-
// for all meshes in study
// for all meshes in study
- StudyContextStruct* myStudyContext = _gen->GetStudyContext(
_studyId
);
+ StudyContextStruct* myStudyContext = _gen->GetStudyContext();
map<int, SMESH_Mesh*>::iterator itm;
for (itm = myStudyContext->mapMesh.begin();
itm != myStudyContext->mapMesh.end();
itm++)
map<int, SMESH_Mesh*>::iterator itm;
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 );
+ }
}
//=============================================================================
/*!
}
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================
@@
-158,8
+148,8
@@
void SMESH_Hypothesis::SetLibName(const char* theLibName)
SMESH_Mesh* SMESH_Hypothesis::GetMeshByPersistentID(int id)
{
SMESH_Mesh* SMESH_Hypothesis::GetMeshByPersistentID(int id)
{
- StudyContextStruct* myStudyContext = _gen->GetStudyContext(
_studyId
);
- map<int, SMESH_Mesh*>::iterator itm =
itm =
myStudyContext->mapMesh.begin();
+ StudyContextStruct* myStudyContext = _gen->GetStudyContext();
+ map<int, SMESH_Mesh*>::iterator itm = myStudyContext->mapMesh.begin();
for ( ; itm != myStudyContext->mapMesh.end(); itm++)
{
SMESH_Mesh* mesh = (*itm).second;
for ( ; itm != myStudyContext->mapMesh.end(); itm++)
{
SMESH_Mesh* mesh = (*itm).second;