Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / ModelAPI / ModelAPI_Validator.h

diff --git a/src/ModelAPI/ModelAPI_Validator.h b/src/ModelAPI/ModelAPI_Validator.h
index cd73508d58ecb55d3b82e1590bacc6abe6b24a51..926ae886c1c9787b2374749efda0a127f091ecd0 100644 (file)
--- a/src/ModelAPI/ModelAPI_Validator.h
+++ b/src/ModelAPI/ModelAPI_Validator.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModelAPI_Validator.hxx
 // Created:     2 Jul 2014
 // Author:      Mikhail PONIKAROV
@@ -6,7 +8,8 @@
 #define ModelAPI_Validator_H_
 
 #include <ModelAPI.h>
-#include <boost/shared_ptr.hpp>
+#include <ModelAPI_Feature.h>
+#include <memory>
 #include <list>
 
 class ModelAPI_Feature;
@@ -31,11 +34,11 @@ class MODELAPI_EXPORT ModelAPI_Validator
   }
 };
 
-typedef boost::shared_ptr<ModelAPI_Validator> ValidatorPtr;
+typedef std::shared_ptr<ModelAPI_Validator> ValidatorPtr;
 
 /**\class ModelAPI_ValidatorsFactory
  * \ingroup DataModel
- * \breif Manages the registered validators
+ * \brief Manages the registered validators
  *
  * Allows to get a validator by the feature identifier and 
  * the attribute identifier (if attribute is validated).
@@ -77,12 +80,15 @@ class MODELAPI_EXPORT ModelAPI_ValidatorsFactory
   virtual const ModelAPI_Validator* validator(const std::string& theID) const = 0;
 
   /// Returns true if feature and all its attributes are valid.
-  virtual bool validate(const boost::shared_ptr<ModelAPI_Feature>& theFeature) const = 0;
+  virtual bool validate(const std::shared_ptr<ModelAPI_Feature>& theFeature) const = 0;
 
   /// register that this attribute in feature is not obligatory for the feature execution
   /// so, it is not needed for the standard validation mechanism
   virtual void registerNotObligatory(std::string theFeature, std::string theAttribute) = 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;
+
   /// register that this attribute conceals in the object browser
   /// all referenced features after execution
   virtual void registerConcealment(std::string theFeature, std::string theAttribute) = 0;
@@ -90,6 +96,13 @@ class MODELAPI_EXPORT ModelAPI_ValidatorsFactory
   /// Returns true that it was registered that attribute conceals the referenced result
   virtual bool isConcealed(std::string theFeature, std::string theAttribute) = 0;
 
+  /// Register the case-attribute: this attribute is checked only if its case is selected
+  virtual void registerCase(std::string theFeature, std::string theAttribute,
+    std::string theSwitchId, std::string theCaseId) = 0;
+
+ /// Returns true if the attribute must be checked (the case is selected)
+  virtual bool isCase(FeaturePtr theFeature, std::string theAttribute) = 0;
+
  protected:
   /// Get instance from Session
   ModelAPI_ValidatorsFactory()