0021891: EDF 2398 : Error when dumping a study with non historical mode

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

diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
index 8da846f0384592cccff2fb0f56ec087d14aa0be1..bcfa96bcb4eafaf28a1655b2371a7e416a63039e 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  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
@@ -30,7 +30,9 @@
 // Purpose : Constructor
 //=======================================================================
 SMESH_LogicalFilter::SMESH_LogicalFilter (const QList<SUIT_SelectionFilter*>& theFilters,
-                                          const int                           theLogOp)
+                                          const int                           theLogOp,
+                                          bool                                takeOwnership)
+  : myOwnership( takeOwnership )
 {
   setFilters(theFilters);
   setOperation(theLogOp);
@@ -42,6 +44,7 @@ SMESH_LogicalFilter::SMESH_LogicalFilter (const QList<SUIT_SelectionFilter*>& th
 //=======================================================================
 SMESH_LogicalFilter::~SMESH_LogicalFilter()
 {
+  deleteFilters();
 }
 
 //=======================================================================
@@ -70,6 +73,7 @@ bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const
 //=======================================================================
 void SMESH_LogicalFilter::setFilters (const QList<SUIT_SelectionFilter*>& theFilters)
 {
+  deleteFilters();
   myFilters = theFilters;
 }
 
@@ -99,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;
+  }
+}