Issue #1299, Issue #1393 Angle constraint: support of additional and complementary...

[modules/shaper.git] / src / SketchSolver / SketchSolver_ConstraintTangent.cpp

diff --git a/src/SketchSolver/SketchSolver_ConstraintTangent.cpp b/src/SketchSolver/SketchSolver_ConstraintTangent.cpp
index bf551e43c27dc156663e6cbe472b9b7c0ecabc66..299ed53fa94356949d8cf004d6be036f5f7f79f8 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintTangent.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintTangent.cpp
@@ -3,6 +3,9 @@
 #include <SketchSolver_Manager.h>
 
 #include <GeomAPI_Pnt2d.h>
+#include <SketchPlugin_Circle.h>
+
+#include <cmath>
 
 
 /// \brief Check whether the entities has only one shared point
@@ -21,8 +24,12 @@ static bool hasSingleCoincidence(EntityWrapperPtr theEntity1, EntityWrapperPtr t
   int aNbCoinc = 0;
   std::list<EntityWrapperPtr>::const_iterator anIt1, anIt2;
   for (anIt1 = aStartIt1; anIt1 != aPoints1.end(); ++anIt1) {
+    if ((*anIt1)->type() != ENTITY_POINT)
+      continue;
     std::shared_ptr<GeomAPI_Pnt2d> aPt1 = aBuilder->point(*anIt1);
     for (anIt2 = aStartIt2; anIt2 != aPoints2.end(); ++anIt2) {
+      if ((*anIt2)->type() != ENTITY_POINT)
+        continue;
       std::shared_ptr<GeomAPI_Pnt2d> aPt2 = aBuilder->point(*anIt2);
       if (aPt1->distance(aPt2) < tolerance)
         ++aNbCoinc;
@@ -45,6 +52,7 @@ void SketchSolver_ConstraintTangent::getAttributes(
   // Check the quantity of entities of each type and their order (arcs first)
   int aNbLines = 0;
   int aNbArcs = 0;
+  int aNbCircles = 0;
   bool isSwap = false; // whether need to swap arguments (arc goes before line)
   std::vector<EntityWrapperPtr>::iterator anEntIt = theAttributes.begin() + 2;
   for (; anEntIt != theAttributes.end(); ++anEntIt) {
@@ -54,14 +62,22 @@ void SketchSolver_ConstraintTangent::getAttributes(
       ++aNbArcs;
       isSwap = aNbLines > 0;
     }
+    else if ((*anEntIt)->type() == ENTITY_CIRCLE) {
+      ++aNbCircles;
+      isSwap = aNbLines > 0;
+    }
   }
 
-  if (aNbArcs < 1) {
+  if (aNbArcs < 1 && aNbCircles < 1) {
     myErrorMsg = SketchSolver_Error::INCORRECT_TANGENCY_ATTRIBUTE();
     return;
   }
-  if (aNbLines == 1 && aNbArcs == 1)
-    myType = CONSTRAINT_TANGENT_ARC_LINE;
+  if (aNbLines == 1) {
+    if (aNbArcs == 1)
+      myType = CONSTRAINT_TANGENT_ARC_LINE;
+    else if (aNbCircles == 1)
+      myType = CONSTRAINT_TANGENT_CIRCLE_LINE;
+  }
   else if (aNbArcs == 2)
     myType = CONSTRAINT_TANGENT_ARC_ARC;
   else {
@@ -69,8 +85,9 @@ void SketchSolver_ConstraintTangent::getAttributes(
     return;
   }
 
-  if (!hasSingleCoincidence(theAttributes[2], theAttributes[3]))
-    myErrorMsg = SketchSolver_Error::INCORRECT_ATTRIBUTE();
+  if (myType == CONSTRAINT_TANGENT_ARC_LINE && 
+      !hasSingleCoincidence(theAttributes[2], theAttributes[3]))
+    myErrorMsg = SketchSolver_Error::TANGENCY_FAILED();
 
   if (isSwap) {
     EntityWrapperPtr aTemp = theAttributes[2];
@@ -78,3 +95,27 @@ void SketchSolver_ConstraintTangent::getAttributes(
     theAttributes[3] = aTemp;
   }
 }
+
+void SketchSolver_ConstraintTangent::adjustConstraint()
+{
+  if (myType != CONSTRAINT_TANGENT_CIRCLE_LINE)
+    return;
+
+  ConstraintWrapperPtr aConstraint = myStorage->constraint(myBaseConstraint).front();
+  AttributePtr aCircleCenter = aConstraint->entities().front()->baseAttribute();
+  if (!aCircleCenter)
+    return;
+  FeaturePtr aCircle = ModelAPI_Feature::feature(aCircleCenter->owner());
+  AttributeDoublePtr aRadius = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(
+      aCircle->attribute(SketchPlugin_Circle::RADIUS_ID()));
+
+  if (fabs(aRadius->value()) == fabs(aConstraint->value()))
+    return;
+
+  aConstraint->setValue(aRadius->value());
+
+  // Adjust the sign of constraint value
+  BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
+  aBuilder->adjustConstraint(aConstraint);
+  myStorage->addConstraint(myBaseConstraint, aConstraint);
+}