X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Utils.cxx;h=893fa86d358fea6aad8077bb3b26332660bca67d;hp=5721e5301dea6f61a2a6838b2a1c92d618837a15;hb=1224f8cfd6255dec39cf45bceb42b479e9c47805;hpb=6df8817c1a9827149025cc942249d7083f504d3d diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx index 5721e5301..893fa86d3 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-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 @@ -242,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(theSObject);