X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_NumberOfSegments.hxx;h=c726488ea083c1f2cde2a7b1080074dfcf4c3e01;hb=f5e84513cda0eda53672cc9d3b1124323b4aa26d;hp=1be5b9176f61929055bdee75e90807b0f9d56e1f;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx index 1be5b9176..c726488ea 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx @@ -1,25 +1,26 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 // -// 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 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, 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 -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH : implementaion of SMESH idl descriptions + +// SMESH SMESH : implementation of SMESH idl descriptions // File : StdMeshers_NumberOfSegments.hxx // Moved here from SMESH_NumberOfSegments.hxx // Author : Paul RASCLE, EDF @@ -28,10 +29,10 @@ #ifndef _SMESH_NUMBEROFSEGMENTS_HXX_ #define _SMESH_NUMBEROFSEGMENTS_HXX_ -#include "SMESH_StdMeshers.hxx" - +#include "StdMeshers_Reversible1D.hxx" #include "SMESH_Hypothesis.hxx" #include "Utils_SALOME_Exception.hxx" + #include /*! @@ -40,23 +41,21 @@ * It provides parameters for subdivision an edge by various * distribution types, considering the given number of resulting segments */ -class STDMESHERS_EXPORT StdMeshers_NumberOfSegments: - public SMESH_Hypothesis +class STDMESHERS_EXPORT StdMeshers_NumberOfSegments: public StdMeshers_Reversible1D { public: - StdMeshers_NumberOfSegments(int hypId, int studyId, SMESH_Gen* gen); + StdMeshers_NumberOfSegments(int hypId, SMESH_Gen* gen); virtual ~StdMeshers_NumberOfSegments(); // Builds point distribution according to passed function - const std::vector& BuildDistributionExpr( const char*, int, int ) throw ( SALOME_Exception ); - const std::vector& BuildDistributionTab( const std::vector&, int, int ) throw ( SALOME_Exception ); + const std::vector& BuildDistributionExpr( const char*, int, int ); + const std::vector& BuildDistributionTab( const std::vector&, int, int ); /*! * \brief Set the number of segments * \param segmentsNumber - must be greater than zero */ - void SetNumberOfSegments(int segmentsNumber) - throw (SALOME_Exception); + void SetNumberOfSegments(int segmentsNumber); /*! * \brief Get the number of segments @@ -77,8 +76,7 @@ public: /*! * \brief Set distribution type */ - void SetDistrType(DistrType typ) - throw (SALOME_Exception); + void SetDistrType(DistrType typ); /*! * \brief Get distribution type @@ -92,16 +90,14 @@ public: * Throws SALOME_Exception if distribution type is not DT_Scale, * or scaleFactor is not a positive value different from 1 */ - virtual void SetScaleFactor(double scaleFactor) - throw (SALOME_Exception); + virtual void SetScaleFactor(double scaleFactor); /*! * \brief Get scale factor for scale distribution * * Throws SALOME_Exception if distribution type is not DT_Scale */ - double GetScaleFactor() const - throw (SALOME_Exception); + double GetScaleFactor() const; /*! * \brief Set table function for distribution DT_TabFunc @@ -112,16 +108,14 @@ public: * * Throws SALOME_Exception if distribution type is not DT_TabFunc */ - void SetTableFunction(const std::vector& table) - throw (SALOME_Exception); + void SetTableFunction(const std::vector& table); /*! * \brief Get table function for distribution DT_TabFunc * * Throws SALOME_Exception if distribution type is not DT_TabFunc */ - const std::vector& GetTableFunction() const - throw (SALOME_Exception); + const std::vector& GetTableFunction() const; /*! * \brief Set expression function for distribution DT_ExprFunc @@ -130,16 +124,22 @@ public: * * Throws SALOME_Exception if distribution type is not DT_ExprFunc */ - void SetExpressionFunction( const char* expr) - throw (SALOME_Exception); + void SetExpressionFunction( const char* expr); /*! * \brief Get expression function for distribution DT_ExprFunc * * Throws SALOME_Exception if distribution type is not DT_ExprFunc */ - const char* GetExpressionFunction() const - throw (SALOME_Exception); + const char* GetExpressionFunction() const; + + /*! + * \brief Checks validity of the expression of the function f(t), e.g. "sin(t)". + * In case of validity returns a cleaned expression + * \param convMode - 0 for "Exponent mode", 1 for "Cut negative mode" + */ + static std::string CheckExpressionFunction( const std::string& expr, + const int convMode); /*! * \brief Set conversion mode. When it is 0, it means "exponent mode": @@ -150,17 +150,14 @@ public: * * Throws SALOME_Exception if distribution type is not functional */ - void SetConversionMode( int conv ) - throw (SALOME_Exception); + void SetConversionMode( int conv ); /*! * \brief Returns conversion mode * * Throws SALOME_Exception if distribution type is not functional */ - int ConversionMode() const - throw (SALOME_Exception); - + int ConversionMode() const; /*! * \brief Initialize number of segments by the mesh built on the geometry