Precise calculation of the flyout point for Length and Distance constraints

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp b/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
index 4522b07a85805120d1c46ee670c4bc279bb82122..3891a2c6cc5eed9a0a013533322e3f5280036d11 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
@@ -12,8 +12,10 @@
 #include <SketcherPrs_Tools.h>
 #include <SketcherPrs_Factory.h>
 
+#include <GeomAPI_Dir2d.h>
 #include <GeomAPI_Lin2d.h>
 #include <GeomAPI_Pnt2d.h>
+#include <GeomAPI_XY.h>
 #include <GeomDataAPI_Point2D.h>
 
 #include <ModelAPI_AttributeDouble.h>
@@ -21,11 +23,14 @@
 
 #include <Config_PropManager.h>
 
+#include <math.h>
+
 const double tolerance = 1e-7;
 
 
 SketchPlugin_ConstraintDistance::SketchPlugin_ConstraintDistance()
 {
+  myFlyoutUpdate = false;
 }
 
 //*************************************************************************************
@@ -69,6 +74,11 @@ bool SketchPlugin_ConstraintDistance::compute(const std::string& theAttributeId)
   if (!sketch())
     return false;
 
+  std::shared_ptr<GeomDataAPI_Point2D> aFlyOutAttr = std::dynamic_pointer_cast<
+                           GeomDataAPI_Point2D>(attribute(theAttributeId));
+  if (fabs(aFlyOutAttr->x()) >= tolerance || fabs(aFlyOutAttr->y()) >= tolerance)
+    return false;
+
   DataPtr aData = data();
   std::shared_ptr<GeomDataAPI_Point2D> aPoint_A = SketcherPrs_Tools::getFeaturePoint(
       aData, SketchPlugin_Constraint::ENTITY_A());
@@ -99,9 +109,6 @@ bool SketchPlugin_ConstraintDistance::compute(const std::string& theAttributeId)
   if (!aPnt_A || !aPnt_B)
     return false;
 
-  std::shared_ptr<GeomDataAPI_Point2D> aFlyOutAttr = std::dynamic_pointer_cast<
-                           GeomDataAPI_Point2D>(aData->attribute(theAttributeId));
-
   std::shared_ptr<GeomAPI_Pnt> aPoint1 = sketch()->to3D(aPnt_A->x(), aPnt_A->y());
   std::shared_ptr<GeomAPI_Pnt> aPoint2 = sketch()->to3D(aPnt_B->x(), aPnt_B->y());
   // it is not possible to create lin2d on the points with equal position
@@ -141,9 +148,46 @@ void SketchPlugin_ConstraintDistance::move(double theDeltaX, double theDeltaY)
   if (!aData->isValid())
     return;
 
+  // Recalculate a shift of flyout point in terms of local coordinates
+  std::shared_ptr<GeomAPI_XY> aDir(new GeomAPI_XY(theDeltaX, theDeltaY));
+  std::shared_ptr<GeomDataAPI_Point2D> aPointA = SketcherPrs_Tools::getFeaturePoint(
+      data(), SketchPlugin_Constraint::ENTITY_A());
+  std::shared_ptr<GeomDataAPI_Point2D> aPointB = SketcherPrs_Tools::getFeaturePoint(
+      data(), SketchPlugin_Constraint::ENTITY_B());
+
+  std::shared_ptr<GeomAPI_XY> aStartPnt;
+  std::shared_ptr<GeomAPI_XY> aEndPnt;
+  if (aPointA && aPointB) {
+    aStartPnt = aPointA->pnt()->xy();
+    aEndPnt = aPointB->pnt()->xy();
+  } else if (aPointA) {
+    FeaturePtr aLine = SketcherPrs_Tools::getFeatureLine(data(),
+        SketchPlugin_Constraint::ENTITY_B());
+    if (!aLine)
+      return;
+    std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointA->pnt();
+    aStartPnt = aPoint->xy();
+    aEndPnt = SketcherPrs_Tools::getProjectionPoint(aLine, aPoint)->xy();
+  } else if (aPointB) {
+    FeaturePtr aLine = SketcherPrs_Tools::getFeatureLine(data(),
+        SketchPlugin_Constraint::ENTITY_A());
+    if (!aLine)
+      return;
+    std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointB->pnt();
+    aStartPnt = SketcherPrs_Tools::getProjectionPoint(aLine, aPoint)->xy();
+    aEndPnt = aPoint->xy();
+  } else
+    return;
+
+  std::shared_ptr<GeomAPI_Dir2d> aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt)));
+  double dX = aDir->dot(aLineDir->xy());
+  double dY = -aDir->cross(aLineDir->xy());
+
   std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
       aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
-  aPoint->move(theDeltaX, theDeltaY);
+  myFlyoutUpdate = true;
+  aPoint->setValue(aPoint->x() + dX, aPoint->y() + dY);
+  myFlyoutUpdate = false;
 }
 
 double SketchPlugin_ConstraintDistance::calculateCurrentDistance() const
@@ -191,6 +235,53 @@ void SketchPlugin_ConstraintDistance::attributeChanged(const std::string& theID)
         aValueAttr->setValue(aDistance);
       }
     }
+  } else if (theID == SketchPlugin_Constraint::FLYOUT_VALUE_PNT() && !myFlyoutUpdate) {
+    myFlyoutUpdate = true;
+    // Recalculate flyout point in local coordinates of the distance constraint:
+    // the X coordinate is a length of projection of the flyout point on the line binding two distanced points
+    //                  or a line of projection of the distanced point onto the distanced segment
+    // the Y coordinate is a distance from the flyout point to the line
+    std::shared_ptr<GeomDataAPI_Point2D> aFlyoutAttr =
+        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+        attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
+    std::shared_ptr<GeomAPI_Pnt2d> aFlyoutPnt = aFlyoutAttr->pnt();
+
+    std::shared_ptr<GeomDataAPI_Point2D> aPointA = SketcherPrs_Tools::getFeaturePoint(
+        data(), SketchPlugin_Constraint::ENTITY_A());
+    std::shared_ptr<GeomDataAPI_Point2D> aPointB = SketcherPrs_Tools::getFeaturePoint(
+        data(), SketchPlugin_Constraint::ENTITY_B());
+
+    std::shared_ptr<GeomAPI_XY> aStartPnt;
+    std::shared_ptr<GeomAPI_XY> aEndPnt;
+    if (aPointA && aPointB) {
+      aStartPnt = aPointA->pnt()->xy();
+      aEndPnt = aPointB->pnt()->xy();
+    } else if (aPointA) {
+      FeaturePtr aLine = SketcherPrs_Tools::getFeatureLine(data(),
+          SketchPlugin_Constraint::ENTITY_B());
+      if (!aLine)
+        return;
+      std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointA->pnt();
+      aStartPnt = aPoint->xy();
+      aEndPnt = SketcherPrs_Tools::getProjectionPoint(aLine, aPoint)->xy();
+    } else if (aPointB) {
+      FeaturePtr aLine = SketcherPrs_Tools::getFeatureLine(data(),
+          SketchPlugin_Constraint::ENTITY_A());
+      if (!aLine)
+        return;
+      std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointB->pnt();
+      aStartPnt = SketcherPrs_Tools::getProjectionPoint(aLine, aPoint)->xy();
+      aEndPnt = aPoint->xy();
+    } else
+      return;
+
+    std::shared_ptr<GeomAPI_Dir2d> aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt)));
+    std::shared_ptr<GeomAPI_XY> aFlyoutDir = aFlyoutPnt->xy()->decreased(aStartPnt);
+
+    double X = aFlyoutDir->dot(aLineDir->xy());
+    double Y = -aFlyoutDir->cross(aLineDir->xy());
+    aFlyoutAttr->setValue(X, Y);
+    myFlyoutUpdate = false;
   }
 }
 

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
index 3529ace3c9479171410387cc0ae9ddcc5fc2d0ae..c8c7cb78129f01627acced76b0ebef54a77cb702 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
@@ -70,6 +70,9 @@ class SketchPlugin_ConstraintDistance : public SketchPlugin_ConstraintBase
 
   /// \brief Use plugin manager for features creation
   SketchPlugin_ConstraintDistance();
+
+private:
+  bool myFlyoutUpdate; ///< to avoid cyclic dependencies on automatic updates of flyout point
 };
 
 #endif

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
index 8162b5c613c2a15a683bbcac28376f0f3ec3a80a..9d996ab24028ccde370554cefbe64b3497148b90 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
@@ -17,13 +17,20 @@
 
 #include <GeomDataAPI_Point2D.h>
 
+#include <GeomAPI_Dir2d.h>
 #include <GeomAPI_Lin2d.h>
 #include <GeomAPI_Pnt2d.h>
+#include <GeomAPI_XY.h>
 
 #include <Config_PropManager.h>
 
+#include <math.h>
+
+const double tolerance = 1e-7;
+
 SketchPlugin_ConstraintLength::SketchPlugin_ConstraintLength()
 {
+  myFlyoutUpdate = false;
 }
 
 void SketchPlugin_ConstraintLength::initAttributes()
@@ -78,9 +85,11 @@ bool SketchPlugin_ConstraintLength::compute(const std::string& theAttributeId)
 
   std::shared_ptr<GeomAPI_Lin2d> aLine = 
     std::shared_ptr<GeomAPI_Lin2d>(new GeomAPI_Lin2d(aStartPoint->pnt(), anEndPoint->pnt()));
-  double aDist = aPoint1->distance(aPoint2)/5.;
-  std::shared_ptr<GeomAPI_Pnt2d> aFPnt = aLine->shiftedLocation(aDist);
-  aFlyOutAttr->setValue(aFPnt);
+  if (fabs(aFlyOutAttr->x()) < tolerance && fabs(aFlyOutAttr->y()) < tolerance) {
+    double aDist = aPoint1->distance(aPoint2)/5.;
+    std::shared_ptr<GeomAPI_Pnt2d> aFPnt = aLine->shiftedLocation(aDist);
+    aFlyOutAttr->setValue(aFPnt);
+  }
 
   return true;
 }
@@ -133,16 +142,36 @@ void SketchPlugin_ConstraintLength::move(double theDeltaX, double theDeltaY)
   if (!aData->isValid())
     return;
 
+  AttributeRefAttrPtr aLineAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+      attribute(SketchPlugin_Constraint::ENTITY_A()));
+  if (!aLineAttr || !aLineAttr->isObject())
+    return;
+  FeaturePtr aLine = ModelAPI_Feature::feature(aLineAttr->object());
+  if (!aLine || aLine->getKind() != SketchPlugin_Line::ID())
+    return;
+
+  // Recalculate a shift of flyout point in terms of local coordinates
+  std::shared_ptr<GeomAPI_XY> aDir(new GeomAPI_XY(theDeltaX, theDeltaY));
+  std::shared_ptr<GeomAPI_XY> aStartPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+      aLine->attribute(SketchPlugin_Line::START_ID()))->pnt()->xy();
+  std::shared_ptr<GeomAPI_XY> aEndPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+      aLine->attribute(SketchPlugin_Line::END_ID()))->pnt()->xy();
+  std::shared_ptr<GeomAPI_Dir2d> aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt)));
+  double dX = aDir->dot(aLineDir->xy());
+  double dY = -aDir->cross(aLineDir->xy());
+
+  myFlyoutUpdate = true;
   std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
       aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
-  aPoint->move(theDeltaX, theDeltaY);
+  aPoint->setValue(aPoint->x() + dX, aPoint->y() + dY);
+  myFlyoutUpdate = false;
 }
 
 void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) {
   if (theID == SketchPlugin_Constraint::ENTITY_A()) 
   {
     std::shared_ptr<ModelAPI_AttributeDouble> aValueAttr = std::dynamic_pointer_cast<
-      ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE()));
+      ModelAPI_AttributeDouble>(attribute(SketchPlugin_Constraint::VALUE()));
     if (!aValueAttr->isInitialized()) { // only if it is not initialized, try to compute the current value
       std::shared_ptr<GeomAPI_Pnt> aPoint1, aPoint2;
       std::shared_ptr<GeomDataAPI_Point2D> aStartPoint, anEndPoint;
@@ -151,5 +180,33 @@ void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) {
         aValueAttr->setValue(aLength);
       }
     }
+  } else if (theID == SketchPlugin_Constraint::FLYOUT_VALUE_PNT() && !myFlyoutUpdate) {
+    myFlyoutUpdate = true;
+    // Recalculate flyout point in local coordinates of the line:
+    // the X coordinate is a length of projection of the flyout point on the line
+    // the Y coordinate is a distance from the point to the line
+    std::shared_ptr<GeomDataAPI_Point2D> aFlyoutAttr =
+        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+        attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
+    AttributeRefAttrPtr aLineAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+        attribute(SketchPlugin_Constraint::ENTITY_A()));
+    if (!aLineAttr || !aLineAttr->isObject())
+      return;
+    FeaturePtr aLine = ModelAPI_Feature::feature(aLineAttr->object());
+    if (!aLine || aLine->getKind() != SketchPlugin_Line::ID())
+      return;
+
+    std::shared_ptr<GeomAPI_Pnt2d> aFlyoutPnt = aFlyoutAttr->pnt();
+    std::shared_ptr<GeomAPI_XY> aStartPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+        aLine->attribute(SketchPlugin_Line::START_ID()))->pnt()->xy();
+    std::shared_ptr<GeomAPI_XY> aEndPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+        aLine->attribute(SketchPlugin_Line::END_ID()))->pnt()->xy();
+
+    std::shared_ptr<GeomAPI_Dir2d> aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt)));
+    std::shared_ptr<GeomAPI_XY> aFlyoutDir = aFlyoutPnt->xy()->decreased(aStartPnt);
+    double X = aFlyoutDir->dot(aLineDir->xy());
+    double Y = -aFlyoutDir->cross(aLineDir->xy());
+    aFlyoutAttr->setValue(X, Y);
+    myFlyoutUpdate = false;
   }
 }

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.h b/src/SketchPlugin/SketchPlugin_ConstraintLength.h
index b3954b6fadb246b0908bc902947436a830839b2a..a905ad1d697d1ffa5fd0f328bc7603608f468779 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintLength.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.h
@@ -70,6 +70,9 @@ private:
     std::shared_ptr<GeomAPI_Pnt>& thePoint1, std::shared_ptr<GeomAPI_Pnt>& thePoint2,
     std::shared_ptr<GeomDataAPI_Point2D>& theStartPoint,
     std::shared_ptr<GeomDataAPI_Point2D>& theEndPoint);
+
+private:
+  bool myFlyoutUpdate; ///< to avoid cyclic dependencies on automatic updates of flyout point
 };
 
 #endif

diff --git a/src/SketcherPrs/SketcherPrs_Tools.cpp b/src/SketcherPrs/SketcherPrs_Tools.cpp
index 94b98c2951d536f3ec5daf55577b6bca4dc792ea..8497ec08edf453c50161989aab466db832a3a96f 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Tools.cpp
+++ b/src/SketcherPrs/SketcherPrs_Tools.cpp
@@ -145,7 +145,11 @@ void setArrowSize(double theSize)
 double getFlyoutDistance(const ModelAPI_Feature* theConstraint, 
                          const std::shared_ptr<GeomAPI_Ax3>& thePlane)
 {
-  return 50;
+  std::shared_ptr<GeomDataAPI_Point2D> aFlyoutPoint =
+      std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+      const_cast<ModelAPI_Feature*>(theConstraint)->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
+
+  return aFlyoutPoint->y();
 }