X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_Positive.cpp;h=b127ffe033a688edf64981f0c222287d5ea8cb71;hb=33c5fdce3cd63dd95a738439a0399dd982abcd73;hp=935bce6b4eb52474bf29b01bd1599f760feb621c;hpb=b2a34ee4bab2fe2d97f900cbdafcaf122344c46c;p=modules%2Fshaper.git diff --git a/src/GeomValidators/GeomValidators_Positive.cpp b/src/GeomValidators/GeomValidators_Positive.cpp index 935bce6b4..b127ffe03 100644 --- a/src/GeomValidators/GeomValidators_Positive.cpp +++ b/src/GeomValidators/GeomValidators_Positive.cpp @@ -1,27 +1,68 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: GeomValidators_ValidatorPositive.cpp // Created: 16 Sep 2014 // Author: Mikhail PONIKAROV #include "GeomValidators_Positive.h" #include +#include #include #include +#include + /// Global instance for validators factory -GeomValidators_Positive MY_INSTANCE; +GeomValidators_Positive MY_POSITIVE_INSTANCE; GeomValidators_Positive::GeomValidators_Positive() { // this validator is registered in the factory on this library loading SessionPtr aMgr = ModelAPI_Session::get(); ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); - aFactory->registerValidator("GeomValidators_Positive", &MY_INSTANCE); + aFactory->registerValidator("GeomValidators_Positive", this); } -bool GeomValidators_Positive::isValid( - const AttributePtr& theAttribute, const std::list& theArguments) const +bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute, + const std::list& theArguments, + std::string& theError) const { - boost::shared_ptr aDouble = - boost::dynamic_pointer_cast(theAttribute); - return aDouble->isInitialized() && aDouble->value() > 1.e-5; + double aMinValue = 1.e-5; + if(theArguments.size() == 1) { + std::list::const_iterator anIt = theArguments.begin(); + char *aErr; + double aValue = strtod((*anIt).c_str(), &aErr); + if(*aErr == 0) { + // very probably ok + aMinValue = aValue; + } + } + + if (theAttribute->attributeType() == ModelAPI_AttributeDouble::typeId()) { + AttributeDoublePtr aDouble = + std::dynamic_pointer_cast(theAttribute); + if (!aDouble->isInitialized()) { + theError = "Double is not initialized."; + return false; + } + if (aDouble->value() <= aMinValue) { + theError = "Double is not positive."; + return false; + } + } + + if (theAttribute->attributeType() == ModelAPI_AttributeInteger::typeId()) { + AttributeIntegerPtr aInteger = + std::dynamic_pointer_cast(theAttribute); + if (!aInteger->isInitialized()) { + theError = "Integer is not initialized."; + return false; + } + if (aInteger->value() <= floor(aMinValue)) { + theError = "Integer is not positive."; + return false; + } + } + + return true; }