Adjust the big models according to new naming

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_Tangent.cpp

diff --git a/src/SketcherPrs/SketcherPrs_Tangent.cpp b/src/SketcherPrs/SketcherPrs_Tangent.cpp
index 8358b07e6f5e703938dd766cb45bcbd0eb44f444..bf998d8120b5e8fe1c17ed3d932ab56567ee012c 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Tangent.cpp
+++ b/src/SketcherPrs/SketcherPrs_Tangent.cpp
@@ -25,6 +25,7 @@
 #include <GeomAPI_Curve.h>
 #include <GeomAPI_Circ.h>
 #include <GeomAPI_Lin.h>
+#include <GeomAPI_Vertex.h>
 
 #include <SketchPlugin_Constraint.h>
 
@@ -39,8 +40,9 @@ IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Tangent, SketcherPrs_SymbolPrs);
 static Handle(Image_AlienPixMap) MyPixMap;
 
 SketcherPrs_Tangent::SketcherPrs_Tangent(ModelAPI_Feature* theConstraint,
+                                         ModelAPI_CompositeFeature* theSketcher,
                                            const std::shared_ptr<GeomAPI_Ax3>& thePlane)
- : SketcherPrs_SymbolPrs(theConstraint, thePlane)
+ : SketcherPrs_SymbolPrs(theConstraint, theSketcher, thePlane)
 {
 }
 
@@ -76,30 +78,27 @@ bool SketcherPrs_Tangent::updateIfReadyToDisplay(double theStep, bool withColor)
   GeomCurvePtr aCurv1 = std::shared_ptr<GeomAPI_Curve>(new GeomAPI_Curve(aShp1));
   GeomCurvePtr aCurv2 = std::shared_ptr<GeomAPI_Curve>(new GeomAPI_Curve(aShp2));
 
-  GeomCurvePtr aLine;
-  GeomCirclePtr aCircle;
-  if (aCurv1->isLine()) {
-    aLine = aCurv1;
-    aCircle = GeomCirclePtr(new GeomAPI_Circ(aCurv2));
-  } else {
-    aLine = aCurv2;
-    aCircle = GeomCirclePtr(new GeomAPI_Circ(aCurv1));
-  }
-
-  GeomPointPtr aPnt1 = aLine->getPoint(aLine->startParam());
-  GeomPointPtr aPnt2 = aLine->getPoint(aLine->endParam());
-  double aParam;
   GeomPointPtr aPnt;
-  if (aCircle->parameter(aPnt1, 1.e-4, aParam))
-    aPnt = aPnt1;
-  else
-    aPnt = aPnt2;
+  GeomShapePtr aIntPnt = aShp1->intersect(aShp2);
+  if (aIntPnt.get() && aIntPnt->isVertex()) {
+    GeomVertexPtr aVetrex(new GeomAPI_Vertex(aIntPnt));
+    aPnt = aVetrex->point();
+  }
 
   // Compute points coordinates
-  SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
-  gp_Pnt aP1 = aMgr->getPosition(aObj1, this, theStep, aPnt);
-  myPntArray = new Graphic3d_ArrayOfPoints(1, withColor);
-  myPntArray->AddVertex(aP1);
+  if (aPnt.get()) {
+    SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
+    gp_Pnt aP1 = aMgr->getPosition(aObj1, this, theStep, aPnt);
+    myPntArray = new Graphic3d_ArrayOfPoints(1, withColor);
+    myPntArray->AddVertex(aP1);
+  } else {
+    SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
+    gp_Pnt aP1 = aMgr->getPosition(aObj1, this, theStep);
+    gp_Pnt aP2 = aMgr->getPosition(aObj2, this, theStep);
+    myPntArray = new Graphic3d_ArrayOfPoints(2, withColor);
+    myPntArray->AddVertex(aP1);
+    myPntArray->AddVertex(aP2);
+  }
   return true;
 }