Copyright update 2021

[modules/geom.git] / src / EntityGUI / EntityGUI_SubShapeDlg.cxx

diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
index 5230c6ac5b62b271de2e56b5df0dfcff518394fd..b7cd8f46647a6f015e387cb0b84101da19796335 100644 (file)
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.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
@@ -693,7 +693,8 @@ int EntityGUI_SubShapeDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& th
         if (!appStudy) return 0;
         _PTR(Study) aStudy = appStudy->studyDS();
 
-        _PTR(SObject) aSObj (aStudy->FindObjectID(anEntry.toLatin1().constData()));
+        _PTR(SObject) aSObj (aStudy->FindObjectID(anEntry.toUtf8().constData()));
+        if ( ! GeometryGUI::IsInGeomComponent( aSObj )) continue;
         GEOM::GEOM_Object_var aGeomObj =
           GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aSObj));
         TopoDS_Shape aShape;
@@ -909,7 +910,7 @@ void EntityGUI_SubShapeDlg::ClickOnOkFilter()
   
   TopTools_IndexedMapOfShape aSubShapesMap;
   TopExp::MapShapes(myShape, aSubShapesMap);
-  SALOME_View* view = GEOM_Displayer::GetActiveView();
+  //SALOME_View* view = GEOM_Displayer::GetActiveView();
   getDisplayer()->Erase(myObject, false, false);
   CORBA::String_var aMainEntry = myObject->GetStudyEntry();
   QString anEntryBase = aMainEntry.in();
@@ -934,7 +935,7 @@ void EntityGUI_SubShapeDlg::ClickOnOkFilter()
          ( myLessFilterCheck->isChecked() && !myGreaterFilterCheck->isChecked() && isLess ) ||
          ( myGreaterFilterCheck->isChecked() && !myLessFilterCheck->isChecked() && isGreater ) ) {
       Handle(SALOME_InteractiveObject) io = new SALOME_InteractiveObject();
-      io->setEntry( anEntry.toLatin1().constData() );
+      io->setEntry( anEntry.toUtf8().constData() );
       io->setName( myObject->GetName() );
       toSelect.Append(io);
     }