Issue #2024: Redesign of circle and arc of circle

[modules/shaper.git] / src / SketchAPI / SketchAPI_Circle.cpp

diff --git a/src/SketchAPI/SketchAPI_Circle.cpp b/src/SketchAPI/SketchAPI_Circle.cpp
index 9cac0bd31cbf58bee789d7d87dd9fe9d78f92ba7..ddb26aef5fae0fd0f42914abcff005accd82336e 100644 (file)
--- a/src/SketchAPI/SketchAPI_Circle.cpp
+++ b/src/SketchAPI/SketchAPI_Circle.cpp
@@ -43,30 +43,6 @@ SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature>& theF
   }
 }
 
-//==================================================================================================
-SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                   double theX1, double theY1,
-                                   double theX2, double theY2,
-                                   double theX3, double theY3)
-: SketchAPI_SketchEntity(theFeature)
-{
-  if (initialize()) {
-    setByThreePoints(theX1, theY1, theX2, theY2, theX3, theY3);
-  }
-}
-
-//==================================================================================================
-SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                   const std::shared_ptr<GeomAPI_Pnt2d>& thePoint1,
-                                   const std::shared_ptr<GeomAPI_Pnt2d>& thePoint2,
-                                   const std::shared_ptr<GeomAPI_Pnt2d>& thePoint3)
-: SketchAPI_SketchEntity(theFeature)
-{
-  if (initialize()) {
-    setByThreePoints(thePoint1, thePoint2, thePoint3);
-  }
-}
-
 //==================================================================================================
 SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                                    const ModelHighAPI_Selection& theExternal)
@@ -96,7 +72,6 @@ SketchAPI_Circle::~SketchAPI_Circle()
 //==================================================================================================
 void SketchAPI_Circle::setByCenterAndRadius(double theCenterX, double theCenterY, double theRadius)
 {
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_CENTER_AND_RADIUS(), mycircleType);
   fillAttribute(center(), theCenterX, theCenterY);
   fillAttribute(theRadius, myradius);
 
@@ -107,39 +82,12 @@ void SketchAPI_Circle::setByCenterAndRadius(double theCenterX, double theCenterY
 void SketchAPI_Circle::setByCenterAndRadius(const std::shared_ptr<GeomAPI_Pnt2d>& theCenter,
                                             double theRadius)
 {
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_CENTER_AND_RADIUS(), mycircleType);
   fillAttribute(theCenter, mycenter);
   fillAttribute(theRadius, myradius);
 
   execute();
 }
 
-//==================================================================================================
-void SketchAPI_Circle::setByThreePoints(double theX1, double theY1,
-                                        double theX2, double theY2,
-                                        double theX3, double theY3)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(firstPoint(), theX1, theY1);
-  fillAttribute(secondPoint(), theX2, theY2);
-  fillAttribute(thirdPoint(), theX3, theY3);
-
-  execute();
-}
-
-//==================================================================================================
-void SketchAPI_Circle::setByThreePoints(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint1,
-                                        const std::shared_ptr<GeomAPI_Pnt2d>& thePoint2,
-                                        const std::shared_ptr<GeomAPI_Pnt2d>& thePoint3)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(thePoint1, myfirstPoint);
-  fillAttribute(thePoint2, mysecondPoint);
-  fillAttribute(thePoint3, mythirdPoint);
-
-  execute();
-}
-
 //==================================================================================================
 void SketchAPI_Circle::setByExternal(const ModelHighAPI_Selection & theExternal)
 {
@@ -159,7 +107,6 @@ void SketchAPI_Circle::setByExternalName(const std::string & theExternalName)
 //==================================================================================================
 void SketchAPI_Circle::setCenter(double theX, double theY)
 {
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_CENTER_AND_RADIUS(), mycircleType);
   fillAttribute(center(), theX, theY);
 
   execute();
@@ -168,7 +115,6 @@ void SketchAPI_Circle::setCenter(double theX, double theY)
 //==================================================================================================
 void SketchAPI_Circle::setCenter(const std::shared_ptr<GeomAPI_Pnt2d> & theCenter)
 {
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_CENTER_AND_RADIUS(), mycircleType);
   fillAttribute(theCenter, mycenter);
 
   execute();
@@ -177,66 +123,11 @@ void SketchAPI_Circle::setCenter(const std::shared_ptr<GeomAPI_Pnt2d> & theCente
 //==================================================================================================
 void SketchAPI_Circle::setRadius(double theRadius)
 {
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_CENTER_AND_RADIUS(), mycircleType);
   fillAttribute(ModelHighAPI_Double(theRadius), myradius);
 
   execute();
 }
 
-//==================================================================================================
-void SketchAPI_Circle::setFirstPoint(double theX, double theY)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(firstPoint(), theX, theY);
-
-  execute();
-}
-
-//==================================================================================================
-void SketchAPI_Circle::setFirstPoint(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(thePoint, myfirstPoint);
-
-  execute();
-}
-
-//==================================================================================================
-void SketchAPI_Circle::setSecondPoint(double theX, double theY)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(secondPoint(), theX, theY);
-
-  execute();
-}
-
-//==================================================================================================
-void SketchAPI_Circle::setSecondPoint(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(thePoint, mysecondPoint);
-
-  execute();
-}
-
-//==================================================================================================
-void SketchAPI_Circle::setThirdPoint(double theX, double theY)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(thirdPoint(), theX, theY);
-
-  execute();
-}
-
-//==================================================================================================
-void SketchAPI_Circle::setThirdPoint(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
-{
-  fillAttribute(SketchPlugin_Circle::CIRCLE_TYPE_THREE_POINTS(), mycircleType);
-  fillAttribute(thePoint, mythirdPoint);
-
-  execute();
-}
-
 //==================================================================================================
 void SketchAPI_Circle::dump(ModelHighAPI_Dumper& theDumper) const
 {
@@ -251,16 +142,9 @@ void SketchAPI_Circle::dump(ModelHighAPI_Dumper& theDumper) const
     // circle is external
     theDumper << aBase << " = " << aSketchName << ".addCircle(" << anExternal << ")" << std::endl;
   } else {
-    AttributeStringPtr aType = circleType();
-    if (aType->value() == SketchPlugin_Circle::CIRCLE_TYPE_CENTER_AND_RADIUS()) {
-      // circle given by center and radius
-      theDumper << aBase << " = " << aSketchName << ".addCircle("
-                << center() << ", " << radius() << ")" << std::endl;
-    } else {
-      // circle given by three points
-      theDumper << aBase << " = " << aSketchName << ".addCircle(" << firstPoint() << ", "
-                << secondPoint() << ", " << thirdPoint() << ")" << std::endl;
-    }
+    // circle given by center and radius
+    theDumper << aBase << " = " << aSketchName << ".addCircle("
+              << center() << ", " << radius() << ")" << std::endl;
   }
   // dump "auxiliary" flag if necessary
   SketchAPI_SketchEntity::dump(theDumper);