X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_SetIterator.hxx;h=70a8a15ff934dd036e8c3cda4fccc5a6092f3840;hb=da78b9467b74750ae0f1c17c3fdc814d4abbc43e;hp=e76ea8ce569927f86030f8701bdb67f93cfe75f4;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_SetIterator.hxx b/src/SMDS/SMDS_SetIterator.hxx
index e76ea8ce5..70a8a15ff 100644
--- a/src/SMDS/SMDS_SetIterator.hxx
+++ b/src/SMDS/SMDS_SetIterator.hxx
@@ -1,27 +1,28 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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, 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
-//  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
 //
+
 //  SMESH SMDS : implementaion of Salome mesh data structure
 // File      : SMDS_SetIterator.hxx
-// Created   : Mon Feb 27 16:57:43 2006
+// Created   : Feb 27 2006
 // Author    : Edward AGAPOV (eap)
 //
 #ifndef SMDS_SetIterator_HeaderFile
@@ -29,12 +30,12 @@
 
 #include "SMDS_Iterator.hxx"
 
-///////////////////////////////////////////////////////////////////////////////
-/// Accessors to value pointed by iterator
-///////////////////////////////////////////////////////////////////////////////
-
 namespace SMDS {
 
+  ///////////////////////////////////////////////////////////////////////////////
+  /// Accessors to value pointed by iterator
+  ///////////////////////////////////////////////////////////////////////////////
+
   template<typename VALUE,typename VALUE_SET_ITERATOR>
   struct SimpleAccessor {
     static VALUE value(VALUE_SET_ITERATOR it) { return (VALUE) *it; }
@@ -49,6 +50,22 @@ namespace SMDS {
   struct ValueAccessor {
     static VALUE value(VALUE_SET_ITERATOR it) { return (VALUE) it->second; }
   };
+
+  ///////////////////////////////////////////////////////////////////////////////
+  /// Filters of value pointed by iterator
+  ///////////////////////////////////////////////////////////////////////////////
+
+  template <typename VALUE>
+  struct PassAllValueFilter
+  {
+    bool operator()(const VALUE& t ) { return true; }
+  };
+
+  template <typename VALUE>
+  struct NonNullFilter
+  {
+    bool operator()(const VALUE& t ) { return bool( t ); }
+  };
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -60,26 +77,43 @@ namespace SMDS {
 
 template<typename VALUE,
          typename VALUE_SET_ITERATOR,
-         typename ACCESOR=SMDS::SimpleAccessor<VALUE,VALUE_SET_ITERATOR> >
+         typename ACCESOR=SMDS::SimpleAccessor<VALUE,VALUE_SET_ITERATOR>,
+         typename VALUE_FILTER=SMDS::PassAllValueFilter<VALUE> >
 class SMDS_SetIterator : public SMDS_Iterator<VALUE>
 {
 protected:
   VALUE_SET_ITERATOR _beg, _end;
+  VALUE_FILTER _filter;
 public:
   SMDS_SetIterator(const VALUE_SET_ITERATOR & begin,
-                   const VALUE_SET_ITERATOR & end)
-  { init ( begin, end ); }
+                   const VALUE_SET_ITERATOR & end,
+                   const VALUE_FILTER&        filter=VALUE_FILTER())
+  { init ( begin, end, filter ); }
 
   /// Initialization
   virtual void init(const VALUE_SET_ITERATOR & begin,
-                    const VALUE_SET_ITERATOR & end)
-  { _beg = begin; _end = end; }
-
-  /// Return true if and only if there are other object in this iterator
-  virtual bool more() { return _beg != _end; }
-
+                    const VALUE_SET_ITERATOR & end,
+                    const VALUE_FILTER&        filter=VALUE_FILTER())
+  {
+    _beg = begin;
+    _end = end;
+    _filter = filter;
+    if ( more() && !_filter( ACCESOR::value( _beg )))
+      next();
+  }
+  /// Return true iff there are other object in this iterator
+  virtual bool more()
+  {
+    return _beg != _end;
+  }
   /// Return the current object and step to the next one
-  virtual VALUE next() { return ACCESOR::value( _beg++ ); }
+  virtual VALUE next()
+  {
+    VALUE ret = ACCESOR::value( _beg++ );
+    while ( more() && !_filter( ACCESOR::value( _beg )))
+      ++_beg;
+    return ret;
+  }
 };
 
 ///////////////////////////////////////////////////////////////////////////////