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
Update copyright information
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_subMesh.cxx
diff --git
a/src/SMESH/SMESH_subMesh.cxx
b/src/SMESH/SMESH_subMesh.cxx
index 704703404d0e8003b4fa4a9d3645f75bcba37dc8..6c484c80a20e6d9eff3ddef37a83010a4532a7c4 100644
(file)
--- a/
src/SMESH/SMESH_subMesh.cxx
+++ b/
src/SMESH/SMESH_subMesh.cxx
@@
-1,6
+1,6
@@
-//
SMESH SMESH : implementaion of SMESH idl descriptions
+//
Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
//
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2003
-2007
OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// This library is free software; you can redistribute it and/or
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// This library is free software; you can redistribute it and/or
@@
-19,13
+19,12
@@
//
// 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
// File : SMESH_subMesh.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// $Header$
// File : SMESH_subMesh.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// $Header$
-
+//
#include "SMESH_subMesh.hxx"
#include "SMESH_Algo.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_Algo.hxx"
@@
-195,7
+194,7
@@
void SMESH_subMesh::SetIsAlwaysComputed(bool isAlCo)
bool SMESH_subMesh::IsEmpty() const
{
if (SMESHDS_SubMesh * subMeshDS = ((SMESH_subMesh*)this)->GetSubMeshDS())
bool SMESH_subMesh::IsEmpty() const
{
if (SMESHDS_SubMesh * subMeshDS = ((SMESH_subMesh*)this)->GetSubMeshDS())
- return (!subMeshDS->
GetNodes()->more() && !subMeshDS->GetElements()->more
());
+ return (!subMeshDS->
NbElements() && !subMeshDS->NbNodes
());
return true;
}
return true;
}
@@
-513,7
+512,8
@@
bool SMESH_subMesh::CanAddHypothesis(const SMESH_Hypothesis* theHypothesis) cons
int aShapeDim = SMESH_Gen::GetShapeDim(_subShape);
if (aHypDim == 3 && aShapeDim == 3) {
// check case of open shell
int aShapeDim = SMESH_Gen::GetShapeDim(_subShape);
if (aHypDim == 3 && aShapeDim == 3) {
// check case of open shell
- if (_subShape.ShapeType() == TopAbs_SHELL && !_subShape.Closed())
+ //if (_subShape.ShapeType() == TopAbs_SHELL && !_subShape.Closed())
+ if (_subShape.ShapeType() == TopAbs_SHELL && !BRep_Tool::IsClosed(_subShape))
return false;
}
if ( aHypDim <= aShapeDim )
return false;
}
if ( aHypDim <= aShapeDim )
@@
-1359,7
+1359,7
@@
bool SMESH_subMesh::ComputeStateEngine(int event)
{
ret = algo->Compute((*_father), shape);
}
{
ret = algo->Compute((*_father), shape);
}
- if ( !
ret && _computeError->IsOK(
) ) // algo can set _computeError of submesh
+ if ( !
_computeError || ( !ret && _computeError->IsOK()
) ) // algo can set _computeError of submesh
_computeError = algo->GetComputeError();
}
catch ( std::bad_alloc& exc ) {
_computeError = algo->GetComputeError();
}
catch ( std::bad_alloc& exc ) {
@@
-2077,7
+2077,8
@@
namespace {
SMESH_subMesh* prepend,
SMESH_subMesh* append): myIt(subIt),myAppend(append)
{
SMESH_subMesh* prepend,
SMESH_subMesh* append): myIt(subIt),myAppend(append)
{
- myCur = prepend ? prepend : myIt->more() ? myIt->next() : 0;
+ myCur = prepend ? prepend : myIt->more() ? myIt->next() : append;
+ if ( myCur == append ) append = 0;
}
/// Return true if and only if there are other object in this iterator
virtual bool more()
}
/// Return true if and only if there are other object in this iterator
virtual bool more()