X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_FeatureValidator.cpp;h=303a465676c90fe08fc484e5a8689856d86db470;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=dd28371d775ffb84868fe277c2a7d6f6e7ca94b8;hpb=0ae9b65878cc8fef5e30a35d9917faee46c4257d;p=modules%2Fshaper.git

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index dd28371d7..303a46567 100644
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -1,30 +1,62 @@
+// 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 <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 <boost/shared_ptr.hpp>
+#include <memory>
 
-bool Model_FeatureValidator::isValid(const boost::shared_ptr<ModelAPI_Feature>& theFeature,
-  const std::list<std::string>& theArguments) const
+bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
+                                     const std::list<std::string>& theArguments,
+                                     std::string& theError) const
 {
-  boost::shared_ptr<ModelAPI_Data> aData = theFeature->data();
-  if (!aData)
-    return false;
-  if (!aData->isValid())
-    return false;
+  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->isValid()) {
+    if (!theFeature->isAction())
+      theError = "There is no data.";
+    return theFeature->isAction();
+  }
   const std::string kAllTypes = "";
-  std::list<AttributePtr> aLtAttributes = aData->attributes(kAllTypes);
-  std::list<AttributePtr>::iterator it = aLtAttributes.begin();
+  std::list<std::string> aLtAttributes = aData->attributesIDs(kAllTypes);
+  std::list<std::string>::iterator it = aLtAttributes.begin();
   for (; it != aLtAttributes.end(); it++) {
-    if (!(*it)->isInitialized())
-      return false;
+    AttributePtr anAttr = aData->attribute(*it);
+    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() || // and it is obligatory for filling
+          aFeatureFind->second.find(*it) == aFeatureFind->second.end()) {
+        theError = "Attribute \"" + anAttr->id() + "\" is not initialized.";
+        return false;
+      }
+    }
   }
   return true;
 }
+
+void Model_FeatureValidator::registerNotObligatory(std::string theFeature, std::string theAttribute)
+{
+  std::set<std::string>& anAttrs = myNotObligatory[theFeature];
+  anAttrs.insert(theAttribute);
+}
+
+bool Model_FeatureValidator::isNotObligatory(std::string theFeature, std::string theAttribute)
+{
+  std::set<std::string>& anAttrs = myNotObligatory[theFeature];
+  return anAttrs.find(theAttribute) != anAttrs.end();
+}