-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "SketcherPrs_Tangent.h"
#include <GeomAPI_Curve.h>
#include <GeomAPI_Circ.h>
#include <GeomAPI_Lin.h>
+#include <GeomAPI_Vertex.h>
#include <SketchPlugin_Constraint.h>
static Handle(Image_AlienPixMap) MyPixMap;
SketcherPrs_Tangent::SketcherPrs_Tangent(ModelAPI_Feature* theConstraint,
- const std::shared_ptr<GeomAPI_Ax3>& thePlane)
- : SketcherPrs_SymbolPrs(theConstraint, thePlane)
+ SketchPlugin_Sketch* theSketcher)
+ : SketcherPrs_SymbolPrs(theConstraint, theSketcher)
{
}
bool SketcherPrs_Tangent::updateIfReadyToDisplay(double theStep, bool withColor) const
{
- if (!IsReadyToDisplay(myConstraint, myPlane))
+ if (!IsReadyToDisplay(myConstraint, plane()))
return false;
ObjectPtr aObj1 =
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;
- double aFirst, aLast;
- if (aCurv1->isLine()) {
- aLine = aCurv1;
- aCircle = GeomCirclePtr(new GeomAPI_Circ(aCurv2));
- aFirst = aCurv2->startParam();
- aLast = aCurv2->endParam();
- } else {
- aLine = aCurv2;
- aCircle = GeomCirclePtr(new GeomAPI_Circ(aCurv1));
- aFirst = aCurv1->startParam();
- aLast = aCurv1->endParam();
- }
-
- GeomPointPtr aPnt1 = aLine->getPoint(aLine->startParam());
- GeomPointPtr aPnt2 = aLine->getPoint(aLine->endParam());
- double aParam;
GeomPointPtr aPnt;
- if (aCircle->parameter(aPnt1, 1.e-4, aParam) && (aParam >= aFirst) && (aParam <= aLast))
- 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;
}