X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_Positive.cpp;h=225ea176e11e06881ae880d68f9e5e090b5ee114;hb=77ce6d35ac8d2f0fdaecb4f23e0870bf74e36103;hp=6737f289aaba4e180b893edfb664971858f2c7ee;hpb=423c10234142d14d0d5de89383f2f96a4ec5930f;p=modules%2Fshaper.git diff --git a/src/GeomValidators/GeomValidators_Positive.cpp b/src/GeomValidators/GeomValidators_Positive.cpp index 6737f289a..225ea176e 100644 --- a/src/GeomValidators/GeomValidators_Positive.cpp +++ b/src/GeomValidators/GeomValidators_Positive.cpp @@ -1,11 +1,25 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: GeomValidators_ValidatorPositive.cpp -// Created: 16 Sep 2014 -// Author: Mikhail PONIKAROV +// Copyright (C) 2014-2024 CEA, EDF +// +// 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 #include #include @@ -30,12 +44,11 @@ bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute, const std::list& theArguments, Events_InfoMessage& theError) const { - double aMinValue = 1.e-5; - if(theArguments.size() == 1) { + double aMinValue = 1.e-12; + if (theArguments.size() == 1) { std::list::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; } @@ -49,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; } } @@ -66,6 +79,5 @@ bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute, return false; } } - return true; }