X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MacroEllipse.h;h=261ed67dfc9db26c1a099688a322c174e71894d4;hb=ce72dd01645885d720b731795d676e2feeabc8d6;hp=ac087b0551245bb8bea8524cc3b66f9d2effe8ce;hpb=5d382fc1e3be8c6362f8b03e437a054130f6db04;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_MacroEllipse.h b/src/SketchPlugin/SketchPlugin_MacroEllipse.h
index ac087b055..261ed67df 100644
--- a/src/SketchPlugin/SketchPlugin_MacroEllipse.h
+++ b/src/SketchPlugin/SketchPlugin_MacroEllipse.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2017-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -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,12 +204,6 @@ private:
 
   FeaturePtr createEllipseFeature();
 
-  void createAuxiliaryPoint(const AttributePtr& theEllipsePoint,
-                            const std::string& theName);
-  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;