0021014: EDF 1583 SMESH: Improvement of the Python Dump for the creation of groups

Move definition of abstract classes Functor and Predicate from
   SMESH_ControlsDef.hxx to SMESH_Controls.hxx
This commit is contained in:
eap 2011-06-23 12:10:32 +00:00
parent ec36250a0d
commit d73cacdd51
2 changed files with 36 additions and 36 deletions

View File

@ -23,24 +23,57 @@
#ifndef _SMESH_CONTROLS_HXX_ #ifndef _SMESH_CONTROLS_HXX_
#define _SMESH_CONTROLS_HXX_ #define _SMESH_CONTROLS_HXX_
#include "SMDSAbs_ElementType.hxx"
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#ifdef WNT
#if defined SMESHCONTROLS_EXPORTS || defined SMESHControls_EXPORTS
#define SMESHCONTROLS_EXPORT __declspec( dllexport )
#else
#define SMESHCONTROLS_EXPORT __declspec( dllimport )
#endif
#else
#define SMESHCONTROLS_EXPORT
#endif
class SMDS_Mesh;
namespace SMESH{ namespace SMESH{
namespace Controls{ namespace Controls{
class Functor; /*
Class : Functor
Description : Root of all Functors
*/
class SMESHCONTROLS_EXPORT Functor
{
public:
~Functor(){}
virtual void SetMesh( const SMDS_Mesh* theMesh ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
};
typedef boost::shared_ptr<Functor> FunctorPtr; typedef boost::shared_ptr<Functor> FunctorPtr;
class NumericalFunctor; class NumericalFunctor;
typedef boost::shared_ptr<NumericalFunctor> NumericalFunctorPtr; typedef boost::shared_ptr<NumericalFunctor> NumericalFunctorPtr;
/*
class Predicate; Class : Predicate
Description : Base class for all predicates
*/
class SMESHCONTROLS_EXPORT Predicate: public virtual Functor{
public:
virtual bool IsSatisfy( long theElementId ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
};
typedef boost::shared_ptr<Predicate> PredicatePtr; typedef boost::shared_ptr<Predicate> PredicatePtr;
} }
} }
typedef SMESH::Controls::PredicatePtr SMESH_PredicatePtr;
#endif #endif

View File

@ -46,16 +46,6 @@
#include "SMESH_Controls.hxx" #include "SMESH_Controls.hxx"
#ifdef WNT
#if defined SMESHCONTROLS_EXPORTS || defined SMESHControls_EXPORTS
#define SMESHCONTROLS_EXPORT __declspec( dllexport )
#else
#define SMESHCONTROLS_EXPORT __declspec( dllimport )
#endif
#else
#define SMESHCONTROLS_EXPORT
#endif
class SMDS_MeshElement; class SMDS_MeshElement;
class SMDS_MeshFace; class SMDS_MeshFace;
class SMDS_MeshNode; class SMDS_MeshNode;
@ -105,18 +95,6 @@ namespace SMESH{
std::vector<gp_XYZ> myArray; std::vector<gp_XYZ> myArray;
}; };
/*
Class : Functor
Description : Root of all Functors
*/
class SMESHCONTROLS_EXPORT Functor
{
public:
~Functor(){}
virtual void SetMesh( const SMDS_Mesh* theMesh ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
};
/* /*
Class : NumericalFunctor Class : NumericalFunctor
Description : Root of all Functors returning numeric value Description : Root of all Functors returning numeric value
@ -341,17 +319,6 @@ namespace SMESH{
/* /*
PREDICATES PREDICATES
*/ */
/*
Class : Predicate
Description : Base class for all predicates
*/
class SMESHCONTROLS_EXPORT Predicate: public virtual Functor{
public:
virtual bool IsSatisfy( long theElementId ) = 0;
virtual SMDSAbs_ElementType GetType() const = 0;
};
/* /*
Class : FreeBorders Class : FreeBorders
Description : Predicate for free borders Description : Predicate for free borders