X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Validators.h;h=0dc5f46195d640760a9d7c4b6b2f4a91a0ee8161;hb=f7a976b98d8cadadcb54a61e42ddb66e00759689;hp=1cb0f18f5a9323029c75a3cd3410411141063d21;hpb=83b022b15cfd77512967f4328484371e46c525ae;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_Validators.h b/src/PartSet/PartSet_Validators.h
index 1cb0f18f5..0dc5f4619 100644
--- a/src/PartSet/PartSet_Validators.h
+++ b/src/PartSet/PartSet_Validators.h
@@ -18,7 +18,7 @@
  * Selector validators
  */
 
-//! \ingroup Module
+//! \ingroup Validators
 //! A class to validate a selection for Distance constraint operation
 class PartSet_DistanceValidator : public ModuleBase_SelectionValidator
 {
@@ -26,7 +26,7 @@ class PartSet_DistanceValidator : public ModuleBase_SelectionValidator
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
-//! \ingroup Module
+//! \ingroup Validators
 //! A class to validate a selection for Length constraint operation
 class PartSet_LengthValidator : public ModuleBase_SelectionValidator
 {
@@ -34,7 +34,7 @@ class PartSet_LengthValidator : public ModuleBase_SelectionValidator
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
-//! \ingroup Module
+//! \ingroup Validators
 //! A class to validate a selection for Perpendicular constraint operation
 class PartSet_PerpendicularValidator : public ModuleBase_SelectionValidator
 {
@@ -42,7 +42,7 @@ class PartSet_PerpendicularValidator : public ModuleBase_SelectionValidator
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
-//! \ingroup Module
+//! \ingroup Validators
 //! A class to validate a selection for Perpendicular constraint operation
 class PartSet_ParallelValidator : public ModuleBase_SelectionValidator
 {
@@ -50,7 +50,7 @@ class PartSet_ParallelValidator : public ModuleBase_SelectionValidator
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
-//! \ingroup Module
+//! \ingroup Validators
 //! A class to validate a selection for Perpendicular constraint operation
 class PartSet_RadiusValidator : public ModuleBase_SelectionValidator
 {
@@ -58,7 +58,7 @@ class PartSet_RadiusValidator : public ModuleBase_SelectionValidator
   PARTSET_EXPORT virtual bool isValid(const ModuleBase_ISelection* theSelection) const;
 };
 
-//! \ingroup Module
+//! \ingroup Validators
 //! A class to validate a selection for Perpendicular constraint operation
 class PartSet_RigidValidator : public ModuleBase_SelectionValidator
 {
@@ -67,35 +67,32 @@ class PartSet_RigidValidator : public ModuleBase_SelectionValidator
 };
 
 /**
-* \ingroup Module
+* \ingroup Validators
 * A validator which checks that objects selected for feature attributes are different (not the same)
 */
 class PartSet_DifferentObjectsValidator : public ModelAPI_RefAttrValidator
 {
  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:
+  //! Casts the attribute to an attribute kind and obtains an object value if it is possible
+  //! \param theAttribute a source attribute to find object
+  //! \return an attribute object or NULL
+  ObjectPtr getObject(const AttributePtr& theAttribute) const;
+
+  //! 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 Module
+* \ingroup Validators
 * A Validator which validates tha selected object is a Sketch
 */
 class PartSet_SketchValidator : public ModelAPI_ResultValidator
@@ -106,5 +103,4 @@ class PartSet_SketchValidator : public ModelAPI_ResultValidator
   virtual bool isValid(const ObjectPtr theObject) const;
 };
 
-
-#endif
+#endif
\ No newline at end of file