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

diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index ccbdaff7d..1a354f29e 100644
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@ -1,71 +1,137 @@
-//  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 
-// 
+// Copyright (C) 2007-2020  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, or (at your option) any later version.
+//
+// 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.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)
+#include CORBA_SERVER_HEADER(SMESH_Measurements)
 
 namespace SMESH
 {
-  
   SMESH_Mesh_var GetMeshByIO(const Handle(SALOME_InteractiveObject)& theIO)
   {
     CORBA::Object_var anObj = IObjectToObject(theIO);
     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))
-	return aGroup->GetMesh();
+        return aGroup->GetMesh();
       SMESH_subMesh_var aSubMesh = SMESH_subMesh::_narrow(anObj);
       if(!CORBA::is_nil(aSubMesh))
-	return aSubMesh->GetFather();
+        return aSubMesh->GetFather();
     }
     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 = getStudy() ) {
       QString name = baseName;
-      while ( !aStudy->FindObjectByName( name.latin1(), "SMESH" ).empty() ) {
+      while ( !aStudy->FindObjectByName( name.toUtf8().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 );
+        QStringList names = name.split("_", QString::KeepEmptyParts);
+        if ( names.count() > 0 ) {
+          bool ok;
+          int index = names.last().toInt( &ok );
+          if ( ok ) {
+            nb = index;
+            names.removeLast();
+          }
         }
-        name += QString("_%1").arg( nb+1 );
+        names.append( QString::number( nb+1 ) );
+        name = names.join( "_" );
       }
       return name;
     }
-    return QString("");
+    return baseName;
+  }
+
+  QString UniqueName(const QString& theBaseName, _PTR(SObject) theParent, const QString& thePostfix)
+  {
+    QString baseName = thePostfix.isEmpty() ? 
+      theBaseName : theBaseName + "_" + thePostfix;
+    QString name = baseName;
+    if ( _PTR(Study) aStudy = getStudy() ) {
+      _PTR(SObject) p = theParent;
+      if ( !p ) p = aStudy->FindComponent( "SMESH" );
+      if ( p ) {
+        _PTR(ChildIterator) iter = aStudy->NewChildIterator( p );
+        iter->InitEx(/*allLevels=*/true);
+        int idx = 0;
+        while( true ) {
+          bool found = false;
+          for ( ; iter->More(); iter->Next() ) {
+            _PTR(SObject) so = iter->Value();
+            if ( !so ) continue; // skip bad objects
+            _PTR(SObject) ref;
+            if ( so->ReferencedObject( ref ) ) continue; // skip references
+            QString n = so->GetName().c_str();
+            if ( !n.isEmpty() && n == name ) {
+              QStringList names = name.split("_", QString::KeepEmptyParts);
+              if ( names.count() > 0 ) {
+                bool ok;
+                names.last().toInt( &ok );
+                if ( ok )
+                  names.removeLast();
+              }
+              names.append( QString::number( ++idx ) );
+              name = names.join( "_" );
+              found = true;
+              break;
+            }
+          }
+          if ( !found ) break;
+        }
+      }
+    }
+    return name;
   }
 
-}
+  SMESH::Measurements_var& GetMeasurements()
+  {
+    static SMESH::Measurements_var aMeasurements;
+    if (CORBA::is_nil(aMeasurements)) {
+      aMeasurements = SMESHGUI::GetSMESHGen()->CreateMeasurements();
+    }
+    return aMeasurements;
+  }
+} // end of namespace SMESH