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 from V5_1_4_BR 07/05/2010
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshUtils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index b524c2f83efe936250a665a5dffa51fa756a3d69..0763be3ed52c27879096d76939e1e2eddde899af 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// 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 SMESHGUI : GUI for SMESH component
// File : SMESHGUI_MeshUtils.cxx
// Author : Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_MeshUtils.cxx
// Author : Open CASCADE S.A.S.
@@
-46,13
+47,13
@@
namespace SMESH
if(!CORBA::is_nil(anObj)){
SMESH_Mesh_var aMesh = SMESH_Mesh::_narrow(anObj);
if(!CORBA::is_nil(aMesh))
if(!CORBA::is_nil(anObj)){
SMESH_Mesh_var aMesh = SMESH_Mesh::_narrow(anObj);
if(!CORBA::is_nil(aMesh))
- return aMesh;
+
return aMesh;
SMESH_GroupBase_var aGroup = SMESH_GroupBase::_narrow(anObj);
if(!CORBA::is_nil(aGroup))
SMESH_GroupBase_var aGroup = SMESH_GroupBase::_narrow(anObj);
if(!CORBA::is_nil(aGroup))
- return aGroup->GetMesh();
+
return aGroup->GetMesh();
SMESH_subMesh_var aSubMesh = SMESH_subMesh::_narrow(anObj);
if(!CORBA::is_nil(aSubMesh))
SMESH_subMesh_var aSubMesh = SMESH_subMesh::_narrow(anObj);
if(!CORBA::is_nil(aSubMesh))
- return aSubMesh->GetFather();
+
return aSubMesh->GetFather();
}
return SMESH_Mesh::_nil();
}
}
return SMESH_Mesh::_nil();
}
@@
-65,17
+66,17
@@
namespace SMESH
QString name = baseName;
while ( !aStudy->FindObjectByName( name.toLatin1().data(), "SMESH" ).empty() ) {
int nb = 0;
QString name = baseName;
while ( !aStudy->FindObjectByName( name.toLatin1().data(), "SMESH" ).empty() ) {
int nb = 0;
- QStringList names = name.split("_", QString::KeepEmptyParts);
- if ( names.count() > 0 ) {
- bool ok;
- int index = names.last().toInt( &ok );
- if ( ok ) {
- nb = index;
- names.removeLast();
- }
- }
- names.append( QString::number( nb+1 ) );
- name = names.join( "_" );
+
QStringList names = name.split("_", QString::KeepEmptyParts);
+
if ( names.count() > 0 ) {
+
bool ok;
+
int index = names.last().toInt( &ok );
+
if ( ok ) {
+
nb = index;
+
names.removeLast();
+
}
+
}
+
names.append( QString::number( nb+1 ) );
+
name = names.join( "_" );
}
return name;
}
}
return name;
}