X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FGeomValidators%2FGeomValidators_Positive.cpp;h=13e9a0241e4bd6edf077998d133c4e5056e412d1;hb=d5d78920316491975a67f76578982b401cdfe71d;hp=b127ffe033a688edf64981f0c222287d5ea8cb71;hpb=90d765ec0ecfe95a0d4b011f1518dee27137007f;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_Positive.cpp b/src/GeomValidators/GeomValidators_Positive.cpp
index b127ffe03..13e9a0241 100644
--- a/src/GeomValidators/GeomValidators_Positive.cpp
+++ b/src/GeomValidators/GeomValidators_Positive.cpp
@@ -1,10 +1,27 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_ValidatorPositive.cpp
-// Created:     16 Sep 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// 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.
+//
+// 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
+//
 
 #include "GeomValidators_Positive.h"
+
+#include <Config_PropManager.h>
+#include <Events_InfoMessage.h>
+
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Session.h>
@@ -23,16 +40,15 @@ GeomValidators_Positive::GeomValidators_Positive()
   aFactory->registerValidator("GeomValidators_Positive", this);
 }
 
-bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute, 
+bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute,
                                       const std::list<std::string>& theArguments,
-                                      std::string& theError) const
+                                      Events_InfoMessage& theError) const
 {
   double aMinValue = 1.e-5;
   if(theArguments.size() == 1) {
     std::list<std::string>::const_iterator anIt = theArguments.begin();
-    char *aErr;
-    double aValue = strtod((*anIt).c_str(), &aErr);
-    if(*aErr == 0) {
+    double aValue = Config_PropManager::stringToDouble((*anIt).c_str());
+    if(aValue != 0) {
       // very probably ok
       aMinValue = aValue;
     }
@@ -46,7 +62,7 @@ bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute,
       return false;
     }
     if (aDouble->value() <= aMinValue) {
-      theError = "Double is not positive.";
+      theError = "Value is too small.";
       return false;
     }
   }