Merge from V6_main_20120808 08Aug12

[modules/smesh.git] / src / SMESHFiltersSelection / SMESH_LogicalFilter.cxx

diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
index 57cfea7579766e7bb92d977fb9198d597b7fc99f..bcfa96bcb4eafaf28a1655b2371a7e416a63039e 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
@@ -1,35 +1,40 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// 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
-// 
+//
 // 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 
+// 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 
+//
+// 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 
+// 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
 //
+
 //  File   : SMESH_LogicalFilter.cxx
 //  Module : SMESH
-
+//
 #include "SMESH_LogicalFilter.hxx"
 
 //=======================================================================
 // name    : SMESH_LogicalFilter::SMESH_LogicalFilter
 // Purpose : Constructor
 //=======================================================================
-SMESH_LogicalFilter::SMESH_LogicalFilter (const QPtrList<SUIT_SelectionFilter>& theFilters,
-                                          const int                             theLogOp)
+SMESH_LogicalFilter::SMESH_LogicalFilter (const QList<SUIT_SelectionFilter*>& theFilters,
+                                          const int                           theLogOp,
+                                          bool                                takeOwnership)
+  : myOwnership( takeOwnership )
 {
-  setFilters(theFilters); 
+  setFilters(theFilters);
   setOperation(theLogOp);
 }
 
@@ -39,6 +44,7 @@ SMESH_LogicalFilter::SMESH_LogicalFilter (const QPtrList<SUIT_SelectionFilter>&
 //=======================================================================
 SMESH_LogicalFilter::~SMESH_LogicalFilter()
 {
+  deleteFilters();
 }
 
 //=======================================================================
@@ -47,10 +53,8 @@ SMESH_LogicalFilter::~SMESH_LogicalFilter()
 //=======================================================================
 bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const
 {
-  bool res = true;
-  QPtrListIterator<SUIT_SelectionFilter> it (myFilters);
   SUIT_SelectionFilter* filter;
-  for (; ((filter = it.current()) != 0) && res; ++it)
+  foreach( filter, myFilters )
   {
     if (myOperation == LO_OR && filter->isOk(owner))
       return true;
@@ -67,8 +71,9 @@ bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const
 // name    : SMESH_LogicalFilter::setFilters
 // Purpose : Set new list of filters. Old wilters are removed
 //=======================================================================
-void SMESH_LogicalFilter::setFilters (const QPtrList<SUIT_SelectionFilter>& theFilters)
+void SMESH_LogicalFilter::setFilters (const QList<SUIT_SelectionFilter*>& theFilters)
 {
+  deleteFilters();
   myFilters = theFilters;
 }
 
@@ -85,7 +90,7 @@ void SMESH_LogicalFilter::setOperation (const int theLogOp)
 // name    : SMESH_LogicalFilter::getFilters
 // Purpose : Get list of filters
 //=======================================================================
-const QPtrList<SUIT_SelectionFilter> SMESH_LogicalFilter::getFilters() const
+const QList<SUIT_SelectionFilter*> SMESH_LogicalFilter::getFilters() const
 {
   return myFilters;
 }
@@ -98,3 +103,18 @@ int SMESH_LogicalFilter::getOperation() const
 {
   return myOperation;
 }
+//================================================================================
+/*!
+ * \brief Deletes filters if has an ownership
+ */
+//================================================================================
+
+void SMESH_LogicalFilter::deleteFilters()
+{
+  if ( myOwnership )
+  {
+    SUIT_SelectionFilter* filter;
+    foreach( filter, myFilters )
+      delete filter;
+  }
+}