Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0022108: EDF 2547 SMESH: Duplicate elements only
[modules/smesh.git]
/
src
/
SMESHFiltersSelection
/
SMESH_LogicalFilter.hxx
diff --git
a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
index 6098656806f5b4c57b5e183f9d3063683a1aa5fe..ddaaeb9432e17d5624ceffeaa7901d07269549db 100644
(file)
--- a/
src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
+++ b/
src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
@@
-1,52
+1,60
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2013 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
// 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
// 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.
// 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.
//
// 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
//
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/
or email : webmaster.salome@opencascade.com
//
//
+
// File : SMESH_LogicalFilter.hxx
// Module : SMESH
// File : SMESH_LogicalFilter.hxx
// Module : SMESH
-
+//
#ifndef _SMESH_LogicalFilter_HeaderFile
#define _SMESH_LogicalFilter_HeaderFile
#ifndef _SMESH_LogicalFilter_HeaderFile
#define _SMESH_LogicalFilter_HeaderFile
+#include "SMESH_Type.h"
+
#include <SUIT_SelectionFilter.h>
#include <SUIT_SelectionFilter.h>
-#include <
qptrlist.h
>
+#include <
QList
>
-class SMESH_LogicalFilter : public SUIT_SelectionFilter
+class SMESH
FILTERSSELECTION_EXPORT SMESH
_LogicalFilter : public SUIT_SelectionFilter
{
public:
enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
public:
{
public:
enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
public:
- SMESH_LogicalFilter (const QPtrList<SUIT_SelectionFilter>&,
- const int);
+ SMESH_LogicalFilter( const QList<SUIT_SelectionFilter*>&, const int, bool takeOwnership=false );
virtual ~SMESH_LogicalFilter();
virtual bool isOk (const SUIT_DataOwner*) const;
virtual ~SMESH_LogicalFilter();
virtual bool isOk (const SUIT_DataOwner*) const;
- void setFilters (const Q
PtrList<SUIT_SelectionFilter
>&);
+ void setFilters (const Q
List<SUIT_SelectionFilter*
>&);
void setOperation (const int);
void setOperation (const int);
- const Q
PtrList<SUIT_SelectionFilter>
getFilters() const;
+ const Q
List<SUIT_SelectionFilter*>
getFilters() const;
int getOperation() const;
private:
int getOperation() const;
private:
- QPtrList<SUIT_SelectionFilter> myFilters;
- int myOperation;
+ void deleteFilters();
+
+private:
+ QList<SUIT_SelectionFilter*> myFilters;
+ int myOperation;
+ bool myOwnership;
};
#endif
};
#endif