CCAR: optimize the method Display of SOCC_Viewer

Use AIS_InteractiveContext::IsDisplayed and AIS_InteractiveContext::IsInCollector instead
of getting all displayed objects and all objects in collector and looping on them
to find what objects are already displayed.

diff --git a/src/SOCC/SOCC_ViewModel.cxx b/src/SOCC/SOCC_ViewModel.cxx
index 4d8fa63cf3a3785e0951b37e47a45ae1e251b7ce..b9d6bd23b208dd5ee6cd748cffb27fd248be7a94 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.cxx
+++ b/src/SOCC/SOCC_ViewModel.cxx
@@ -335,13 +335,6 @@ void SOCC_Viewer::Display( const SALOME_OCCPrs* prs )
   // get context
   Handle (AIS_InteractiveContext) ic = getAISContext();
 
-  // get all displayed objects
-  AIS_ListOfInteractive List;
-  ic->DisplayedObjects( List );
-  // get objects in the collector
-  AIS_ListOfInteractive ListCollector;
-  ic->ObjectsInCollector( ListCollector );
-
   // get objects to be displayed
   AIS_ListOfInteractive anAISObjects;
   anOCCPrs->GetObjects( anAISObjects );
@@ -353,40 +346,23 @@ void SOCC_Viewer::Display( const SALOME_OCCPrs* prs )
     if ( !anAIS.IsNull() )
     {
       // try to find presentation in the viewer
-      bool bDisplayed = false;
-      AIS_ListIteratorOfListOfInteractive ite( List );
-      for ( ; ite.More(); ite.Next() )
-      {
-        // compare presentations by handles
-        // if the object is already displayed - nothing to do more
-        if ( ite.Value() == anAIS )
+
+      // if the object is already displayed - nothing to do more
+      if(ic->IsDisplayed(anAIS))
         {
           // Deactivate object if necessary
           if ( !anOCCPrs->ToActivate() )
             ic->Deactivate( anAIS );
-          bDisplayed = true;
-          break;
+          continue;
         }
-      }
-
-      if ( bDisplayed )
-        continue;
 
       // then try to find presentation in the collector
-      bDisplayed = false;
-      ite.Initialize( ListCollector );
-      for ( ; ite.More(); ite.Next() )
-      {
-        // compare presentations by handles
-        // if the object is in collector - display it
-        if ( ite.Value() == anAIS )
+      if(ic->IsInCollector(anAIS))
         {
           ic->DisplayFromCollector( anAIS, false );
-
           // Deactivate object if necessary
           if ( !anOCCPrs->ToActivate() )
             ic->Deactivate( anAIS );
-          bDisplayed = true;
 
           // Set visibility flag
           // Temporarily commented to avoid awful dependecy on SALOMEDS
@@ -399,11 +375,8 @@ void SOCC_Viewer::Display( const SALOME_OCCPrs* prs )
           //  if ( study )
           //    ToolsGUI::SetVisibility( study, anObj->getEntry(), true, this );
           //}
-          break;
+          continue;
         }
-      }
-      if ( bDisplayed )
-        continue;
 
       // if object is not displayed and not found in the collector - display it
       if ( anAIS->IsKind( STANDARD_TYPE(AIS_Trihedron) ) )