X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Distribution.hxx;h=2dafda44ba83c375cfa82b056a38c0df4c14ce92;hp=d1eabb5d0a56d3d04a793502174c7acbc78d23d5;hb=9d11375af40826e967ab2c3bcb77d1f9d439c90c;hpb=6b471bcc54cbeb90f0d977323db8c76d3d2cce09 diff --git a/src/StdMeshers/StdMeshers_Distribution.hxx b/src/StdMeshers/StdMeshers_Distribution.hxx index d1eabb5d0..2dafda44b 100644 --- a/src/StdMeshers/StdMeshers_Distribution.hxx +++ b/src/StdMeshers/StdMeshers_Distribution.hxx @@ -17,7 +17,7 @@ // 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -29,6 +29,8 @@ #ifndef _STD_MESHERS_DISTRIBUTION_HXX_ #define _STD_MESHERS_DISTRIBUTION_HXX_ +#include "SMESH_StdMeshers.hxx" + #include #include #include @@ -36,7 +38,7 @@ #include -class Function +class STDMESHERS_EXPORT Function { public: Function( const int ); @@ -48,7 +50,7 @@ private: int myConv; }; -class FunctionIntegral : public Function +class STDMESHERS_EXPORT FunctionIntegral : public Function { public: FunctionIntegral( const Function*, const double ); @@ -61,7 +63,7 @@ private: double myStart; }; -class FunctionTable : public Function +class STDMESHERS_EXPORT FunctionTable : public Function { public: FunctionTable( const std::vector&, const int ); @@ -84,12 +86,12 @@ private: std::vector myData; }; -class FunctionExpr : public Function, public math_Function +class STDMESHERS_EXPORT FunctionExpr : public Function, public math_Function { public: FunctionExpr( const char*, const int ); virtual ~FunctionExpr(); - virtual Standard_Boolean Value( Standard_Real, Standard_Real& ); + virtual Standard_Boolean Value( const Standard_Real, Standard_Real& ); virtual bool value( const double, double& ) const; virtual double integral( const double, const double ) const; @@ -99,14 +101,17 @@ private: TColStd_Array1OfReal myValues; }; +STDMESHERS_EXPORT bool buildDistribution( const Function& f, const double start, const double end, const int nbSeg, vector& data, const double eps ); +STDMESHERS_EXPORT bool buildDistribution( const TCollection_AsciiString& f, const int conv, const double start, const double end, const int nbSeg, vector& data, const double eps ); +STDMESHERS_EXPORT bool buildDistribution( const std::vector& f, const int conv, const double start, const double end, const int nbSeg, vector& data, const double eps );