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 branch 'V9_9_BR'
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_GroupBase.cxx
diff --git
a/src/SMESHDS/SMESHDS_GroupBase.cxx
b/src/SMESHDS/SMESHDS_GroupBase.cxx
index 95a91cd0c7f5e40f09de0e75b18e9cfb528b67b2..fa3a10d0a7d3926efc8ee8881035005de11dc47a 100644
(file)
--- a/
src/SMESHDS/SMESHDS_GroupBase.cxx
+++ b/
src/SMESHDS/SMESHDS_GroupBase.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-55,7
+55,7
@@
SMESHDS_GroupBase::SMESHDS_GroupBase (const int theID,
*/
//=============================================================================
*/
//=============================================================================
-
int
SMESHDS_GroupBase::GetID (const int theIndex)
+
smIdType
SMESHDS_GroupBase::GetID (const int theIndex)
{
if (myCurIndex < 1 || myCurIndex > theIndex) {
myIterator = GetElements();
{
if (myCurIndex < 1 || myCurIndex > theIndex) {
myIterator = GetElements();
@@
-75,7
+75,7
@@
int SMESHDS_GroupBase::GetID (const int theIndex)
*/
//=============================================================================
*/
//=============================================================================
-const SMDS_MeshElement* SMESHDS_GroupBase::findInMesh (const
int
theID) const
+const SMDS_MeshElement* SMESHDS_GroupBase::findInMesh (const
smIdType
theID) const
{
SMDSAbs_ElementType aType = GetType();
const SMDS_MeshElement* aElem = NULL;
{
SMDSAbs_ElementType aType = GetType();
const SMDS_MeshElement* aElem = NULL;
@@
-107,10
+107,10
@@
void SMESHDS_GroupBase::resetIterator()
//purpose :
//=======================================================================
//purpose :
//=======================================================================
-
int
SMESHDS_GroupBase::Extent() const
+
smIdType
SMESHDS_GroupBase::Extent() const
{
SMDS_ElemIteratorPtr it = GetElements();
{
SMDS_ElemIteratorPtr it = GetElements();
-
int
nb = 0;
+
smIdType
nb = 0;
if ( it )
for ( ; it->more(); it->next() )
nb++;
if ( it )
for ( ; it->more(); it->next() )
nb++;
@@
-126,7
+126,7
@@
bool SMESHDS_GroupBase::IsEmpty()
{
if ( myMesh->GetMeshInfo().NbElements( myType ) == 0 )
// avoid long iteration over sub-meshes of a complex sub-mesh of a group on geometry
{
if ( myMesh->GetMeshInfo().NbElements( myType ) == 0 )
// avoid long iteration over sub-meshes of a complex sub-mesh of a group on geometry
- return
fals
e;
+ return
tru
e;
SMDS_ElemIteratorPtr it = GetElements();
return ( !it || !it->more() );
}
SMDS_ElemIteratorPtr it = GetElements();
return ( !it || !it->more() );
}
@@
-136,7
+136,7
@@
bool SMESHDS_GroupBase::IsEmpty()
//purpose :
//=======================================================================
//purpose :
//=======================================================================
-bool SMESHDS_GroupBase::Contains (const
int
theID)
+bool SMESHDS_GroupBase::Contains (const
smIdType
theID)
{
if ( SMDS_ElemIteratorPtr it = GetElements() ) {
while ( it->more() )
{
if ( SMDS_ElemIteratorPtr it = GetElements() ) {
while ( it->more() )