X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_FeatureValidator.cpp;h=885259852ee090b8061e310eac6597de176cb7fd;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=dd28371d775ffb84868fe277c2a7d6f6e7ca94b8;hpb=acb6de53b1f2772495327f3cceafda0f6b6d5679;p=modules%2Fshaper.git

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index dd28371d7..885259852 100644
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -1,30 +1,80 @@
-// File:        Model_FeatureValidator.cpp
-// Created:     8 Jul 2014
-// Author:      Vitaly SMETANNIKOV
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #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 <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,
+                                     Events_InfoMessage& 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()) {
+        // TODO(spo): exceptional case for translation
+        theError = "Attribute \"" + anAttr->id() + "\" is not initialized.";
+//        theError.arg(anAttr->id());
+        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();
+}