Better management of errors.

[modules/shaper.git] / src / GeomValidators / GeomValidators_Positive.cpp

diff --git a/src/GeomValidators/GeomValidators_Positive.cpp b/src/GeomValidators/GeomValidators_Positive.cpp
index 935bce6b4eb52474bf29b01bd1599f760feb621c..6737f289aaba4e180b893edfb664971858f2c7ee 100644 (file)
--- a/src/GeomValidators/GeomValidators_Positive.cpp
+++ b/src/GeomValidators/GeomValidators_Positive.cpp
@@ -1,27 +1,71 @@
+// 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 <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_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<std::string>& theArguments) const
+bool GeomValidators_Positive::isValid(const AttributePtr& theAttribute,
+                                      const std::list<std::string>& theArguments,
+                                      Events_InfoMessage& theError) const
 {
-  boost::shared_ptr<ModelAPI_AttributeDouble> aDouble = 
-    boost::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;
 }