Rework Sketch Rectangle feature.

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

diff --git a/src/SketchAPI/SketchAPI_Rectangle.cpp b/src/SketchAPI/SketchAPI_Rectangle.cpp
index af0b62a83eb24b39e40a65df39339abea0a19c27..aafddf63e7be53b3d7aee12a0d29ca66b95820c2 100644 (file)
--- a/src/SketchAPI/SketchAPI_Rectangle.cpp
+++ b/src/SketchAPI/SketchAPI_Rectangle.cpp
@@ -34,23 +34,21 @@ SketchAPI_Rectangle::SketchAPI_Rectangle(
 }
 
 SketchAPI_Rectangle::SketchAPI_Rectangle(const std::shared_ptr<ModelAPI_Feature> & theFeature,
-                                         double theX1, double theY1, double theX2, double theY2,
-                                         bool isFirstPointCenter)
+                                         double theX1, double theY1, double theX2, double theY2)
   : SketchAPI_SketchEntity(theFeature)
 {
   if (initialize()) {
-    setByCoordinates(theX1, theY1, theX2, theY2, isFirstPointCenter);
+    setByCoordinates(theX1, theY1, theX2, theY2);
   }
 }
 
 SketchAPI_Rectangle::SketchAPI_Rectangle(const std::shared_ptr<ModelAPI_Feature> & theFeature,
                                          const std::shared_ptr<GeomAPI_Pnt2d> & theFirstPoint,
-                                         const std::shared_ptr<GeomAPI_Pnt2d> & theEndPoint,
-                                         bool isFirstPointCenter)
+                                         const std::shared_ptr<GeomAPI_Pnt2d> & theEndPoint)
   : SketchAPI_SketchEntity(theFeature)
 {
   if (initialize()) {
-    setByPoints(theFirstPoint, theEndPoint, isFirstPointCenter);
+    setByPoints(theFirstPoint, theEndPoint);
   }
 }
 
@@ -60,38 +58,21 @@ SketchAPI_Rectangle::~SketchAPI_Rectangle()
 
 //--------------------------------------------------------------------------------------
 void SketchAPI_Rectangle::setByCoordinates(
-    double theX1, double theY1, double theX2, double theY2, bool isFirstPointCenter)
+    double theX1, double theY1, double theX2, double theY2)
 {
-  if(isFirstPointCenter){
-    fillAttribute(centerPoint(), theX1, theY1);
-    double xStart = 2.0*theX1 - theX2;
-    double yStart = 2.0*theY1 - theY2;
-    fillAttribute(startPoint(), xStart, yStart);
-  }
-  else
-    fillAttribute(startPoint(), theX1, theY1);
-
+  fillAttribute("RectangleTypeByCorners", type());
+  fillAttribute(startPoint(), theX1, theY1);
   fillAttribute(endPoint(), theX2, theY2);
-  execute(true);
+  execute();
 }
 
 void SketchAPI_Rectangle::setByPoints(const std::shared_ptr<GeomAPI_Pnt2d> & theFirstPoint,
-                                      const std::shared_ptr<GeomAPI_Pnt2d> & theSecondPoint,
-                                      bool isFirstPointCenter)
-{  
-  if(isFirstPointCenter){
-    fillAttribute(theFirstPoint, centerPoint());
-    double xStart = 2.0*theFirstPoint->x() - theSecondPoint->x();
-    double yStart = 2.0*theFirstPoint->y() - theSecondPoint->y();
-
-    std::shared_ptr<GeomAPI_Pnt2d> theStartPoint = std::make_shared<GeomAPI_Pnt2d>(xStart, yStart);
-    fillAttribute(theStartPoint, startPoint());
-  }
-  else
-    fillAttribute(theFirstPoint, startPoint());
-
+                                      const std::shared_ptr<GeomAPI_Pnt2d> & theSecondPoint)
+{
+  fillAttribute("RectangleTypeByCorners", type());
+  fillAttribute(theFirstPoint, startPoint());
   fillAttribute(theSecondPoint, endPoint());
-  execute(true);
+  execute();
 }
 
 //--------------------------------------------------------------------------------------
@@ -105,38 +86,3 @@ std::list<std::shared_ptr<SketchAPI_SketchEntity> > SketchAPI_Rectangle::lines()
     aFeatures.push_back(ModelAPI_Feature::feature(*anIt));
   return SketchAPI_SketchEntity::wrap(aFeatures);
 }
-
-//==================================================================================================
-void SketchAPI_Rectangle::dump(ModelHighAPI_Dumper& theDumper) const
-{
-
-  FeaturePtr aBase = feature();
-
-  /// do not dump sub-features eg: lines and lines constraints
-  AttributeRefListPtr noToDumpList =  aBase->reflist(SketchPlugin_Rectangle::NOT_TO_DUMP_LIST_ID());
-  for( int i = 0; i < noToDumpList->size(); i++){
-    theDumper.doNotDumpFeature(
-          std::dynamic_pointer_cast<ModelAPI_Feature>(noToDumpList->object(i)));
-  }
-
-  if (isCopy())
-    return; // no need to dump copied feature
-
-  const std::string& aSketchName = theDumper.parentName(aBase);
-
-  FeaturePtr aCenterPointFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(
-        aBase->refattr(SketchPlugin_Rectangle::CENTER_REF_ID())->object());
-  if(aCenterPointFeature){
-    // rectangle has center
-    theDumper << aBase << " = " << aSketchName << ".addRectangle("
-              << startPoint() << ", " << centerPoint() << ", 1)" << std::endl;
-  }
-  else
-    // rectangle given by start and end points
-    theDumper << aBase << " = " << aSketchName << ".addRectangle("
-              << startPoint() << ", " << endPoint() << ")" << std::endl;
-
-  // dump "auxiliary" flag if necessary
-  SketchAPI_SketchEntity::dump(theDumper);
-
-}