Copyright update: 2016

[modules/gui.git] / src / LightApp / LightApp_SelectionMgr.cxx

diff --git a/src/LightApp/LightApp_SelectionMgr.cxx b/src/LightApp/LightApp_SelectionMgr.cxx
index 23e2c63528bcae74dc8deae9a40a7b0da3e3a023..4dd3857829083def6bbf810d4ce79c16cd0cd311 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.cxx
+++ b/src/LightApp/LightApp_SelectionMgr.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -32,7 +32,6 @@
 
 #ifndef DISABLE_SALOMEOBJECT
   #include <SALOME_ListIO.hxx>
-  #include <SALOME_ListIteratorOfListIO.hxx>
 
   // Open CASCADE Include
   #include <TColStd_MapOfInteger.hxx>
@@ -113,7 +112,7 @@ void LightApp_SelectionMgr::selectedObjects( SALOME_ListIO& theList, const QStri
        if ( !owner )
          continue;
 
-       if ( !aSet.contains( owner->entry() ) ) {
+       if ( !aSet.contains( owner->entry() ) && !owner->IO().IsNull() ) {
          selList.append( owner->IO() );
          aSet.insert( owner->entry() );
        }
@@ -209,7 +208,7 @@ void LightApp_SelectionMgr::selectedObjects( QStringList& theList, const QString
        if ( !owner )
          continue;
 
-       if ( !aSet.contains( owner->entry() ) ) {
+        if ( !aSet.contains( owner->entry() ) ) {
          selList.append( owner->entry() );
          aSet.insert( owner->entry() );
        }
@@ -228,6 +227,20 @@ void LightApp_SelectionMgr::selectedObjects( QStringList& theList, const QString
   theList = selList;
 }
 
+/*!
+  Append selected objects.
+*/
+void LightApp_SelectionMgr::setSelectedObjects( const QStringList& lst, const bool append )
+{
+  SUIT_DataOwnerPtrList owners;
+  foreach( const QString& aValue, lst ) {
+    if ( !aValue.isNull() )
+      owners.append( new LightApp_DataOwner( aValue ) );
+  }
+
+  setSelected( owners, append );
+}
+
 #endif
 
 /*!
@@ -395,7 +408,7 @@ void LightApp_SelectionMgr::selectedSubOwners( MapEntryOfMapOfInteger& theMap )
       dynamic_cast<const LightApp_DataSubOwner*>( (*itr).operator->() );
     if ( subOwner )
     {
-//#ifndef WNT
+//#ifndef WIN32
       if ( !theMap.IsBound( TCollection_AsciiString(subOwner->entry().toLatin1().data()) ) )
 //#else
 //      if ( !theMap.IsBound( subOwner->entry().toLatin1().data() ) )