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
23382: [CEA 1981] Wrong mesh SMESH test
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESH_Controls.hxx
diff --git
a/src/SMESHDS/SMESH_Controls.hxx
b/src/SMESHDS/SMESH_Controls.hxx
index 28dda6dcba9ecd7f5ed8971ef2bea0b8796e47df..7534a681b4b36806e6995a3e8fe5db8920a3b57d 100644
(file)
--- a/
src/SMESHDS/SMESH_Controls.hxx
+++ b/
src/SMESHDS/SMESH_Controls.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-24,7
+24,8
@@
#define _SMESH_CONTROLS_HXX_
// This file is named incosistently with others, i.e. not SMESHDS_Controls.hxx,
#define _SMESH_CONTROLS_HXX_
// This file is named incosistently with others, i.e. not SMESHDS_Controls.hxx,
-// because it was moved from ../Controls/SMESH_Controls.hxx
+// because it was moved from ../Controls/SMESH_Controls.hxx.
+// It was moved here for the sake of SMESHDS_GroupOnFilter
#include "SMDSAbs_ElementType.hxx"
#include "SMDSAbs_ElementType.hxx"
@@
-42,17
+43,17
@@
class SMDS_Mesh;
class SMDS_Mesh;
-namespace SMESH{
- namespace Controls{
+namespace SMESH
{
+ namespace Controls
{
/*
Class : Functor
/*
Class : Functor
- Description : Root of all Functors
+ Description : Root of all Functors
defined in ../Controls/SMESH_ControlsDef.hxx
*/
class SMESHCONTROLS_EXPORT Functor
{
public:
*/
class SMESHCONTROLS_EXPORT Functor
{
public:
- ~Functor(){}
+
virtual
~Functor(){}
virtual void SetMesh( const SMDS_Mesh* theMesh ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
};
virtual void SetMesh( const SMDS_Mesh* theMesh ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
};
@@
-66,10
+67,11
@@
namespace SMESH{
Class : Predicate
Description : Base class for all predicates
*/
Class : Predicate
Description : Base class for all predicates
*/
- class SMESHCONTROLS_EXPORT Predicate: public virtual Functor{
+ class SMESHCONTROLS_EXPORT Predicate: public virtual Functor
{
public:
virtual bool IsSatisfy( long theElementId ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
public:
virtual bool IsSatisfy( long theElementId ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
+ virtual Predicate* clone() const { return 0; } // return a thread-safe copy of this
};
typedef boost::shared_ptr<Predicate> PredicatePtr;
};
typedef boost::shared_ptr<Predicate> PredicatePtr;