X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_FeatureValidator.h;h=f051c1e0d4a27e23bf64baea4e3cf12f755a7b19;hb=506a83727ca8f8297fc1dcdf4ea40d7865c35450;hp=2023a66fc77a88ecd3a6166f17471d5e7209909e;hpb=72ccabc2a906e229fe487dfeae61d38f921927d0;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_FeatureValidator.h b/src/ModelAPI/ModelAPI_FeatureValidator.h
index 2023a66fc..f051c1e0d 100644
--- a/src/ModelAPI/ModelAPI_FeatureValidator.h
+++ b/src/ModelAPI/ModelAPI_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
@@ -8,15 +10,32 @@
 #include "ModelAPI.h"
 #include "ModelAPI_Validator.h"
 
-class MODELAPI_EXPORT ModelAPI_FeatureValidator: public ModelAPI_Validator
+/**\class ModelAPI_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 MODELAPI_EXPORT ModelAPI_FeatureValidator : public ModelAPI_Validator
 {
-public:
+ public:
+  /// Default constructor
+  ModelAPI_FeatureValidator();
+  /// Virtual destructor
+  virtual ~ModelAPI_FeatureValidator();
+
   /// Returns true if feature and/or attributes are valid
   /// \param theFeature the validated feature
-  /// \param theAttr the validated attribute ID, empty string of feature is validated
   /// \param theArguments list of string, feature attribute names: dependent attributes
-  virtual bool validate(const boost::shared_ptr<ModelAPI_Feature>& theFeature,
-    const std::string theAttr, std::list<std::string> theArguments) const = 0;
+  /// \param theError the error string message if validation fails
+  virtual bool isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
+                       const std::list<std::string>& theArguments,
+                       std::string& theError) const = 0;
+
+  /// Returns true if the attribute in feature is not obligatory for the feature execution
+  virtual bool isNotObligatory(std::string theFeature, std::string theAttribute) = 0;
 };
 
 #endif