Move MakeBrick*.py to examples module for availability for testing.

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

diff --git a/src/GeomValidators/GeomValidators_Positive.cpp b/src/GeomValidators/GeomValidators_Positive.cpp
index 9d3fbf983cbb233da6fbd89d8ee71c3aae325a99..344cfe08d76369b799e9f6e59cef947ae670e341 100644 (file)
--- a/src/GeomValidators/GeomValidators_Positive.cpp
+++ b/src/GeomValidators/GeomValidators_Positive.cpp
@@ -21,14 +21,35 @@ 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,
+                                      std::string& theError) const
 {
-  AttributeDoublePtr aDouble = 
-    std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(theAttribute);
-  if (aDouble.get())
-    return aDouble->isInitialized() && aDouble->value() > 1.e-5;
-  AttributeIntegerPtr aInteger = 
-    std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(theAttribute);
-  return aInteger->isInitialized() && aInteger->value() > 0;
+  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() <= 1.e-5) {
+      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() <= 0) {
+      theError = "Integer is not positive.";
+      return false;
+    }
+  }
+
+  return true;
 }