X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_NumberOfSegments.cxx;h=d9d1362d046184be57b39db0c8b867d327951ab0;hb=664466f7169f333ce66617cc06f080a73d7f818c;hp=ce4876ee3b779cda81f06acdee94178b5c84b5b3;hpb=2daa321efae3d0c6ce41199fa5a2482630d505d9;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
index ce4876ee3..d9d1362d0 100644
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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.
 //
-//  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
 //  File   : StdMeshers_NumberOfSegments.cxx
 //           Moved here from SMESH_NumberOfSegments.cxx
@@ -30,6 +31,7 @@
 #include "StdMeshers_Distribution.hxx"
 #include "SMESHDS_SubMesh.hxx"
 #include "SMESH_Mesh.hxx"
+#include "SMESH_Comment.hxx"
 
 #include <ExprIntrp_GenExp.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
@@ -393,8 +395,27 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
     _distrType = DT_ExprFunc;
     //throw SALOME_Exception(LOCALIZED("not an expression function distribution"));
 
+  string func = CheckExpressionFunction( expr, _convMode );
+  if( _func != func )
+  {
+    _func = func;
+    NotifySubMeshesHypothesisModification();
+  }
+}
+
+//=======================================================================
+//function : CheckExpressionFunction
+//purpose  : Checks validity of  the expression of the function f(t), e.g. "sin(t)".
+//           In case of validity returns a cleaned expression
+//=======================================================================
+
+std::string
+StdMeshers_NumberOfSegments::CheckExpressionFunction( const std::string& expr,
+                                                      const int          convMode)
+    throw (SALOME_Exception)
+{
   // remove white spaces
-  TCollection_AsciiString str((Standard_CString)expr);
+  TCollection_AsciiString str((Standard_CString)expr.c_str());
   str.RemoveAll(' ');
   str.RemoveAll('\t');
   str.RemoveAll('\r');
@@ -402,15 +423,15 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
 
   bool syntax, args, non_neg, singulars, non_zero;
   double sing_point;
-  bool res = process( str, _convMode, syntax, args, non_neg, non_zero, singulars, sing_point );
+  bool res = process( str, convMode, syntax, args, non_neg, non_zero, singulars, sing_point );
   if( !res )
   {
     if( !syntax )
-      throw SALOME_Exception(LOCALIZED("invalid expression syntax"));
+      throw SALOME_Exception(SMESH_Comment("invalid expression syntax: ") << str );
     if( !args )
       throw SALOME_Exception(LOCALIZED("only 't' may be used as function argument"));
     if( !non_neg )
-      throw SALOME_Exception(LOCALIZED("only non-negative function can be used as density"));
+      throw SALOME_Exception(LOCALIZED("only non-negative function can be used"));
     if( singulars )
     {
       char buf[1024];
@@ -418,17 +439,10 @@ void StdMeshers_NumberOfSegments::SetExpressionFunction(const char* expr)
       throw SALOME_Exception( buf );
     }
     if( !non_zero )
-      throw SALOME_Exception(LOCALIZED("f(t)=0 cannot be used as density"));
-
-    return;
-  }
-  
-  string func = expr;
-  if( _func != func )
-  {
-    _func = func;
-    NotifySubMeshesHypothesisModification();
+      throw SALOME_Exception(LOCALIZED("f(t)=0 cannot be used"));
   }
+ 
+  return str.ToCString();
 }
 
 //================================================================================