X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Tangent.cpp;h=eeda52ab44cd03abcd57adf7c7aa4c670c7f6639;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=45f32049425091c54120cc4d9426ca5457d3d15e;hpb=e9d4bd92e29ba18fc93a074b3bd3fd0972ec8992;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Tangent.cpp b/src/SketcherPrs/SketcherPrs_Tangent.cpp index 45f320494..eeda52ab4 100644 --- a/src/SketcherPrs/SketcherPrs_Tangent.cpp +++ b/src/SketcherPrs/SketcherPrs_Tangent.cpp @@ -1,14 +1,30 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Tangent.cpp -// Created: 16 February 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2023 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "SketcherPrs_Tangent.h" #include "SketcherPrs_Tools.h" #include "SketcherPrs_PositionMgr.h" #include +#include +#include +#include #include @@ -18,44 +34,75 @@ #include -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Tangent, SketcherPrs_SymbolPrs); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Tangent, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; -SketcherPrs_Tangent::SketcherPrs_Tangent(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) - : SketcherPrs_SymbolPrs(theConstraint, thePlane) +SketcherPrs_Tangent::SketcherPrs_Tangent(ModelAPI_Feature* theConstraint, + SketchPlugin_Sketch* theSketcher) + : SketcherPrs_SymbolPrs(theConstraint, theSketcher) { - myPntArray = new Graphic3d_ArrayOfPoints(2); - myPntArray->AddVertex(0., 0., 0.); - myPntArray->AddVertex(0., 0., 0.); -} +} -bool SketcherPrs_Tangent::updatePoints(double theStep) const +bool SketcherPrs_Tangent::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr&/* thePlane*/) { - ObjectPtr aObj1 = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); - ObjectPtr aObj2 = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B()); - if (SketcherPrs_Tools::getShape(aObj1).get() == NULL) - return false; - if (SketcherPrs_Tools::getShape(aObj2).get() == NULL) - return false; + bool aReadyToDisplay = false; - SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); - gp_Pnt aP1 = aMgr->getPosition(aObj1, this, theStep); - gp_Pnt aP2 = aMgr->getPosition(aObj2, this, theStep); - myPntArray->SetVertice(1, aP1); - myPntArray->SetVertice(2, aP2); - return true; + ObjectPtr aObj1 = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A()); + ObjectPtr aObj2 = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_B()); + + aReadyToDisplay = SketcherPrs_Tools::getShape(aObj1).get() != NULL && + SketcherPrs_Tools::getShape(aObj2).get() != NULL; + + return aReadyToDisplay; } -void SketcherPrs_Tangent::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const +bool SketcherPrs_Tangent::updateIfReadyToDisplay(double theStep, bool withColor) const { - Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs); + if (!IsReadyToDisplay(myConstraint, plane())) + return false; + + ObjectPtr aObj1 = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); + ObjectPtr aObj2 = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B()); + + GeomShapePtr aShp1 = SketcherPrs_Tools::getShape(aObj1); + GeomShapePtr aShp2 = SketcherPrs_Tools::getShape(aObj2); - Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); - aGroup->SetPrimitivesAspect(aLineAspect); + GeomCurvePtr aCurv1 = std::shared_ptr(new GeomAPI_Curve(aShp1)); + GeomCurvePtr aCurv2 = std::shared_ptr(new GeomAPI_Curve(aShp2)); + GeomPointPtr aPnt; + GeomShapePtr aIntPnt = aShp1->intersect(aShp2); + if (aIntPnt.get() && aIntPnt->isVertex()) { + GeomVertexPtr aVetrex(new GeomAPI_Vertex(aIntPnt)); + aPnt = aVetrex->point(); + } + + // Compute points coordinates + 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; +} + +void SketcherPrs_Tangent::drawLines(const Handle(Prs3d_Presentation)& thePrs, + Quantity_Color theColor) const +{ ObjectPtr aObj1 = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); ObjectPtr aObj2 = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B()); @@ -64,23 +111,7 @@ void SketcherPrs_Tangent::drawLines(const Handle(Prs3d_Presentation)& thePrs, Qu if ((aShape1.get() == NULL) || (aShape2.get() == NULL)) return; - - std::shared_ptr aCurve1 = std::shared_ptr(new GeomAPI_Curve(aShape1)); - std::shared_ptr aCurve2 = std::shared_ptr(new GeomAPI_Curve(aShape2)); - if (aCurve1->isCircle() && aCurve2->isLine()) { - addLine(aGroup, SketchPlugin_Constraint::ENTITY_B()); - GeomAdaptor_Curve aAdaptor(aCurve1->impl(), aCurve1->startParam(), aCurve1->endParam()); - StdPrs_DeflectionCurve::Add(thePrs,aAdaptor,myDrawer); - } else if (aCurve1->isLine() && aCurve2->isCircle()) { - addLine(aGroup, SketchPlugin_Constraint::ENTITY_A()); - GeomAdaptor_Curve aAdaptor(aCurve2->impl(), aCurve2->startParam(), aCurve2->endParam()); - StdPrs_DeflectionCurve::Add(thePrs,aAdaptor,myDrawer); - } else { - // Both curves are arcs - GeomAdaptor_Curve aAdaptor1(aCurve1->impl(), aCurve1->startParam(), aCurve1->endParam()); - StdPrs_DeflectionCurve::Add(thePrs, aAdaptor1, myDrawer); - GeomAdaptor_Curve aAdaptor2(aCurve2->impl(), aCurve2->startParam(), aCurve2->endParam()); - StdPrs_DeflectionCurve::Add(thePrs, aAdaptor2, myDrawer); - } + drawShape(aShape1, thePrs, theColor); + drawShape(aShape2, thePrs, theColor); }