Issue #2024: Redesign of circle and arc of circle

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

diff --git a/src/SketchPlugin/SketchPlugin_Circle.h b/src/SketchPlugin/SketchPlugin_Circle.h
index e183384d83d15b3388c65c5e8c4b57dd2b42cc5b..df577cda870313f2814807e53458e4d7249155ab 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Circle.h
+++ b/src/SketchPlugin/SketchPlugin_Circle.h
@@ -10,75 +10,33 @@
 #include "SketchPlugin.h"
 #include <SketchPlugin_SketchEntity.h>
 #include <SketchPlugin_Sketch.h>
-#include <GeomAPI_IPresentable.h>
 
 /**\class SketchPlugin_Circle
  * \ingroup Plugins
- * \brief Feature for creation of the new circle in PartSet.
+ * \brief Feature for creation of the new circle in Sketch.
  */
-class SketchPlugin_Circle : public SketchPlugin_SketchEntity, public GeomAPI_IPresentable
+class SketchPlugin_Circle: public SketchPlugin_SketchEntity
 {
  public:
   /// Circle feature kind
   inline static const std::string& ID()
   {
-    static const std::string MY_CIRCLE_ID("SketchCircle");
-    return MY_CIRCLE_ID;
-  }
-
-  inline static const std::string& CIRCLE_TYPE()
-  {
-    static const std::string TYPE("CircleType");
-    return TYPE;
-  }
-
-  /// Creation method by center and radius.
-  inline static const std::string& CIRCLE_TYPE_CENTER_AND_RADIUS()
-  {
-    static const std::string TYPE("CenterRadius");
-    return TYPE;
-  }
-
-  /// Creation method by three points.
-  inline static const std::string& CIRCLE_TYPE_THREE_POINTS()
-  {
-    static const std::string TYPE("ThreePoints");
-    return TYPE;
+    static const std::string ID("SketchCircle");
+    return 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;
+    static const std::string ID("circle_center");
+    return 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;
-  }
-
-  /// First point id.
-  inline static const std::string& FIRST_POINT_ID()
-  {
-    static const std::string FIRST_PNT("FirstPoint");
-    return FIRST_PNT;
-  }
-
-  /// Second point id.
-  inline static const std::string& SECOND_POINT_ID()
-  {
-    static const std::string SECOND_PNT("SecondPoint");
-    return SECOND_PNT;
-  }
-
-  /// Third point id.
-  inline static const std::string& THIRD_POINT_ID()
-  {
-    static const std::string THIRD_PNT("ThirdPoint");
-    return THIRD_PNT;
+    static const std::string ID("circle_radius");
+    return ID;
   }
 
   /// Returns the kind of a feature
@@ -91,39 +49,23 @@ class SketchPlugin_Circle : public SketchPlugin_SketchEntity, public GeomAPI_IPr
   /// Returns true is sketch element is under the rigid constraint
   SKETCHPLUGIN_EXPORT virtual bool isFixed();
 
+  /// Called on change of any argument-attribute of this object
+  SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID);
+
   /// Creates a new part document if needed
   SKETCHPLUGIN_EXPORT virtual void execute();
 
-  /// Adds sub-feature of the higher level feature (sub-element of the sketch)
-  /// \param theFeature sub-feature
-  SKETCHPLUGIN_EXPORT virtual const void addSub(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);
 
-  /// Called on change of any argument-attribute of this object
-  SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID);
-
-  /// Returns the AIS preview
-  virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious);
-
   /// Use plugin manager for features creation
   SketchPlugin_Circle();
 
 protected:
   /// \brief Initializes attributes of derived class.
   virtual void initDerivedClassAttributes();
-
-private:
-  /// Returns true if all obligatory attributes are initialized
-  bool isFeatureValid();
-
-  /// Update coordinates of representation by three points
-  void adjustThreePoints();
 };
 
 #endif