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
[bos #40650][CEA 33012] Beta Law distribution: added a new type of distribution for...
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Hypothesis.cxx
diff --git
a/src/SMESH/SMESH_Hypothesis.cxx
b/src/SMESH/SMESH_Hypothesis.cxx
index d51ae2a45cef0c9e50cc1e8eba60ac4a06133810..d75aead36117719e5a708e76bdec63d0e4195d9d 100644
(file)
--- a/
src/SMESH/SMESH_Hypothesis.cxx
+++ b/
src/SMESH/SMESH_Hypothesis.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-20,34
+20,34
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementa
t
ion of SMESH idl descriptions
// File : SMESH_Hypothesis.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
//
// File : SMESH_Hypothesis.cxx
// 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)
{
_gen = gen;
SMESH_Gen* gen) : SMESHDS_Hypothesis(hypId)
{
_gen = gen;
- _studyId = studyId;
_type = PARAM_ALGO;
_shapeType = 0; // to be set by algo with TopAbs_Enum
_param_algo_dim = -1; // to be set by algo parameter
_type = PARAM_ALGO;
_shapeType = 0; // to be set by algo with TopAbs_Enum
_param_algo_dim = -1; // to be set by algo parameter
- StudyContextStruct* myStudyContext = gen->GetStudyContext(
_studyId
);
+ StudyContextStruct* myStudyContext = gen->GetStudyContext();
myStudyContext->mapHypothesis[hypId] = this;
}
myStudyContext->mapHypothesis[hypId] = this;
}
@@
-59,8
+59,11
@@
SMESH_Hypothesis::SMESH_Hypothesis(int hypId,
SMESH_Hypothesis::~SMESH_Hypothesis()
{
SMESH_Hypothesis::~SMESH_Hypothesis()
{
- StudyContextStruct* myStudyContext = _gen->GetStudyContext(_studyId);
- myStudyContext->mapHypothesis[_hypId] = 0;
+ if ( _gen )
+ {
+ StudyContextStruct* myStudyContext = _gen->GetStudyContext();
+ myStudyContext->mapHypothesis[_hypId] = 0;
+ }
}
//=============================================================================
}
//=============================================================================
@@
-73,20
+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 ALGO_0D: dim = 0; 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,35
+104,24
@@
int SMESH_Hypothesis::GetShapeType() const
*/
//=============================================================================
*/
//=============================================================================
-int SMESH_Hypothesis::GetStudyId() const
-{
- return _studyId;
-}
-
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void SMESH_Hypothesis::NotifySubMeshesHypothesisModification()
{
// for all meshes in study
void SMESH_Hypothesis::NotifySubMeshesHypothesisModification()
{
// 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 );
+ }
}
//=============================================================================
/*!
}
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================
@@
-154,9
+146,9
@@
void SMESH_Hypothesis::SetLibName(const char* theLibName)
//purpose : Find a mesh with given persistent ID
//=======================================================================
//purpose : Find a mesh with given persistent ID
//=======================================================================
-SMESH_Mesh* SMESH_Hypothesis::GetMeshByPersistentID(int id)
+SMESH_Mesh* SMESH_Hypothesis::GetMeshByPersistentID(int id)
const
{
{
- StudyContextStruct* myStudyContext = _gen->GetStudyContext(
_studyId
);
+ StudyContextStruct* myStudyContext = _gen->GetStudyContext();
map<int, SMESH_Mesh*>::iterator itm = myStudyContext->mapMesh.begin();
for ( ; itm != myStudyContext->mapMesh.end(); itm++)
{
map<int, SMESH_Mesh*>::iterator itm = myStudyContext->mapMesh.begin();
for ( ; itm != myStudyContext->mapMesh.end(); itm++)
{