From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 26 Mar 2015 13:44:06 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
X-Git-Tag: V_1.1.0~78
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7fcf163a8a369889707c5b73eeeb2bc68a4b906e;p=modules%2Fshaper.git

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

Conflicts:
	src/SketchPlugin/SketchPlugin_Validators.cpp
---

7fcf163a8a369889707c5b73eeeb2bc68a4b906e
diff --cc src/SketchPlugin/SketchPlugin_Validators.h
index 88f042bd7,6259c2bd6..17797fb8a
--- a/src/SketchPlugin/SketchPlugin_Validators.h
+++ b/src/SketchPlugin/SketchPlugin_Validators.h
@@@ -25,22 -25,41 +25,58 @@@ class SketchPlugin_DistanceAttrValidato
    virtual bool isValid(const AttributePtr& theAttribute,
                         const std::list<std::string>& theArguments) const;
  };
+ //  virtual bool isValid(const AttributePtr& theAttribute,
+ //                       const std::list<std::string>& theArguments) const;
+ //
+ //  //! Returns true if object is good for the feature attribute
+ //  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
+ //                       const ObjectPtr& theObject, const GeomShapePtr& theShape) const;
+ //
+ //  //! Returns true if the attribute is good for the feature attribute
+ //  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
+ //                       const AttributePtr& theAttribute) const;
+ //};
+ 
+ // commented in v1.0.2, master:
+ /**\class SketchPlugin_DifferentObjectsValidator
+  * \ingroup Validators
+  *
+  * Check that there is no same object was already selected in the feature.
+  * For an example: to avoid perpendicularity on line and the same line.
+  */
+ // Use PartSet_DifferentObjectsValidator instead
+ //class SketchPlugin_DifferentObjectsValidator : public ModelAPI_RefAttrValidator
+ //{
+ // public:
+ //  //! returns true if attribute is valid
+ //  //! \param theAttribute the checked attribute
+ //  //! \param theArguments arguments of the attribute
+ //  virtual bool isValid(
+ //    const AttributePtr& theAttribute, const std::list<std::string>& theArguments) const;
+ //  //! Returns true if object is good for the feature attribute
+ //  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
+ //  virtual bool isValid(const FeaturePtr& theFeature, const std::list<std::string>& theArguments,
+ //                       const AttributePtr& theAttribute) const;
+ //};
+ // ======= end of todo
  
 +
 +/**\class SketchPlugin_TangentAttrValidator
 + * \ingroup Validators
 + * \brief Validator for the tangent constraint input.
 + *
 + * It just checks that distance is greater than zero.
 + */
 +class SketchPlugin_TangentAttrValidator : public ModelAPI_AttributeValidator
 +{
 + public:
 +  //! returns true if attribute is valid
 +  //! \param theAttribute the checked attribute
 +  //! \param theArguments arguments of the attribute
 +  virtual bool isValid(const AttributePtr& theAttribute,
 +                       const std::list<std::string>& theArguments) const;
 +};
 +
  #endif