Revert "bos#35152 [EDF] (2023-T1) Sketch Circle should allow user to position constru...

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

diff --git a/src/SketchAPI/SketchAPI_Circle.cpp b/src/SketchAPI/SketchAPI_Circle.cpp
index 95d48f39706716786722bdf624af1ded13d85140..41853fe1d06d0dc1a21d960eda2cbeb104ed6873 100644 (file)
--- a/src/SketchAPI/SketchAPI_Circle.cpp
+++ b/src/SketchAPI/SketchAPI_Circle.cpp
@@ -26,9 +26,6 @@
 #include <ModelHighAPI_Selection.h>
 #include <ModelHighAPI_Tools.h>
 
-#include <SketchAPI_Point.h>
-#include <SketchPlugin_ConstraintCoincidenceInternal.h>
-
 //==================================================================================================
 SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature> & theFeature)
 : SketchAPI_SketchEntity(theFeature)
@@ -40,22 +37,22 @@ SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature> & the
 SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                                    double theCenterX,
                                    double theCenterY,
-                                   double theRadius, double theAngle)
+                                   double theRadius)
 : SketchAPI_SketchEntity(theFeature)
 {
   if(initialize()) {
-    setByCenterAndRadius(theCenterX, theCenterY, theRadius, theAngle);
+    setByCenterAndRadius(theCenterX, theCenterY, theRadius);
   }
 }
 
 //==================================================================================================
 SketchAPI_Circle::SketchAPI_Circle(const std::shared_ptr<ModelAPI_Feature>& theFeature,
                                    const std::shared_ptr<GeomAPI_Pnt2d>& theCenter,
-                                   double theRadius, double theAngle)
+                                   double theRadius)
 : SketchAPI_SketchEntity(theFeature)
 {
   if(initialize()) {
-    setByCenterAndRadius(theCenter, theRadius, theAngle);
+    setByCenterAndRadius(theCenter, theRadius);
   }
 }
 
@@ -85,90 +82,23 @@ SketchAPI_Circle::~SketchAPI_Circle()
 
 }
 
-// Create point on circle line
-void SketchAPI_Circle::createPoint()
-{
-  // Find sketch
-  CompositeFeaturePtr aSketch;
-  const std::set<AttributePtr>& aRefs = feature()->data()->refsToMe();
-  for (std::set<AttributePtr>::const_iterator anIt = aRefs.begin(); anIt != aRefs.end(); ++anIt)
-    if ((*anIt)->id() == SketchPlugin_Sketch::FEATURES_ID())
-    {
-      aSketch = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>((*anIt)->owner());
-      break;
-    }
-  if (!aSketch)
-    return;
-
-  // create point on line
-  FeaturePtr aPointFeature = aSketch->addFeature(SketchPlugin_Point::ID());
-  aPointFeature->reference(SketchPlugin_Point::PARENT_ID())->setValue(feature());
-
-  AttributePoint2DPtr aCoord = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-    aPointFeature->attribute(SketchPlugin_Point::COORD_ID()));
-
-  GeomPnt2dPtr aPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-    feature()->attribute(SketchPlugin_Circle::ROTATE_ID()))->pnt();
-
-  aCoord->setValue(aPnt);
-  aPointFeature->execute();
-
-  FeaturePtr aConstraint = aSketch->addFeature(SketchPlugin_ConstraintCoincidenceInternal::ID());
-  AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
-    aConstraint->attribute(SketchPlugin_Constraint::ENTITY_A()));
-  aRefAttr->setAttr(feature()->attribute(SketchPlugin_Circle::ROTATE_ID()));
-
-  aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
-    aConstraint->attribute(SketchPlugin_Constraint::ENTITY_B()));
-  aRefAttr->setAttr(aCoord);
-
-  feature()->reference(SketchPlugin_Circle::ROTATE_REF_ID())->setValue(aPointFeature);
-}
-
 //==================================================================================================
-void SketchAPI_Circle::setByCenterAndRadius(double theCenterX, double theCenterY,
-                                            double theRadius, double theAngle)
+void SketchAPI_Circle::setByCenterAndRadius(double theCenterX, double theCenterY, double theRadius)
 {
   fillAttribute(center(), theCenterX, theCenterY);
   fillAttribute(theRadius, myradius);
-  fillAttribute(theAngle, myangle);
-
-  bool isNeedPoint =
-    feature()->integer(SketchPlugin_Circle::VERSION_ID())->value() > SketchPlugin_Circle::THE_VERSION_0;
-  if (isNeedPoint)
-  {
-    fillAttribute(theAngle, angle());
 
-    execute();
-    createPoint();
-  }
-  else
-  {
-    execute();
-  }
+  execute();
 }
 
 //==================================================================================================
 void SketchAPI_Circle::setByCenterAndRadius(const std::shared_ptr<GeomAPI_Pnt2d>& theCenter,
-                                            double theRadius, double theAngle)
+                                            double theRadius)
 {
   fillAttribute(theCenter, mycenter);
   fillAttribute(theRadius, myradius);
 
-  bool isNeedPoint =
-    feature()->integer(SketchPlugin_Circle::VERSION_ID())->value() > SketchPlugin_Circle::THE_VERSION_0;
-
-  if (isNeedPoint)
-  {
-    fillAttribute(theAngle, angle());
-
-    execute();
-    createPoint();
-  }
-  else
-  {
-    execute();
-  }
+  execute();
 }
 
 //==================================================================================================
@@ -211,32 +141,6 @@ void SketchAPI_Circle::setRadius(double theRadius)
   execute();
 }
 
-//==================================================================================================
-void SketchAPI_Circle::setAngle(double theAngle)
-{
-  fillAttribute(ModelHighAPI_Double(theAngle), myangle);
-
-  execute();
-}
-
-//==================================================================================================
-// Return created point
-std::shared_ptr<SketchAPI_SketchEntity> SketchAPI_Circle::createdPoint() const
-{
-  std::shared_ptr<SketchAPI_SketchEntity> anEnt;
-
-  AttributeReferencePtr anRef = feature()->reference(SketchPlugin_Circle::ROTATE_REF_ID());
-  if (!anRef->isInitialized())
-    return anEnt;
-
-  FeaturePtr aFeature = ModelAPI_Feature::feature(anRef->value());
-  if (aFeature && aFeature->getKind() == SketchPlugin_Point::ID())
-  {
-    anEnt = std::shared_ptr < SketchAPI_SketchEntity>(new SketchAPI_Point(aFeature));
-  }
-  return anEnt;
-}
-
 //==================================================================================================
 void SketchAPI_Circle::dump(ModelHighAPI_Dumper& theDumper) const
 {
@@ -247,26 +151,13 @@ void SketchAPI_Circle::dump(ModelHighAPI_Dumper& theDumper) const
   const std::string& aSketchName = theDumper.parentName(aBase);
 
   AttributeSelectionPtr anExternal = aBase->selection(SketchPlugin_SketchEntity::EXTERNAL_ID());
-  std::string aComName = aBase->integer(SketchPlugin_Circle::VERSION_ID())->value() > SketchPlugin_Circle::THE_VERSION_0 ?
-    "addCircleWithPoint" : "addCircle";
-
   if (anExternal->context()) {
     // circle is external
-    theDumper << aBase << " = " << aSketchName << "." << aComName << "(" << anExternal << ")" << std::endl;
-  }
-  else {// circle given by center and radius
-    theDumper << aBase << " = " << aSketchName << "." << aComName << "(" << center() << ", " << radius();
-    if (aBase->integer(SketchPlugin_Circle::VERSION_ID())->value() > SketchPlugin_Circle::THE_VERSION_0)
-    {
-      theDumper << ", " << angle() << ")" << std::endl;
-      std::shared_ptr<SketchAPI_SketchEntity> aPoint = createdPoint();
-      if (aPoint)
-        theDumper << aPoint->feature() << " = " << theDumper.name(aBase) << ".createdPoint()" << std::endl;
-    }
-    else
-    {
-      theDumper << ")" << std::endl;
-    }
+    theDumper << aBase << " = " << aSketchName << ".addCircle(" << anExternal << ")" << std::endl;
+  } else {
+    // circle given by center and radius
+    theDumper << aBase << " = " << aSketchName << ".addCircle("
+              << center() << ", " << radius() << ")" << std::endl;
   }
   // dump "auxiliary" flag if necessary
   SketchAPI_SketchEntity::dump(theDumper);