Multi column support for Object browser

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

diff --git a/src/SalomeApp/SalomeApp_VTKSelector.cxx b/src/SalomeApp/SalomeApp_VTKSelector.cxx
index a8832913d4353e9e40329912b85a2209bf0e98a6..3b3a8a30478f454bb1b2d157dcbb7563b501b27d 100644 (file)
--- a/src/SalomeApp/SalomeApp_VTKSelector.cxx
+++ b/src/SalomeApp/SalomeApp_VTKSelector.cxx
@@ -21,8 +21,7 @@ SalomeApp_SVTKDataOwner
                           const TColStd_IndexedMapOfInteger& theIds,
                           Selection_Mode theMode,
                           SALOME_Actor* theActor):
-  SalomeApp_DataOwner(theIO->getEntry()),
-  myIO(theIO),
+  SalomeApp_DataOwner( theIO ),
   mySelectionMode(theMode),
   myActor(theActor)
 {
@@ -114,23 +113,42 @@ SalomeApp_VTKSelector
     if(SUIT_ViewManager* aViewMgr = myViewer->getViewManager()){
       if(SVTK_ViewWindow* aView = dynamic_cast<SVTK_ViewWindow*>(aViewMgr->getActiveView())){
        if(SVTK_Selector* aSelector = aView->GetSelector()){
-         aSelector->ClearIObjects();
+         SALOME_ListIO anAppendList;
+         const SALOME_ListIO& aStoredList = aSelector->StoredIObjects();
          SUIT_DataOwnerPtrList::const_iterator anIter = theList.begin();
          for(; anIter != theList.end(); ++anIter){
            const SUIT_DataOwner* aDataOwner = (*anIter).get();
            if(const SalomeApp_SVTKDataOwner* anOwner = dynamic_cast<const SalomeApp_SVTKDataOwner*>(aDataOwner)){
              aSelector->SetSelectionMode(anOwner->GetMode());
-             Handle(SALOME_InteractiveObject) anIO = anOwner->GetIO();
+             Handle(SALOME_InteractiveObject) anIO = anOwner->IO();
              aSelector->AddIObject(anIO);
+             anAppendList.Append(anIO);
              aSelector->AddOrRemoveIndex(anIO,anOwner->GetIds(),false);
              if(MYDEBUG) MESSAGE("VTKSelector::setSelection - SVTKDataOwner - "<<anIO->getEntry());
            }else if(const SalomeApp_DataOwner* anOwner = dynamic_cast<const SalomeApp_DataOwner*>(aDataOwner)){
              Handle(SALOME_InteractiveObject) anIO = 
                new SALOME_InteractiveObject(anOwner->entry().latin1(),"");
              aSelector->AddIObject(anIO);
+             anAppendList.Append(anIO);
              if(MYDEBUG) MESSAGE("VTKSelector::setSelection - DataOwner - "<<anIO->getEntry());
            }
          }
+         // To remove IOs, which is not selected.
+         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);
+         for(; aRemoveListIter.More(); aRemoveListIter.Next()){
+           aSelector->RemoveIObject(aRemoveListIter.Value());
+         }
          aView->onSelectionChanged();
        }
       }