#19765 EDF 21730 - long time to load med file file with huge amount of groups

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Utils.cxx

diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx
index 70e4686c6c469d9dd271cfe0c9bc07117c7c9a9d..893fa86d358fea6aad8077bb3b26332660bca67d 100644 (file)
--- 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
@@ -135,7 +135,7 @@ namespace SMESH
   {
     if (getStudy()->GetProperties()->IsLocked())
       return;
-    SMESHGUI::GetSMESHGen()->SetName(theSObject->GetIOR().c_str(), theName.toLatin1().data());
+    SMESHGUI::GetSMESHGen()->SetName(theSObject->GetIOR().c_str(), theName.toUtf8().data());
   }
 
   void SetValue (_PTR(SObject) theSObject, const QString& theValue)
@@ -148,7 +148,7 @@ namespace SMESH
       aBuilder->FindOrCreateAttribute(theSObject, "AttributeComment");
     _PTR(AttributeComment) aComment = anAttr;
     if (aComment)
-      aComment->SetValue(theValue.toLatin1().data());
+      aComment->SetValue(theValue.toUtf8().data());
   }
   
   void setFileName (_PTR(SObject) theSObject, const QString& theValue)
@@ -161,7 +161,7 @@ namespace SMESH
       aBuilder->FindOrCreateAttribute(theSObject, "AttributeExternalFileDef");
     _PTR(AttributeExternalFileDef) aFileName = anAttr;
     if (aFileName)
-      aFileName->SetValue(theValue.toLatin1().data());
+      aFileName->SetValue(theValue.toUtf8().data());
   }
   
   void setFileType (_PTR(SObject) theSObject, const QString& theValue)
@@ -174,7 +174,7 @@ namespace SMESH
       aBuilder->FindOrCreateAttribute(theSObject, "AttributeFileType");
     _PTR(AttributeFileType) aFileType = anAttr;
     if (aFileType)
-      aFileType->SetValue(theValue.toLatin1().data());
+      aFileType->SetValue(theValue.toUtf8().data());
   }
 
   CORBA::Object_var SObjectToObject (_PTR(SObject) theSObject )
@@ -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);