X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Utils.cxx;h=892590dcbb6c8bec9f115b3d8e58e200fe7456c6;hb=34a8a37aeeeda95e0e2dad6cdf51b45bbde5cbb8;hp=b8e679e67f231d07479a8c303518db022964ae03;hpb=8d297d6698f361d4f2dde723050bcfbaea050920;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx
index b8e679e67..892590dcb 100644
--- a/src/SMESHGUI/SMESHGUI_Utils.cxx
+++ b/src/SMESHGUI/SMESHGUI_Utils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -226,6 +226,12 @@ namespace SMESH
     return app->orb()->string_to_object(theIOR.toLatin1().data());
   }
 
+  CORBA::Object_var EntryToObject( const QString& theEntry )
+  {
+    _PTR(SObject) anObj = getStudy()->FindObjectID( theEntry.toLatin1().data() );
+    return SObjectToObject(anObj);
+  }
+
   int GetNameOfSelectedIObjects(LightApp_SelectionMgr* theMgr, QString& theName)
   {
     if (!theMgr)
@@ -236,13 +242,30 @@ namespace SMESH
     int aNbSel = selected.Extent();
     if (aNbSel == 1) {
       Handle(SALOME_InteractiveObject) anIObject = selected.First();
-      theName = QString( anIObject->getName() ).trimmed();
+      theName = GetName( anIObject );
     } else {
       theName = QObject::tr("SMESH_OBJECTS_SELECTED").arg(aNbSel);
     }
     return aNbSel;
   }
 
+  QString GetName( const Handle(SALOME_InteractiveObject)& theIO )
+  {
+    QString name;
+    if ( !theIO.IsNull() )
+    {
+      name = QString( theIO->getName() ).trimmed();
+
+      if ( name.isEmpty() && theIO->hasEntry() )
+      {
+        _PTR(SObject) sObj = getStudy()->FindObjectID( theIO->getEntry() );
+        if ( sObj )
+          name = sObj->GetName().c_str();
+      }
+    }
+    return name.trimmed();
+  }
+
   _PTR(SObject) GetMeshOrSubmesh (_PTR(SObject) theSObject)
   {
     GEOM::GEOM_Object_var aShape = SObjectToInterface<GEOM::GEOM_Object>(theSObject);