Bug fixing for constraints

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_ConstraintDistance.h

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
index e633e9fe42e391b5b8b6f63d9aa6ae76757e9092..a112da05c7394e6d83c5efdaadaf6f01520dd559 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
@@ -7,11 +7,10 @@
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Constraint.h"
-#include <SketchPlugin_Sketch.h>
-#include <list>
+#include "SketchPlugin_Sketch.h"
 
-/// Distance constraint kind
-const std::string SKETCH_CONSTRAINT_DISTANCE_KIND("SketchConstraintDistance");
+#include <GeomAPI_IPresentable.h>
+#include <list>
 
 /** \class SketchPlugin_ConstraintDistance
  *  \ingroup DataModel
@@ -19,17 +18,25 @@ const std::string SKETCH_CONSTRAINT_DISTANCE_KIND("SketchConstraintDistance");
  *         between a point and another feature (point, line, plane or face)
  *
  *  These constraint has three attributes:
- *  CONSTRAINT_ATTR_VALUE, CONSTRAINT_ATTR_ENTITY_A and CONSTRAINT_ATTR_ENTITY_B
+ *  SketchPlugin_Constraint::VALUE(), SketchPlugin_Constraint::ENTITY_A() and SketchPlugin_Constraint::ENTITY_B()
  */
-class SketchPlugin_ConstraintDistance: public SketchPlugin_Constraint
+class SketchPlugin_ConstraintDistance: public SketchPlugin_Constraint, 
+                                       public GeomAPI_IPresentable
 {
 public:
+  /// Distance constraint kind
+  inline static const std::string& ID()
+  {
+    static const std::string MY_CONSTRAINT_DISTANCE_ID("SketchConstraintDistance");
+    return MY_CONSTRAINT_DISTANCE_ID;
+  }
+
   /// \brief Returns the kind of a feature
   SKETCHPLUGIN_EXPORT virtual const std::string& getKind() 
-  {static std::string MY_KIND = SKETCH_CONSTRAINT_DISTANCE_KIND; return MY_KIND;}
+  {static std::string MY_KIND = SketchPlugin_ConstraintDistance::ID(); return MY_KIND;}
 
   /// \brief Creates a new part document if needed
-  SKETCHPLUGIN_EXPORT virtual void execute(boost::shared_ptr<ModelAPI_Result>& theResult);
+  SKETCHPLUGIN_EXPORT virtual void execute();
 
   /// \brief Request for initialization of data model of the feature: adding all attributes
   SKETCHPLUGIN_EXPORT virtual void initAttributes();