A unit test for the issue #1799

[modules/shaper.git] / src / Model / Model_FeatureValidator.cpp

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index 9f3ab4a1305e9dd08e70a551a58eb4c160c10eb4..eab3761b1afae4cef4db4961a51dabcb45d103bf 100644 (file)
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -1,36 +1,52 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_FeatureValidator.cpp
 // Created:     8 Jul 2014
 // Author:      Vitaly SMETANNIKOV
 
 #include <Model_FeatureValidator.h>
+
+#include <Events_InfoMessage.h>
+
+#include <Model_Validator.h>
 #include <ModelAPI_Attribute.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Object.h>
+#include <ModelAPI_Session.h>
 
 #include <list>
 #include <memory>
 
 bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-  const std::list<std::string>& theArguments) const
+                                     const std::list<std::string>& theArguments,
+                                     Events_InfoMessage& theError) const
 {
+  static Model_ValidatorsFactory* aValidators =
+    static_cast<Model_ValidatorsFactory*>(ModelAPI_Session::get()->validators());
+
   std::shared_ptr<ModelAPI_Data> aData = theFeature->data();
-  // "Action" features has no data, but still valid. e.g "Remove Part"  
-  if (!aData) {
+  // "Action" features has no data, but still valid. e.g "Remove Part"
+  if (!aData->isValid()) {
+    if (!theFeature->isAction())
+      theError = "There is no data.";
     return theFeature->isAction();
   }
-  if (!aData->isValid())
-    return false;
   const std::string kAllTypes = "";
   std::list<std::string> aLtAttributes = aData->attributesIDs(kAllTypes);
   std::list<std::string>::iterator it = aLtAttributes.begin();
   for (; it != aLtAttributes.end(); it++) {
     AttributePtr anAttr = aData->attribute(*it);
-    if (!anAttr->isInitialized()) {
-      std::map<std::string, std::set<std::string> >::const_iterator aFeatureFind = 
+    if (!aValidators->isCase(theFeature, anAttr->id()))
+      continue; // this attribute is not participated in the current case
+    if (!anAttr->isInitialized()) { // attribute is not initialized
+      std::map<std::string, std::set<std::string> >::const_iterator aFeatureFind =
         myNotObligatory.find(theFeature->getKind());
-      if (aFeatureFind == myNotObligatory.end() ||
+      if (aFeatureFind == myNotObligatory.end() || // and it is obligatory for filling
           aFeatureFind->second.find(*it) == aFeatureFind->second.end()) {
+        // TODO(spo): exceptional case for translation
+        theError = "Attribute \"" + anAttr->id() + "\" is not initialized.";
+//        theError.arg(anAttr->id());
         return false;
       }
     }