X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHFiltersSelection%2FSMESH_LogicalFilter.cxx;h=033c5fb24882bf2d522b44a5c64981157ae283e4;hb=a0880e7c367025142b27c4669968a7611837c5a9;hp=47b6356aed42a6d6ebc634da81101d484c02279f;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx index 47b6356ae..033c5fb24 100644 --- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx +++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.cxx @@ -1,49 +1,41 @@ -// SALOME SALOMEGUI : implementation of desktop and GUI kernel +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 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 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 -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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, 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. +// +// 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 -// Author : Sergey LITONIN // Module : SMESH - +// #include "SMESH_LogicalFilter.hxx" -/* - Class : SMESH_LogicalFilter - Description : Filter for combaining several filters with logical operation (OR or AND) -*/ - -IMPLEMENT_STANDARD_HANDLE( SMESH_LogicalFilter, SALOME_Filter ) -IMPLEMENT_STANDARD_RTTIEXT( SMESH_LogicalFilter, SALOME_Filter ) - //======================================================================= // name : SMESH_LogicalFilter::SMESH_LogicalFilter // Purpose : Constructor //======================================================================= -SMESH_LogicalFilter::SMESH_LogicalFilter( const SMESH_ListOfFilter& theFilters, - const int theLogOp ) +SMESH_LogicalFilter::SMESH_LogicalFilter (const QList& theFilters, + const int theLogOp, + bool takeOwnership) + : myOwnership( takeOwnership ) { - myFilters = theFilters; - myLogOp = theLogOp; + setFilters(theFilters); + setOperation(theLogOp); } //======================================================================= @@ -52,97 +44,77 @@ SMESH_LogicalFilter::SMESH_LogicalFilter( const SMESH_ListOfFilter& theFilters, //======================================================================= SMESH_LogicalFilter::~SMESH_LogicalFilter() { + deleteFilters(); } //======================================================================= // name : SMESH_LogicalFilter::IsOk // Purpose : Verify validity of entry object //======================================================================= -Standard_Boolean SMESH_LogicalFilter::IsOk( const Handle(SALOME_InteractiveObject)& theIO ) const +bool SMESH_LogicalFilter::isOk (const SUIT_DataOwner* owner) const { - SMESH_ListOfFilter::Iterator anIter( myFilters ); - for ( ; anIter.More(); anIter.Next() ) + SUIT_SelectionFilter* filter; + foreach( filter, myFilters ) { - Handle(SALOME_Filter) aFilter = anIter.Value(); - if ( !aFilter.IsNull() ) - { - if ( myLogOp == LO_OR && anIter.Value()->IsOk( theIO ) ) - return true; - if ( myLogOp == LO_AND && !anIter.Value()->IsOk( theIO ) ) - return false; - } + if (myOperation == LO_OR && filter->isOk(owner)) + return true; + if (myOperation == LO_AND && !filter->isOk(owner)) + return false; + if (myOperation == LO_NOT) + return !filter->isOk(owner); } - return myLogOp == LO_OR ? false : true; + return (myOperation != LO_OR); } //======================================================================= -// name : SMESH_LogicalFilter::SetFilters +// name : SMESH_LogicalFilter::setFilters // Purpose : Set new list of filters. Old wilters are removed //======================================================================= -void SMESH_LogicalFilter::SetFilters( const SMESH_ListOfFilter& theFilters ) +void SMESH_LogicalFilter::setFilters (const QList& theFilters) { + deleteFilters(); myFilters = theFilters; } //======================================================================= -// name : SMESH_LogicalFilter::SetLogOp +// name : SMESH_LogicalFilter::setOperation // Purpose : Set logical operation //======================================================================= -void SMESH_LogicalFilter::SetLogOp( const int theLogOp ) +void SMESH_LogicalFilter::setOperation (const int theLogOp) { - myLogOp = theLogOp; + myOperation = theLogOp; } //======================================================================= -// name : SMESH_LogicalFilter::GetFilters +// name : SMESH_LogicalFilter::getFilters // Purpose : Get list of filters //======================================================================= -const SMESH_ListOfFilter& SMESH_LogicalFilter::GetFilters() const +const QList SMESH_LogicalFilter::getFilters() const { return myFilters; } //======================================================================= -// name : SMESH_LogicalFilter::GetLogOp +// name : SMESH_LogicalFilter::getOperation // Purpose : Get logical operation //======================================================================= -int SMESH_LogicalFilter::GetLogOp() const +int SMESH_LogicalFilter::getOperation() const { - return myLogOp; + return myOperation; } +//================================================================================ +/*! + * \brief Deletes filters if has an ownership + */ +//================================================================================ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +void SMESH_LogicalFilter::deleteFilters() +{ + if ( myOwnership ) + { + SUIT_SelectionFilter* filter; + foreach( filter, myFilters ) + delete filter; + } +}