X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshUtils.cxx;h=b524c2f83efe936250a665a5dffa51fa756a3d69;hp=ccbdaff7d5855e096ec46ea9cdd8bcc07e2902a8;hb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813

diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index ccbdaff7d..b524c2f83 100644
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@ -1,33 +1,45 @@
-//  Copyright (C) 2003  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 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
-
+//  Copyright (C) 2007-2008  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
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  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 includes
+//
 #include "SMESHGUI_MeshUtils.h"
+
 #include "SMESHGUI_Utils.h"
-#include "SALOMEDSClient_Study.hxx"
 
-#include "SALOMEconfig.h"
+// SALOME KERNEL includes
+#include <SALOMEDSClient_Study.hxx>
+
+// Qt includes
+#include <QStringList>
+
+// IDL includes
+#include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Group)
 
 namespace SMESH
 {
-  
   SMESH_Mesh_var GetMeshByIO(const Handle(SALOME_InteractiveObject)& theIO)
   {
     CORBA::Object_var anObj = IObjectToObject(theIO);
@@ -45,27 +57,28 @@ namespace SMESH
     return SMESH_Mesh::_nil();
   }
 
-  QString UniqueMeshName(const char* theBaseName, const char* thePostfix)
+  QString UniqueMeshName(const QString& theBaseName, const QString& thePostfix)
   {
-    QString baseName = theBaseName;
-    if ( thePostfix/* && !name.contains( postfix )*/) { // add postfix
-      baseName += "_";
-      baseName += thePostfix;
-    }
-    if(_PTR(Study) aStudy = GetActiveStudyDocument()) {
+    QString baseName = thePostfix.isEmpty() ? 
+      theBaseName : theBaseName + "_" + thePostfix;
+    if ( _PTR(Study) aStudy = GetActiveStudyDocument() ) {
       QString name = baseName;
-      while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) {
+      while ( !aStudy->FindObjectByName( name.toLatin1().data(), "SMESH" ).empty() ) {
         int nb = 0;
-        if ( name[ name.length()-1 ].isNumber() ) {
-          int nbBeg = name.findRev("_");
-          nb = name.right( name.length() - nbBeg - 1 ).toInt();
-          name = name.left( nbBeg );
-        }
-        name += QString("_%1").arg( nb+1 );
+	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 QString("");
+    return baseName;
   }
-
-}
+} // end of namespace SMESH