Issue #2024: Redesign of circle and arc of circle

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

diff --git a/src/SketchPlugin/SketchPlugin_Arc.h b/src/SketchPlugin/SketchPlugin_Arc.h
index 1a5a5fc5ec54bca456733d12d347c40660547f45..7b2e294724e1371b16e8062078336886a4f95795 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Arc.h
+++ b/src/SketchPlugin/SketchPlugin_Arc.h
@@ -8,9 +8,10 @@
 #define SketchPlugin_Arc_H_
 
 #include "SketchPlugin.h"
-#include <SketchPlugin_SketchEntity.h>
-#include <SketchPlugin_Sketch.h>
-#include <GeomAPI_IPresentable.h>
+
+#include "SketchPlugin_SketchEntity.h"
+
+
 
 /**\class SketchPlugin_Arc
  * \ingroup Plugins
@@ -19,106 +20,56 @@
  * calculated when there is non-initialized attributes of the arc. The second is a result and
  * it is calculated if all attributes are initialized.
  */
-class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPresentable
+class SketchPlugin_Arc: public SketchPlugin_SketchEntity
 {
-  /// to avoid cyclic dependencies in automatic updates: they mean that
-  /// update is performed right now and automatic updates are not needed
-  bool myStartUpdate, myEndUpdate;
-  /// to avoid (if possible) additional modification of changed coordinate (issue #855)
-  double myXEndBefore, myYEndBefore;
-
-  /// to define in which direction draw arc
-  double myParamBefore;
-
  public:
   /// Arc feature kind
   inline static const std::string& ID()
   {
-    static const std::string MY_SKETCH_ARC_ID("SketchArc");
-    return MY_SKETCH_ARC_ID;
-  }
-
-  inline static const std::string& ARC_TYPE()
-  {
-    static const std::string TYPE("ArcType");
-    return TYPE;
-  }
-
-  inline static const std::string& ARC_TYPE_TANGENT()
-  {
-    static const std::string TYPE("Tangent");
-    return TYPE;
-  }
-
-  static const std::string& ARC_TYPE_CENTER_START_END()
-  {
-    static const std::string TYPE("CenterStartEnd");
-    return TYPE;
-  }
-  static const std::string& ARC_TYPE_THREE_POINTS()
-  {
-    static const std::string TYPE("ThreePoints");
-    return TYPE;
-  }
-
-  static const std::string& TANGENT_POINT_ID()
-  {
-    static const std::string TANGENT_PNT("ArcTangentPoint");
-    return TANGENT_PNT;
+    static const std::string ID("SketchArc");
+    return ID;
   }
 
   /// Central 2D point of the circle which contains the arc
   inline static const std::string& CENTER_ID()
   {
-    static const std::string MY_CENTER_ID = "ArcCenter";
-    return MY_CENTER_ID;
-  }
-
-  inline static const std::string& CENTER_REF_ID()
-  {
-    static const std::string MY_CENTER_REF_ID = "ArcCenterRef";
-    return MY_CENTER_REF_ID;
+    static const std::string ID = "center_point";
+    return ID;
   }
 
   /// Start 2D point of the arc
   inline static const std::string& START_ID()
   {
-    static const std::string MY_START_ID = "ArcStartPoint";
-    return MY_START_ID;
+    static const std::string ID = "start_point";
+    return ID;
   }
+
   /// End 2D point of the arc
   inline static const std::string& END_ID()
   {
-    static const std::string MY_END_ID = "ArcEndPoint";
-    return MY_END_ID;
-  }
-
-  /// Inversed flag
-  inline static const std::string& INVERSED_ID()
-  {
-    static const std::string MY_INVERSED_ID("InversedArc");
-    return MY_INVERSED_ID;
-  }
-
-  /// Passed point of the arc.
-  static const std::string& PASSED_POINT_ID()
-  {
-    static const std::string PASSED_PNT("ArcPassedPoint");
-    return PASSED_PNT;
+    static const std::string ID = "end_point";
+    return ID;
   }
 
   /// Arc radius.
   static const std::string& RADIUS_ID()
   {
-    static const std::string RADIUS("ArcRadius");
-    return RADIUS;
+    static const std::string ID("radius");
+    return ID;
   }
 
   /// Arc angle.
   static const std::string& ANGLE_ID()
   {
-    static const std::string ANGLE("ArcAngle");
-    return ANGLE;
+    static const std::string ID("angle");
+    return ID;
+  }
+
+  /// Reversed flag
+  inline static const std::string& REVERSED_ID()
+  {
+    static const std::string ID("reversed");
+    return ID;
   }
 
   /// Returns the kind of a feature
@@ -131,15 +82,12 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese
   /// Returns true is sketch element is under the rigid constraint
   SKETCHPLUGIN_EXPORT virtual bool isFixed();
 
-  /// Creates an arc-shape
-  SKETCHPLUGIN_EXPORT virtual void execute();
-
   /// Called on change of any argument-attribute of this object
   /// \param theID identifier of changed attribute
   SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID);
 
-  /// Returns the AIS preview
-  virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious);
+  /// Creates an arc-shape
+  SKETCHPLUGIN_EXPORT virtual void execute();
 
   /// Moves the feature
   /// \param theDeltaX the delta for X coordinate is moved
@@ -149,6 +97,7 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese
   /// Updates the "reversed" flag
   /// \param isReversed  whether the arc will be reversed
   void setReversed(bool isReversed);
+
   /// Returns \c true is the arc is reversed
   bool isReversed();
 
@@ -160,12 +109,8 @@ protected:
   virtual void initDerivedClassAttributes();
 
 private:
-  /// Returns true if all obligatory attributes are initialized
-  bool isFeatureValid();
-
-  /// Compose constraints to build tangency arc
-  void tangencyArcConstraints();
-
+  /// to define in which direction draw arc
+  double myParamBefore;
 };
 
 #endif