Merge branch 'master' of newgeom:newgeom.git

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

diff --git a/src/SketchPlugin/SketchPlugin_Circle.h b/src/SketchPlugin/SketchPlugin_Circle.h
index 18fa1e71f94ce1db6a85076d2e68ef1fbfcd7faf..43c2c982acb95976e9aa555b4badfd9a173c9439 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Circle.h
+++ b/src/SketchPlugin/SketchPlugin_Circle.h
@@ -7,11 +7,7 @@
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>
-
-/// 2D point - center of the circle
-const std::string CIRCLE_ATTR_CENTER("CircleCenter");
-/// Radius of the circle
-const std::string CIRCLE_ATTR_RADIUS("CircleRadius");
+#include <SketchPlugin_Sketch.h>
 
 /**\class SketchPlugin_Circle
  * \ingroup DataModel
@@ -20,13 +16,30 @@ const std::string CIRCLE_ATTR_RADIUS("CircleRadius");
 class SketchPlugin_Circle: public SketchPlugin_Feature
 {
 public:
+  /// Circle feature kind
+  inline static const std::string& ID()
+  {
+    static const std::string MY_CIRCLE_ID("SketchCircle");
+    return MY_CIRCLE_ID;
+  }
+
+  /// 2D point - center of the circle
+  inline static const std::string& CENTER_ID()
+  {
+    static const std::string MY_CIRCLE_CENTER_ID("CircleCenter");
+    return MY_CIRCLE_CENTER_ID;
+  }
+
+  /// Radius of the circle
+  inline static const std::string& RADIUS_ID()
+  {
+    static const std::string MY_CIRCLE_RADIUS_ID("CircleRadius");
+    return MY_CIRCLE_RADIUS_ID;
+  }
+
   /// Returns the kind of a feature
   SKETCHPLUGIN_EXPORT virtual const std::string& getKind() 
-  {static std::string MY_KIND = "SketchCircle"; return MY_KIND;}
-
-  /// 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;}
+  {static std::string MY_KIND = SketchPlugin_Circle::ID(); return MY_KIND;}
 
   /// Creates a new part document if needed
   SKETCHPLUGIN_EXPORT virtual void execute();
@@ -34,13 +47,24 @@ public:
   /// Request for initialization of data model of the feature: adding all attributes
   SKETCHPLUGIN_EXPORT virtual void initAttributes();
 
-  /// Returns the sketch preview
-  SKETCHPLUGIN_EXPORT virtual const boost::shared_ptr<GeomAPI_Shape>& preview();
+  /// Returns the AIS preview
+  virtual boost::shared_ptr<GeomAPI_AISObject> getAISObject(
+                                boost::shared_ptr<GeomAPI_AISObject> thePrevious)
+  {return simpleAISObject(firstResult(), thePrevious);}
 
   /// Adds sub-feature of the higher level feature (sub-element of the sketch)
   /// \param theFeature sub-feature
   SKETCHPLUGIN_EXPORT virtual const void addSub(
-    const boost::shared_ptr<ModelAPI_Feature>& theFeature) {};
+    const FeaturePtr& theFeature) {};
+
+  /// Moves the feature
+  /// \param theDeltaX the delta for X coordinate is moved
+  /// \param theDeltaY the delta for Y coordinate is moved
+  SKETCHPLUGIN_EXPORT virtual void move(const double theDeltaX, const double theDeltaY);
+
+  /// Return the distance between the feature and the point
+  /// \param thePoint the point
+  virtual double distanceToPoint(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint);
 
   /// Use plugin manager for features creation
   SketchPlugin_Circle();