From: azv <azv@opencascade.com>
Date: Thu, 3 Oct 2019 07:56:22 +0000 (+0300)
Subject: Task 2.12. New entities: ellipses and arcs of ellipses (issue #3003)
X-Git-Tag: V9_4_0a2~4^2~30
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4009aa9938655a349d1151319972149f2d75b3bd;p=modules%2Fshaper.git

Task 2.12. New entities: ellipses and arcs of ellipses (issue #3003)

Improve constraint Middle point on elliptic arc.
---

diff --git a/src/GeomAPI/GeomAPI.i b/src/GeomAPI/GeomAPI.i
index 56ab015a7..4c4110155 100644
--- a/src/GeomAPI/GeomAPI.i
+++ b/src/GeomAPI/GeomAPI.i
@@ -103,6 +103,17 @@
   }
 }
 
+%typemap(in) double & (double temp) {
+  if (PyLong_Check($input)) {
+    temp = PyLong_AsLong($input);
+    $1 = &temp;
+  }
+}
+
+%typemap(argout) double & {
+  $result = PyFloat_FromDouble(*$1);
+}
+
 
 // all supported interfaces
 %include "GeomAPI_Interface.h"
diff --git a/src/SketchPlugin/SketchPlugin_Validators.cpp b/src/SketchPlugin/SketchPlugin_Validators.cpp
index 46a358114..1a255e57e 100644
--- a/src/SketchPlugin/SketchPlugin_Validators.cpp
+++ b/src/SketchPlugin/SketchPlugin_Validators.cpp
@@ -771,7 +771,8 @@ bool SketchPlugin_MiddlePointAttrValidator::isValid(const AttributePtr& theAttri
       if (aFeature->getKind() == SketchPlugin_Point::ID())
         ++aNbPoints;
       else if (aFeature->getKind() == SketchPlugin_Line::ID() ||
-               aFeature->getKind() == SketchPlugin_Arc::ID())
+               aFeature->getKind() == SketchPlugin_Arc::ID() ||
+               aFeature->getKind() == SketchPlugin_EllipticArc::ID())
         ++aNbLines;
     }
   }
diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 69d6a1c71..3db87cbf2 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -1128,7 +1128,7 @@
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityB"/>
           <validator id="SketchPlugin_PerpendicularAttr" parameters="ConstraintEntityB"/>
-          <validator id="GeomValidators_ShapeType" parameters="line,circle"/>
+          <validator id="GeomValidators_ShapeType" parameters="edge"/>
         </sketch_shape_selector>
 
         <sketch_shape_selector id="ConstraintEntityB"
@@ -1137,7 +1137,7 @@
           <validator id="PartSet_DifferentObjects"/>
           <validator id="SketchPlugin_ExternalValidator" parameters="ConstraintEntityA"/>
           <validator id="SketchPlugin_PerpendicularAttr" parameters="ConstraintEntityA"/>
-          <validator id="GeomValidators_ShapeType" parameters="line,circle"/>
+          <validator id="GeomValidators_ShapeType" parameters="edge"/>
         </sketch_shape_selector>
         <validator id="PartSet_PerpendicularSelection"/>
       </feature>
diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Tools.cpp b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Tools.cpp
index 7f416c66b..ccc07b05b 100644
--- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Tools.cpp
+++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Tools.cpp
@@ -464,6 +464,27 @@ ConstraintWrapperPtr createConstraintPointsCollinear(
       new PlaneGCSSolver_ConstraintWrapper(aNewConstr, CONSTRAINT_PT_ON_CURVE));
 }
 
+template <typename ARCTYPE>
+void createConstraintMiddlePointOnArc(ARCTYPE theArc,
+                                      GCSPointPtr thePoint,
+                                      std::shared_ptr<PlaneGCSSolver_PointWrapper> theAuxParameters,
+                                      std::list<GCSConstraintPtr>& theConstraints)
+{
+  double* u = theAuxParameters->point()->x;
+  double* diff = theAuxParameters->point()->y;
+  *u = (*theArc->startAngle + *theArc->endAngle) * 0.5;
+  *diff = (*theArc->endAngle - *theArc->startAngle) * 0.5;
+
+  theConstraints.push_back(GCSConstraintPtr(
+      new GCS::ConstraintCurveValue(*thePoint, thePoint->x, *theArc, u)));
+  theConstraints.push_back(GCSConstraintPtr(
+      new GCS::ConstraintCurveValue(*thePoint, thePoint->y, *theArc, u)));
+  theConstraints.push_back(GCSConstraintPtr(
+      new GCS::ConstraintDifference(theArc->startAngle, u, diff)));
+  theConstraints.push_back(GCSConstraintPtr(
+      new GCS::ConstraintDifference(u, theArc->endAngle, diff)));
+}
+
 ConstraintWrapperPtr createConstraintMiddlePoint(
     std::shared_ptr<PlaneGCSSolver_PointWrapper> thePoint,
     std::shared_ptr<PlaneGCSSolver_EdgeWrapper> theEntity,
@@ -480,20 +501,13 @@ ConstraintWrapperPtr createConstraintMiddlePoint(
   }
   else {
     std::shared_ptr<GCS::Arc> anArc = std::dynamic_pointer_cast<GCS::Arc>(theEntity->entity());
-    if (anArc) {
-      double* u = theAuxParameters->point()->x;
-      double* diff = theAuxParameters->point()->y;
-      *u = (*anArc->startAngle + *anArc->endAngle) * 0.5;
-      *diff = (*anArc->endAngle - *anArc->startAngle) * 0.5;
-
-      aConstrList.push_back(GCSConstraintPtr(
-          new GCS::ConstraintCurveValue(*aPoint, aPoint->x, *anArc, u)));
-      aConstrList.push_back(GCSConstraintPtr(
-          new GCS::ConstraintCurveValue(*aPoint, aPoint->y, *anArc, u)));
-      aConstrList.push_back(GCSConstraintPtr(
-          new GCS::ConstraintDifference(anArc->startAngle, u, diff)));
-      aConstrList.push_back(GCSConstraintPtr(
-          new GCS::ConstraintDifference(u, anArc->endAngle, diff)));
+    if (anArc)
+      createConstraintMiddlePointOnArc(anArc, aPoint, theAuxParameters, aConstrList);
+    else {
+      std::shared_ptr<GCS::ArcOfEllipse> aEllArc =
+          std::dynamic_pointer_cast<GCS::ArcOfEllipse>(theEntity->entity());
+      if (aEllArc)
+        createConstraintMiddlePointOnArc(aEllArc, aPoint, theAuxParameters, aConstrList);
     }
   }
 
diff --git a/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp b/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp
index 15b8dc285..893747131 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMiddle.cpp
@@ -25,6 +25,11 @@
 #include <PlaneGCSSolver_Tools.h>
 #include <PlaneGCSSolver_UpdateCoincidence.h>
 
+static bool isArc(EntityWrapperPtr theEntity)
+{
+  return theEntity->type() == ENTITY_ARC || theEntity->type() == ENTITY_ELLIPTIC_ARC;
+}
+
 void SketchSolver_ConstraintMiddle::getAttributes(
     EntityWrapperPtr& theValue,
     std::vector<EntityWrapperPtr>& theAttributes)
@@ -32,7 +37,7 @@ void SketchSolver_ConstraintMiddle::getAttributes(
   SketchSolver_Constraint::getAttributes(theValue, theAttributes);
 
   // create auxiliary point if middle point on arc is specified
-  if (theAttributes[2]->type() == ENTITY_ARC) {
+  if (isArc(theAttributes[2])) {
     std::shared_ptr<PlaneGCSSolver_Storage> aStorage =
         std::dynamic_pointer_cast<PlaneGCSSolver_Storage>(myStorage);
 
@@ -65,16 +70,25 @@ void SketchSolver_ConstraintMiddle::notify(const FeaturePtr&      theFeature,
     // update the middle point parameter if the constraint is "point-on-arc".
     if (myOddPoint) {
       EntityWrapperPtr anArcEntity =
-          myAttributes.front()->type() == ENTITY_ARC ? myAttributes.front() : myAttributes.back();
+          isArc(myAttributes.front()) ? myAttributes.front() : myAttributes.back();
       EdgeWrapperPtr anArcEdge =
           std::dynamic_pointer_cast<PlaneGCSSolver_EdgeWrapper>(anArcEntity);
-      std::shared_ptr<GCS::Arc> anArc;
-      if (anArcEdge)
-        anArc = std::dynamic_pointer_cast<GCS::Arc>(anArcEdge->entity());
-      if (anArc) {
-        // recalculate parameters of middle point according to arc
-        *myOddPoint->x = (*anArc->startAngle + *anArc->endAngle) * 0.5;
-        *myOddPoint->y = (*anArc->endAngle - *anArc->startAngle) * 0.5;
+      if (anArcEdge) {
+        std::shared_ptr<GCS::Arc> anArc = std::dynamic_pointer_cast<GCS::Arc>(anArcEdge->entity());
+        if (anArc) {
+          // recalculate parameters of middle point according to arc
+          *myOddPoint->x = (*anArc->startAngle + *anArc->endAngle) * 0.5;
+          *myOddPoint->y = (*anArc->endAngle - *anArc->startAngle) * 0.5;
+        }
+        else {
+          std::shared_ptr<GCS::ArcOfEllipse> aEllArc =
+              std::dynamic_pointer_cast<GCS::ArcOfEllipse>(anArcEdge->entity());
+          if (aEllArc) {
+            // recalculate parameters of middle point according to arc
+            *myOddPoint->x = (*aEllArc->startAngle + *aEllArc->endAngle) * 0.5;
+            *myOddPoint->y = (*aEllArc->endAngle - *aEllArc->startAngle) * 0.5;
+          }
+        }
       }
     }
     return;