Merge branch 'occ/shaper2smesh'

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

diff --git a/src/SketchPlugin/SketchPlugin_MacroEllipse.h b/src/SketchPlugin/SketchPlugin_MacroEllipse.h
index 2b92f7f2aad55a8b81abc0b590e2f22ca8cb2388..f1a87525757a5f4c5f973c6a88f85fc801ef56c7 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_MacroEllipse.h
+++ b/src/SketchPlugin/SketchPlugin_MacroEllipse.h
@@ -67,28 +67,28 @@ class SketchPlugin_MacroEllipse: public SketchPlugin_SketchEntity,
   }
 
   /// Attribute for the first point selected during ellipse creation.
-  inline static const std::string& FIRST_POINT_ID()
+  inline static const std::string& CENTER_POINT_ID()
   {
     static const std::string ID("first_point");
     return ID;
   }
 
   /// Reference to the first selected point.
-  inline static const std::string& FIRST_POINT_REF_ID()
+  inline static const std::string& CENTER_POINT_REF_ID()
   {
     static const std::string ID("first_point_ref");
     return ID;
   }
 
   /// Attribute for the second point selected during ellipse creation.
-  inline static const std::string& SECOND_POINT_ID()
+  inline static const std::string& MAJOR_AXIS_POINT_ID()
   {
     static const std::string ID("second_point");
     return ID;
   }
 
   /// Reference to the second selected point.
-  inline static const std::string& SECOND_POINT_REF_ID()
+  inline static const std::string& MAJOR_AXIS_POINT_REF_ID()
   {
     static const std::string ID("second_point_ref");
     return ID;
@@ -108,6 +108,48 @@ class SketchPlugin_MacroEllipse: public SketchPlugin_SketchEntity,
     return ID;
   }
 
+  /// Attribute for the first point selected during ellipse creation.
+  inline static const std::string& MAJOR_AXIS_START_ID()
+  {
+    static const std::string ID("first_point_1");
+    return ID;
+  }
+
+  /// Reference to the first selected point.
+  inline static const std::string& MAJOR_AXIS_START_REF_ID()
+  {
+    static const std::string ID("first_point_ref_1");
+    return ID;
+  }
+
+  /// Attribute for the second point selected during ellipse creation.
+  inline static const std::string& MAJOR_AXIS_END_ID()
+  {
+    static const std::string ID("second_point_1");
+    return ID;
+  }
+
+  /// Reference to the second selected point.
+  inline static const std::string& MAJOR_AXIS_END_REF_ID()
+  {
+    static const std::string ID("second_point_ref_1");
+    return ID;
+  }
+
+  /// Attribute for the third point selected during ellipse creation.
+  inline static const std::string& PASSED_POINT_1_ID()
+  {
+    static const std::string ID("passed_point_1");
+    return ID;
+  }
+
+  /// Reference for passed point selection.
+  inline static const std::string& PASSED_POINT_1_REF_ID()
+  {
+    static const std::string ID("passed_point_ref_1");
+    return ID;
+  }
+
   /// Major radius of the ellipse
   inline static const std::string& MAJOR_RADIUS_ID()
   {
@@ -162,11 +204,6 @@ private:
 
   FeaturePtr createEllipseFeature();
 
-  void createAuxiliaryPoint(const AttributePtr& theEllipsePoint);
-  void createAuxiliaryAxis(const AttributePtr& theStartPoint, const AttributePtr& theEndPoint);
-
-  void createInternalConstraint(const AttributePtr& thePoint1, const AttributePtr& thePoint2);
-
 private:
   std::shared_ptr<GeomAPI_Pnt2d> myCenter;
   std::shared_ptr<GeomAPI_Pnt2d> myFocus;