IPAL9182: linking to libSPlot2d.so added

[modules/gui.git] / src / SalomeApp / SalomeApp_VTKSelector.cxx

diff --git a/src/SalomeApp/SalomeApp_VTKSelector.cxx b/src/SalomeApp/SalomeApp_VTKSelector.cxx
index 9c051c060dea8858e498389d9f59f0eb50eb8b1a..b75f99b40c824f411444bdc73e9ede1562eed213 100644 (file)
--- a/src/SalomeApp/SalomeApp_VTKSelector.cxx
+++ b/src/SalomeApp/SalomeApp_VTKSelector.cxx
@@ -44,8 +44,7 @@ SalomeApp_SVTKDataOwner
 SalomeApp_VTKSelector
 ::SalomeApp_VTKSelector( SVTK_Viewer* viewer, 
                         SUIT_SelectionMgr* mgr ): 
-  QObject( 0 ),
-  SUIT_Selector( mgr ),
+  SUIT_Selector( mgr, viewer ),
   myViewer( viewer )
 {
   if ( myViewer )
@@ -121,7 +120,10 @@ SalomeApp_VTKSelector
            if(const SalomeApp_SVTKDataOwner* anOwner = dynamic_cast<const SalomeApp_SVTKDataOwner*>(aDataOwner)){
              aSelector->SetSelectionMode(anOwner->GetMode());
              Handle(SALOME_InteractiveObject) anIO = anOwner->IO();
-             aSelector->AddIObject(anIO);
+             if( anOwner->GetActor() )
+               aSelector->AddIObject( anOwner->GetActor() );
+             else
+               aSelector->AddIObject(anIO);
              anAppendList.Append(anIO);
              aSelector->AddOrRemoveIndex(anIO,anOwner->GetIds(),false);
              if(MYDEBUG) MESSAGE("VTKSelector::setSelection - SVTKDataOwner - "<<anIO->getEntry());
@@ -144,20 +146,6 @@ SalomeApp_VTKSelector
          for( ; anIt.More(); anIt.Next() )
            toRemove.remove( anIt.Value()->getEntry() );
 
-
-/*       SALOME_ListIO aRemoveList;
-         SALOME_ListIteratorOfListIO anAppendListIter(anAppendList);
-         for(; anAppendListIter.More(); anAppendListIter.Next()){
-           Handle(SALOME_InteractiveObject) anIO = anAppendListIter.Value();
-           SALOME_ListIteratorOfListIO aStoredListIter(aStoredList);
-           for(; aStoredListIter.More(); aStoredListIter.Next()){
-             if(anIO->isSame(aStoredListIter.Value())){
-               aRemoveList.Append(anIO);
-             }
-           }
-         }
-         SALOME_ListIteratorOfListIO aRemoveListIter(aRemoveList);*/
-
          QMap< QString, Handle( SALOME_InteractiveObject )>::const_iterator RIt = toRemove.begin(),
                                                                             REnd = toRemove.end();
          for( ; RIt!=REnd; RIt++ )