Unicode support

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

diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
index 7e4039a3aa647b3e142ffb9dd7b45e18529e20e9..0c8486ed2e944befe69846068b34557bf40ff4a7 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -318,7 +318,9 @@ int SMESHGUI_SelectionOp::typeById( const QString& str, const EntityType objtype
           GEOM::GEOM_Object_var obj = GEOM::GEOM_Object::_narrow(
             dynamic_cast<SALOMEDS_SObject*>( sobj.get() )->GetObject() );
           if( !CORBA::is_nil( obj ) )
-            res = SMESHGUI_Dialog::prefix( "GEOM" ) + obj->GetType();
+            // as decoding of type id is not realized in LightApp_Dialog,
+            //make all GEOM objects have same type id
+            res = SMESHGUI_Dialog::prefix( "GEOM" );// + obj->GetType();
         }
       }
       else
@@ -491,9 +493,16 @@ void SMESHGUI_SelectionOp::onTextChanged( int, const QStringList& list )
     IdList ids; extractIds( list, ids, '\0' );
     IdList::const_iterator anIt = ids.begin(),
                            aLast = ids.end();
-    for( ; anIt!=aLast; anIt++ )
-      if( const SMDS_MeshNode * n = aMesh->FindNode( *anIt ) )
-        newIndices.Add( n->GetID() );
+    if ( selectionMode() == NodeSelection )
+      for( ; anIt!=aLast; anIt++ ) {
+        if( const SMDS_MeshNode * n = aMesh->FindNode( *anIt ) )
+          newIndices.Add( n->GetID() );
+      }
+    else 
+      for( ; anIt!=aLast; anIt++ ) {
+        if( const SMDS_MeshElement* e = aMesh->FindElement( *anIt ) )
+          newIndices.Add( e->GetID() );
+      }
 
     selector()->AddOrRemoveIndex( sel.First(), newIndices, false );
     highlight( sel.First(), true, true );