Merge from V6_main_20120808 08Aug12

[modules/gui.git] / src / SVTK / SVTK_Functor.h

diff --git a/src/SVTK/SVTK_Functor.h b/src/SVTK/SVTK_Functor.h
index eab12cb14a4542935abfe152c7b6da33a323a447..1db773d15695cd3809fa3f31da4769b5a1f8793c 100644 (file)
--- a/src/SVTK/SVTK_Functor.h
+++ b/src/SVTK/SVTK_Functor.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef SVTK_Functor_H
 #define SVTK_Functor_H
 
@@ -28,8 +29,8 @@
 
 #include <VTKViewer_Functor.h>
 
-#include "SALOME_InteractiveObject.hxx"
-
+#include <SALOME_InteractiveObject.hxx>
+#include <SALOME_ListIO.hxx>
 /*!
   \file SVTK_Functor.h
   This file contains numbers of functors that allows user to perform corresponding operations with existing presentations.
@@ -54,9 +55,9 @@ namespace SVTK
     {
       if ( theActor->hasIO() )
       {
-       Handle(SALOME_InteractiveObject) anIO = theActor->getIO();
-       if ( anIO->hasEntry() )
-         return myEntry == anIO->getEntry();
+        Handle(SALOME_InteractiveObject) anIO = theActor->getIO();
+        if ( anIO->hasEntry() )
+          return myEntry == anIO->getEntry();
       }
       return false;
     }
@@ -78,8 +79,8 @@ namespace SVTK
     {
       if(theActor->hasIO())
       {
-       Handle(SALOME_InteractiveObject) anIO = theActor->getIO();
-       return myIObject->isSame(anIO);
+        Handle(SALOME_InteractiveObject) anIO = theActor->getIO();
+        return myIObject->isSame(anIO);
       }
       return false;
     }
@@ -102,10 +103,29 @@ namespace SVTK
     void operator()(TActor* theActor) 
     {
       if(theActor->GetVisibility() && theActor->GetMapper())
-       theActor->highlight( myIsHighlight );
+        theActor->highlight( myIsHighlight );
     }
   };
 
+
+  //----------------------------------------------------------------
+  /*!
+    This collect visible IO in list
+  */
+  template<class TActor> 
+    struct TCollectIfVisible
+    {
+      SALOME_ListIO& myList;
+      //! To construct the functor
+      TCollectIfVisible (SALOME_ListIO& theList) : myList(theList)
+      {}
+      //! To calculate the functor
+      void operator()(TActor* theActor) 
+      {
+       if(theActor->GetVisibility() && theActor->hasIO())
+         myList.Append( theActor->getIO() );
+      }
+    };
 }