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
restoring fam with old id
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Utils.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Utils.cxx
b/src/SMESHGUI/SMESHGUI_Utils.cxx
index 5721e5301dea6f61a2a6838b2a1c92d618837a15..893fa86d358fea6aad8077bb3b26332660bca67d 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Utils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Utils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-242,13
+242,30
@@
namespace SMESH
int aNbSel = selected.Extent();
if (aNbSel == 1) {
Handle(SALOME_InteractiveObject) anIObject = selected.First();
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;
}
} 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);
_PTR(SObject) GetMeshOrSubmesh (_PTR(SObject) theSObject)
{
GEOM::GEOM_Object_var aShape = SObjectToInterface<GEOM::GEOM_Object>(theSObject);