X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_Positive.cpp;h=17c38fb19035600799d5bb7808f814aa15b43347;hb=b67410b7e66bb035081015af2245b62223510474;hp=58964c04f985a1ce4f9afc8bedd3c83f8ebc6926;hpb=7bf19255421b34594c7b0a76d0ce28166d0ce895;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_Positive.cpp b/src/GeomValidators/GeomValidators_Positive.cpp
index 58964c04f..17c38fb19 100644
--- a/src/GeomValidators/GeomValidators_Positive.cpp
+++ b/src/GeomValidators/GeomValidators_Positive.cpp
@@ -5,10 +5,16 @@
 // Author:      Mikhail PONIKAROV
 
 #include "GeomValidators_Positive.h"
+
+#include <Events_InfoMessage.h>
+
 #include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
 
+#include <cmath>
+
 /// Global instance for validators factory
 GeomValidators_Positive MY_POSITIVE_INSTANCE;
 
@@ -20,10 +26,46 @@ GeomValidators_Positive::GeomValidators_Positive()
   aFactory->registerValidator("GeomValidators_Positive", this);
 }
 
-bool GeomValidators_Positive::isValid(
-    const AttributePtr& theAttribute, const std::list<std::string>& theArguments) const
+bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute, 
+                                      const std::list<std::string>& theArguments,
+                                      Events_InfoMessage& theError) const
 {
-  std::shared_ptr<ModelAPI_AttributeDouble> aDouble = 
-    std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(theAttribute);
-  return aDouble->isInitialized() && aDouble->value() > 1.e-5;
+  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) {
+      // very probably ok
+      aMinValue = aValue;
+    }
+  }
+
+  if (theAttribute->attributeType() == ModelAPI_AttributeDouble::typeId()) {
+    AttributeDoublePtr aDouble =
+        std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(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<ModelAPI_AttributeInteger>(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;
 }