-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019 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
-// version 2.1 of the License.
+// 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
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementation of SMESH idl descriptions
// File : SMESH_HypoFilter.hxx
// Module : SMESH
//
// Create and add predicates.
// Added predicates will be destroyed by filter when it dies
SMESH_HypoFilter();
- SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
- // notNagate==false means !aPredicate->IsOk()
- SMESH_HypoFilter & Init ( SMESH_HypoPredicate* aPredicate, bool notNagate = true );
+ explicit SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNegate = true );
+ // notNegate==false means !aPredicate->IsOk()
+ SMESH_HypoFilter & Init ( SMESH_HypoPredicate* aPredicate, bool notNegate = true );
SMESH_HypoFilter & And ( SMESH_HypoPredicate* aPredicate );
SMESH_HypoFilter & AndNot( SMESH_HypoPredicate* aPredicate );
SMESH_HypoFilter & Or ( SMESH_HypoPredicate* aPredicate );
static SMESH_HypoPredicate* HasDim(const int theDim);
static SMESH_HypoPredicate* HasType(const int theHypType);
- bool IsEmpty() const { return myPredicates.empty(); }
+ bool IsEmpty() const { return myNbPredicates == 0; }
/*!
* \brief check aHyp or/and aShape it is assigned to
/*!
* \brief return true if contains no predicates
*/
- bool IsAny() const { return myPredicates.empty(); }
+ bool IsAny() const { return myNbPredicates > 0; }
~SMESH_HypoFilter();
protected:
// fields
- std::list<SMESH_HypoPredicate*> myPredicates;
+ //std::list<SMESH_HypoPredicate*> myPredicates;
+ SMESH_HypoPredicate* myPredicates[100];
+ int myNbPredicates;
// private methods
{
if ( pred ) {
pred->_logical_op = bool_op;
- myPredicates.push_back( pred );
+ myPredicates[ myNbPredicates++ ] = pred;
}
}