X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_FeatureValidator.cpp;h=303a465676c90fe08fc484e5a8689856d86db470;hb=45400ecc7d183dd2d2edb875bdb36f8fc031bc2c;hp=6e609dd5d706cfcb0a6c76729b8a9126f646ae76;hpb=4783f146b71a48c651523fcf0e12367bcf3d1fa8;p=modules%2Fshaper.git

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index 6e609dd5d..303a46567 100644
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -1,34 +1,47 @@
+// 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 <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,
+                                     std::string& theError) const
 {
+  static Model_ValidatorsFactory* aValidators = 
+    static_cast<Model_ValidatorsFactory*>(ModelAPI_Session::get()->validators());
+
   std::shared_ptr<ModelAPI_Data> aData = theFeature->data();
-  if (!aData)
-    return false;
-  if (!aData->isValid())
-    return false;
+  // "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<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()) {
+    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()) {
+        theError = "Attribute \"" + anAttr->id() + "\" is not initialized.";
         return false;
       }
     }
@@ -41,3 +54,9 @@ void Model_FeatureValidator::registerNotObligatory(std::string theFeature, std::
   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();
+}