Validators correction for merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

[modules/shaper.git] / src / PartSet / PartSet_Validators.h

diff --git a/src/PartSet/PartSet_Validators.h b/src/PartSet/PartSet_Validators.h
index be1bb0ef5c149fa4ea04866b636f62e49aaa74f0..eb9f8a06bd010532257cbcbe62c7c6a2454f53d5 100644 (file)
--- a/src/PartSet/PartSet_Validators.h
+++ b/src/PartSet/PartSet_Validators.h
@@ -11,8 +11,7 @@
 
 #include <ModuleBase_SelectionValidator.h>
 #include <ModuleBase_ISelection.h>
-#include <ModelAPI_RefAttrValidator.h>
-#include <ModelAPI_ResultValidator.h>
+#include <ModelAPI_AttributeValidator.h>
 
 /*
  * Selector validators
@@ -70,41 +69,34 @@ class PartSet_RigidValidator : public ModuleBase_SelectionValidator
 * \ingroup Validators
 * A validator which checks that objects selected for feature attributes are different (not the same)
 */
-class PartSet_DifferentObjectsValidator : public ModelAPI_RefAttrValidator
+class PartSet_DifferentObjectsValidator : public ModelAPI_AttributeValidator
 {
  public:
-   /// Returns True if the feature is valid
-   /// \param theFeature a feature to check
-   /// \param theArguments a list of arguments (names of attributes to check)
-   /// \param theObject a selected object
-  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
-                       const ObjectPtr& theObject) const;
-
-  //! Returns true if the attribute is good for the feature attribute
-  //! \param theFeature a feature to check
-  //! \param theArguments a list of arguments (names of attributes to check)
-  //! \param theAttribute an attribute
-  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
-                       const AttributePtr& theAttribute) const;
-
   //! Returns true if the attribute is good for the feature attribute
   //! \param theAttribute an attribute
   //! \param theArguments a list of arguments (names of attributes to check)
   virtual bool isValid(const AttributePtr& theAttribute,
                        const std::list<std::string>& theArguments) const;
+
+protected:
+  //! Checks whethe other feature attributes has a reference to the given attribute
+  //! \param theAttribute a source attribute to find object
+  //! \return a boolean value
+  bool featureHasReferences(const AttributePtr& theAttribute) const;
 };
 
 /**
 * \ingroup Validators
-* A Validator which validates tha selected object is a Sketch
+* A validator which checks that objects selected for feature attributes are different (not the same)
 */
-class PartSet_SketchValidator : public ModelAPI_ResultValidator
+class PartSet_SketchEntityValidator : public ModelAPI_AttributeValidator
 {
  public:
-   /// Returns True if the given object is a sketch
-   /// \param theObject an object
-  virtual bool isValid(const ObjectPtr theObject) const;
+  //! Returns true if the attribute is good for the feature attribute
+  //! \param theAttribute an attribute
+  //! \param theArguments a list of arguments (names of attributes to check)
+  virtual bool isValid(const AttributePtr& theAttribute,
+                       const std::list<std::string>& theArguments) const;
 };
 
-
 #endif