X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintCoincidence.h;h=c41358c3cbc930131be34a63ce0ccf5d1ccbee03;hb=86cf314c1ec34383f29d0948c894579de3372b1e;hp=fe75115e9ca5a80e56067757a979b67cc3f8cc16;hpb=277db1718bb7a3226515e4cc2272d83b463b3434;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
index fe75115e9..c41358c3c 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
@@ -1,31 +1,44 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:    SketchPlugin_ConstraintCoincidence.h
 // Created: 08 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintCoincidence_HeaderFile
-#define SketchPlugin_ConstraintCoincidence_HeaderFile
+#ifndef SketchPlugin_ConstraintCoincidence_H_
+#define SketchPlugin_ConstraintCoincidence_H_
 
 #include "SketchPlugin.h"
-#include "SketchPlugin_Constraint.h"
+#include "SketchPlugin_ConstraintBase.h"
+#include <SketchPlugin_Sketch.h>
 #include <list>
 
+class GeomDataAPI_Point2D;
 
 /** \class SketchPlugin_ConstraintCoincidence
- *  \ingroup DataModel
- *  \brief Feature for creation of a new constraint which defines equvalence of two points
+ *  \ingroup Plugins
+ *  \brief Feature for creation of a new constraint which defines equivalence of two points
  *
- *  These constraint has two attributes: CONSTRAINT_ATTR_POINT_A and CONSTRAINT_ATTR_POINT_B
+ *  This constraint has two attributes:
+ *  SketchPlugin_Constraint::ENTITY_A() and SketchPlugin_Constraint::ENTITY_B()
  */
-class SketchPlugin_ConstraintCoincidence: public SketchPlugin_Constraint
+class SketchPlugin_ConstraintCoincidence : public SketchPlugin_ConstraintBase
 {
-public:
+ public:
+  /// Coincidence constraint kind
+  inline static const std::string& ID()
+  {
+    static const std::string MY_CONSTRAINT_COINCIDENCE_ID("SketchConstraintCoincidence");
+    return MY_CONSTRAINT_COINCIDENCE_ID;
+  }
   /// \brief Returns the kind of a feature
-  SKETCHPLUGIN_EXPORT virtual const std::string& getKind() 
-  {static std::string MY_KIND = "SketchConstraintCoincidence"; return MY_KIND;}
+  SKETCHPLUGIN_EXPORT virtual const std::string& getKind()
+  {
+    static std::string MY_KIND = SketchPlugin_ConstraintCoincidence::ID();
+    return MY_KIND;
+  }
 
-  /// \brief Returns to which group in the document must be added feature
-  SKETCHPLUGIN_EXPORT virtual const std::string& getGroup() 
-  {static std::string MY_GROUP = "Sketch"; return MY_GROUP;}
+  /// Returns the AIS preview
+  SKETCHPLUGIN_EXPORT virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious);
 
   /// \brief Creates a new part document if needed
   SKETCHPLUGIN_EXPORT virtual void execute();
@@ -33,8 +46,24 @@ public:
   /// \brief Request for initialization of data model of the feature: adding all attributes
   SKETCHPLUGIN_EXPORT virtual void initAttributes();
 
-  /// \brief Returns the sketch preview
-  SKETCHPLUGIN_EXPORT virtual const boost::shared_ptr<GeomAPI_Shape>& preview();
+  /// Returns coincident feature if there is a coincidence built on the given features
+  /// \param theFeature1 the first feature
+  /// \param theFeature2 the second feature
+  static FeaturePtr findCoincidenceFeature(const FeaturePtr& theFeature1,
+                                           const FeaturePtr& theFeature2);
+
+  /// Creates a constraint on two points
+  /// \param theSketch a sketch feature
+  /// \param thePoint1 the first point
+  /// \param thePoint2 the second point
+  static void createCoincidenceFeature(SketchPlugin_Sketch* theSketch,
+                                const std::shared_ptr<GeomDataAPI_Point2D>& thePoint1,
+                                const std::shared_ptr<GeomDataAPI_Point2D>& thePoint2);
+
+  /// Returns point of coincidence feature
+  /// \param theFeature a coincidence feature
+  /// \return point 2d attribute. Coincidence always has at least one point 2d attribute
+  static std::shared_ptr<GeomDataAPI_Point2D> getPoint(const FeaturePtr& theFeature);
 
   /// \brief Use plugin manager for features creation
   SketchPlugin_ConstraintCoincidence();