X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_FeatureValidator.h;h=e412301fec5dfbad8cda15b775f6c0f397eb7632;hb=bf4f4d92dd943361f8a86405e9287fffc8af7d56;hp=6ba52fd249ef956b7ea5971faba6c936b702b64c;hpb=e8f6a194e38ff95708bf0984081d9f4e7d9ab115;p=modules%2Fshaper.git

diff --git a/src/Model/Model_FeatureValidator.h b/src/Model/Model_FeatureValidator.h
index 6ba52fd24..e412301fe 100644
--- a/src/Model/Model_FeatureValidator.h
+++ b/src/Model/Model_FeatureValidator.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModelAPI_FeatureValidator.h
 // Created:     8 Jul 2014
 // Author:      Vitaly SMETANNIKOV
@@ -9,14 +11,35 @@
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_FeatureValidator.h>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <set>
+#include <map>
 
-class Model_FeatureValidator: public ModelAPI_FeatureValidator
+/**\class Model_FeatureValidator
+ * \ingroup DataModel
+ * \brief The geneneric validator for the whole feature.
+ *
+ * Can be redefined for some specific feature, but by default for each feature this validator is
+ * used: it checks each argument of the feature and if one of it is not valid (and obligatory),
+ * the hole feature is invalid.
+ */
+class Model_FeatureValidator : public ModelAPI_FeatureValidator
 {
+  // not obligatory attributes, not checked for initialization
+  std::map<std::string, std::set<std::string> > myNotObligatory;
 public:
   /// Returns true if feature and/or attributes are valid
   /// \param theFeature the validated feature
-  MODEL_EXPORT virtual bool isValid(const boost::shared_ptr<ModelAPI_Feature>& theFeature) const;
+  /// \param theArguments the arguments in the configuration file for this validator
+  /// \returns true if feature is valid
+  MODEL_EXPORT virtual bool isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
+    const std::list<std::string>& theArguments) const;
+
+  /// sets not obligatory attributes, not checked for initialization
+  virtual void registerNotObligatory(std::string theFeature, std::string theAttribute);
+
+  /// Returns true if the attribute in feature is not obligatory for the feature execution
+  virtual bool isNotObligatory(std::string theFeature, std::string theAttribute);
 };
 
 #endif