First part of the test correction for improvement: 2D points selection in multi-trans...

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Arc.cpp

diff --git a/src/SketchPlugin/SketchPlugin_Arc.cpp b/src/SketchPlugin/SketchPlugin_Arc.cpp
index 04f2c922babe98d54245f40d28f4b9569af2c29f..7d285d079dd1cfa00f5c3494330be7ef428054cf 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Arc.cpp
+++ b/src/SketchPlugin/SketchPlugin_Arc.cpp
@@ -12,6 +12,7 @@
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
 
+#include <GeomAPI_Ax2.h>
 #include <GeomAPI_Circ2d.h>
 #include <GeomAPI_Circ.h>
 #include <GeomAPI_Pnt2d.h>
@@ -24,6 +25,9 @@
 #include <math.h>
 
 const double tolerance = 1e-7;
+const double paramTolerance = 1.e-4;
+const double PI =3.141592653589793238463;
+
 
 SketchPlugin_Arc::SketchPlugin_Arc()
     : SketchPlugin_SketchEntity()
@@ -33,6 +37,8 @@ SketchPlugin_Arc::SketchPlugin_Arc()
   // default values
   myXEndBefore = 0;
   myYEndBefore = 0;
+
+  myParamBefore = 0;
 }
 
 void SketchPlugin_Arc::initAttributes()
@@ -46,6 +52,12 @@ void SketchPlugin_Arc::initAttributes()
   data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId());
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXTERNAL_ID());
 
+  data()->addAttribute(INVERSED_ID(), ModelAPI_AttributeBoolean::typeId());
+  AttributeBooleanPtr isInversed =
+      std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(attribute(INVERSED_ID()));
+  if (!isInversed->isInitialized())
+    isInversed->setValue(false);
+
   // get the initial values
   if (anEndAttr->isInitialized()) {
     myXEndBefore = anEndAttr->x();
@@ -92,9 +104,31 @@ void SketchPlugin_Arc::execute()
       anEndAttr->setValue(aProjection);
     */
     std::shared_ptr<GeomAPI_Pnt> aEndPoint(aSketch->to3D(anEndAttr->x(), anEndAttr->y()));
+    AttributeBooleanPtr isInversed =
+        std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(attribute(INVERSED_ID()));
+
+    std::shared_ptr<GeomAPI_Dir> anXDir(new GeomAPI_Dir(aStartPoint->xyz()->decreased(aCenter->xyz())));
+    std::shared_ptr<GeomAPI_Ax2> anAx2(new GeomAPI_Ax2(aCenter, aNormal, anXDir));
+    std::shared_ptr<GeomAPI_Circ> aCirc(new GeomAPI_Circ(anAx2, aCenter->distance(aStartPoint)));
+    double aParameterNew = 0.0;
+    if(aCirc->parameter(aEndPoint, paramTolerance, aParameterNew)) {
+      if(0 <= myParamBefore && myParamBefore <= PI / 2.0
+        && PI * 1.5 <= aParameterNew && aParameterNew <= PI * 2.0) {
+          isInversed->setValue(true);
+      } else if(PI * 1.5 <= myParamBefore && myParamBefore <= PI * 2.0
+        && 0 <= aParameterNew && aParameterNew <= PI / 2.0) {
+          isInversed->setValue(false);
+      }
+    }
+    myParamBefore = aParameterNew;
+
+    std::shared_ptr<GeomAPI_Shape> aCircleShape;
+    if(!isInversed->value()) {
+      aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircleArc(aCenter, aStartPoint, aEndPoint, aNormal);
+    } else {
+      aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircleArc(aCenter, aEndPoint, aStartPoint, aNormal);
+    }
 
-    std::shared_ptr<GeomAPI_Shape> aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircleArc(
-        aCenter, aStartPoint, aEndPoint, aNormal);
     if (aCircleShape) {
       std::shared_ptr<ModelAPI_ResultConstruction> aConstr2 = document()->createConstruction(
           data(), 1);
@@ -232,30 +266,31 @@ void SketchPlugin_Arc::attributeChanged(const std::string& theID)
         new GeomAPI_Circ2d(aCenterAttr->pnt(), aStartAttr->pnt()));
     std::shared_ptr<GeomAPI_Pnt2d> aProjection = aCircleForArc->project(anEndAttr->pnt());
     if (aProjection && anEndAttr->pnt()->distance(aProjection) > tolerance) {
-      // issue #855: trying to update only not-updated coordinate if it is possible
-      if (abs(myXEndBefore - anEndAttr->x()) < 1.e-10) { // keep Y unchanged
-        double aVy = aCenterAttr->y() - anEndAttr->y();
-        double aVy2 = aVy * aVy;
-        double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
-        if (aVy2 <= aR2) {
-          double aDX = sqrt(aR2 - aVy * aVy);
-          if (anEndAttr->x() > aCenterAttr->x())
-            aProjection->setX(aCenterAttr->x() + aDX);
-          else 
-            aProjection->setX(aCenterAttr->x() - aDX);
-          aProjection->setY(anEndAttr->y());
-        }
-      } else if (abs(myYEndBefore - anEndAttr->y()) < 1.e-10) { // keep X unchanged
-        double aVx = aCenterAttr->x() - anEndAttr->x();
-        double aVx2 = aVx * aVx;
-        double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
-        if (aVx2 <= aR2) {
-          double aDY = sqrt(aR2 - aVx * aVx);
-          if (anEndAttr->y() > aCenterAttr->y())
-            aProjection->setY(aCenterAttr->y() + aDY);
-          else 
-            aProjection->setY(aCenterAttr->y() - aDY);
-          aProjection->setX(anEndAttr->x());
+      if (!isStable()) { // issue #855: trying to update only not-updated coordinate if it is possible
+        if (fabs(myXEndBefore - anEndAttr->x()) < 1.e-10) { // keep Y unchanged
+          double aVy = aCenterAttr->y() - anEndAttr->y();
+          double aVy2 = aVy * aVy;
+          double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
+          if (aVy2 <= aR2) {
+            double aDX = sqrt(aR2 - aVy * aVy);
+            if (anEndAttr->x() > aCenterAttr->x())
+              aProjection->setX(aCenterAttr->x() + aDX);
+            else 
+              aProjection->setX(aCenterAttr->x() - aDX);
+            aProjection->setY(anEndAttr->y());
+          }
+        } else if (fabs(myYEndBefore - anEndAttr->y()) < 1.e-10) { // keep X unchanged
+          double aVx = aCenterAttr->x() - anEndAttr->x();
+          double aVx2 = aVx * aVx;
+          double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
+          if (aVx2 <= aR2) {
+            double aDY = sqrt(aR2 - aVx * aVx);
+            if (anEndAttr->y() > aCenterAttr->y())
+              aProjection->setY(aCenterAttr->y() + aDY);
+            else 
+              aProjection->setY(aCenterAttr->y() - aDY);
+            aProjection->setX(anEndAttr->x());
+          }
         }
       }
 
@@ -284,3 +319,14 @@ void SketchPlugin_Arc::attributeChanged(const std::string& theID)
     myEndUpdate = false;
   }
 }
+
+void SketchPlugin_Arc::setReversed(bool isReversed)
+{
+  std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(attribute(INVERSED_ID()))->setValue(isReversed);
+  myParamBefore = 0.0;
+}
+
+bool SketchPlugin_Arc::isReversed()
+{
+  return std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(attribute(INVERSED_ID()))->value();
+}