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
Copyright update: 2016
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_HypoFilter.hxx
diff --git
a/src/SMESH/SMESH_HypoFilter.hxx
b/src/SMESH/SMESH_HypoFilter.hxx
index b4ace7d2a2434ed538024baf67ac90d6ab67b083..3b059c5f27a7c58aa224e1ee31b4e513892ac44c 100644
(file)
--- a/
src/SMESH/SMESH_HypoFilter.hxx
+++ b/
src/SMESH/SMESH_HypoFilter.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-59,9
+59,9
@@
class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
// Create and add predicates.
// Added predicates will be destroyed by filter when it dies
SMESH_HypoFilter();
// Create and add predicates.
// Added predicates will be destroyed by filter when it dies
SMESH_HypoFilter();
-
SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNa
gate = true );
- // notN
a
gate==false means !aPredicate->IsOk()
- SMESH_HypoFilter & Init ( SMESH_HypoPredicate* aPredicate, bool notN
a
gate = true );
+
explicit SMESH_HypoFilter( SMESH_HypoPredicate* aPredicate, bool notNe
gate = true );
+ // notN
e
gate==false means !aPredicate->IsOk()
+ SMESH_HypoFilter & Init ( SMESH_HypoPredicate* aPredicate, bool notN
e
gate = true );
SMESH_HypoFilter & And ( SMESH_HypoPredicate* aPredicate );
SMESH_HypoFilter & AndNot( SMESH_HypoPredicate* aPredicate );
SMESH_HypoFilter & Or ( SMESH_HypoPredicate* aPredicate );
SMESH_HypoFilter & And ( SMESH_HypoPredicate* aPredicate );
SMESH_HypoFilter & AndNot( SMESH_HypoPredicate* aPredicate );
SMESH_HypoFilter & Or ( SMESH_HypoPredicate* aPredicate );
@@
-80,7
+80,7
@@
class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
static SMESH_HypoPredicate* HasDim(const int theDim);
static SMESH_HypoPredicate* HasType(const int theHypType);
static SMESH_HypoPredicate* HasDim(const int theDim);
static SMESH_HypoPredicate* HasType(const int theHypType);
- bool IsEmpty() const { return my
Predicates.empty()
; }
+ bool IsEmpty() const { return my
NbPredicates == 0
; }
/*!
* \brief check aHyp or/and aShape it is assigned to
/*!
* \brief check aHyp or/and aShape it is assigned to
@@
-90,7
+90,7
@@
class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
/*!
* \brief return true if contains no predicates
*/
/*!
* \brief return true if contains no predicates
*/
- bool IsAny() const { return my
Predicates.empty()
; }
+ bool IsAny() const { return my
NbPredicates > 0
; }
~SMESH_HypoFilter();
~SMESH_HypoFilter();
@@
-98,7
+98,9
@@
class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
protected:
// fields
protected:
// fields
- std::list<SMESH_HypoPredicate*> myPredicates;
+ //std::list<SMESH_HypoPredicate*> myPredicates;
+ SMESH_HypoPredicate* myPredicates[100];
+ int myNbPredicates;
// private methods
// private methods
@@
-111,7
+113,7
@@
class SMESH_EXPORT SMESH_HypoFilter: public SMESH_HypoPredicate
{
if ( pred ) {
pred->_logical_op = bool_op;
{
if ( pred ) {
pred->_logical_op = bool_op;
- myPredicates
.push_back( pred )
;
+ myPredicates
[ myNbPredicates++ ] = pred
;
}
}
}
}