0020511: EDF 1101 SMESH : Add CGNS to Mesh Format Supported

Move SMESH_Controls.hxx from src/Controls to avoid mutual
    dependency between SMESHDS and Controls
This commit is contained in:
eap 2011-08-10 09:58:51 +00:00
parent db1a1fcbb7
commit 4f20185178
2 changed files with 82 additions and 3 deletions

View File

@ -39,7 +39,8 @@ salomeinclude_HEADERS = \
SMESHDS_GroupOnGeom.hxx \
SMESHDS_GroupOnFilter.hxx \
SMESH_SMESHDS.hxx \
SMESHDS_DataMapOfShape.hxx
SMESHDS_DataMapOfShape.hxx \
SMESH_Controls.hxx
# Libraries targets
lib_LTLIBRARIES = libSMESHDS.la
@ -62,8 +63,7 @@ libSMESHDS_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \
$(VTK_INCLUDES) \
$(BOOST_CPPFLAGS) \
-I$(srcdir)/../SMDS \
-I$(srcdir)/../Controls
-I$(srcdir)/../SMDS
libSMESHDS_la_LDFLAGS = \
../SMDS/libSMDS.la \

View File

@ -0,0 +1,79 @@
// Copyright (C) 2007-2011 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.
//
// 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
//
#ifndef _SMESH_CONTROLS_HXX_
#define _SMESH_CONTROLS_HXX_
#include "SMDSAbs_ElementType.hxx"
#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 Controls{
/*
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;
class NumericalFunctor;
typedef boost::shared_ptr<NumericalFunctor> NumericalFunctorPtr;
/*
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 SMESH::Controls::PredicatePtr SMESH_PredicatePtr;
#endif