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
Fix pb of make test
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_subMesh.cxx
diff --git
a/src/SMESH/SMESH_subMesh.cxx
b/src/SMESH/SMESH_subMesh.cxx
index f395b7986c23b00d64c18f8984cb50ca2634aed0..64ee5948de5d9b569196bac7497813a26fbc6389 100644
(file)
--- a/
src/SMESH/SMESH_subMesh.cxx
+++ b/
src/SMESH/SMESH_subMesh.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-609,7
+609,7
@@
bool SMESH_subMesh::IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis,
//================================================================================
SMESH_Hypothesis::Hypothesis_Status
//================================================================================
SMESH_Hypothesis::Hypothesis_Status
- SMESH_subMesh::AlgoStateEngine(
i
nt event, SMESH_Hypothesis * anHyp)
+ SMESH_subMesh::AlgoStateEngine(
algo_eve
nt event, SMESH_Hypothesis * anHyp)
{
// **** les retour des evenement shape sont significatifs
// (add ou remove fait ou non)
{
// **** les retour des evenement shape sont significatifs
// (add ou remove fait ou non)
@@
-1167,7
+1167,7
@@
void SMESH_subMesh::setAlgoState(algo_state state)
//================================================================================
SMESH_Hypothesis::Hypothesis_Status
//================================================================================
SMESH_Hypothesis::Hypothesis_Status
- SMESH_subMesh::SubMeshesAlgoStateEngine(
int
event,
+ SMESH_subMesh::SubMeshesAlgoStateEngine(
algo_event
event,
SMESH_Hypothesis * anHyp,
bool exitOnFatal)
{
SMESH_Hypothesis * anHyp,
bool exitOnFatal)
{
@@
-1232,9
+1232,11
@@
void SMESH_subMesh::cleanDependsOn( SMESH_Algo* algoRequiringCleaning/*=0*/ )
if ( !sameShapeType )
{
// check if the algo allows presence of global algos of dimension the algo
if ( !sameShapeType )
{
// check if the algo allows presence of global algos of dimension the algo
- // can generate it-self
+ // can generate it-self;
+ // always keep a node on VERTEX, as this node can be shared by segments
+ // lying on EDGEs not shared by the VERTEX of sm, due to MergeNodes (PAL23068)
int shapeDim = SMESH_Gen::GetShapeDim( sm->GetSubShape() );
int shapeDim = SMESH_Gen::GetShapeDim( sm->GetSubShape() );
- keepSubMeshes =
algoRequiringCleaning->NeedLowerHyps( shapeDim
);
+ keepSubMeshes =
( algoRequiringCleaning->NeedLowerHyps( shapeDim ) || shapeDim == 0
);
prevShapeType = sm->GetSubShape().ShapeType();
toKeepPrevShapeType = keepSubMeshes;
}
prevShapeType = sm->GetSubShape().ShapeType();
toKeepPrevShapeType = keepSubMeshes;
}
@@
-1345,7
+1347,7
@@
static void cleanSubMesh( SMESH_subMesh * subMesh )
*/
//=============================================================================
*/
//=============================================================================
-bool SMESH_subMesh::ComputeStateEngine(
i
nt event)
+bool SMESH_subMesh::ComputeStateEngine(
compute_eve
nt event)
{
switch ( event ) {
case MODIF_ALGO_STATE:
{
switch ( event ) {
case MODIF_ALGO_STATE:
@@
-1982,7
+1984,7
@@
void SMESH_subMesh::updateSubMeshState(const compute_state theState)
//purpose :
//=======================================================================
//purpose :
//=======================================================================
-void SMESH_subMesh::ComputeSubMeshStateEngine(
i
nt event, const bool includeSelf)
+void SMESH_subMesh::ComputeSubMeshStateEngine(
compute_eve
nt event, const bool includeSelf)
{
SMESH_subMeshIteratorPtr smIt = getDependsOnIterator(includeSelf,false);
while ( smIt->more() )
{
SMESH_subMeshIteratorPtr smIt = getDependsOnIterator(includeSelf,false);
while ( smIt->more() )
@@
-2453,7
+2455,7
@@
void SMESH_subMeshEventListener::ProcessEvent(const int event,
switch ( event ) {
case SMESH_subMesh::CLEAN:
for ( ; smIt != smEnd; ++ smIt)
switch ( event ) {
case SMESH_subMesh::CLEAN:
for ( ; smIt != smEnd; ++ smIt)
- (*smIt)->ComputeStateEngine(
event
);
+ (*smIt)->ComputeStateEngine(
SMESH_subMesh::compute_event( event )
);
break;
case SMESH_subMesh::COMPUTE:
case SMESH_subMesh::COMPUTE_SUBMESH:
break;
case SMESH_subMesh::COMPUTE:
case SMESH_subMesh::COMPUTE_SUBMESH: