X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Perpendicular.cpp;h=9481a66f290f5d4a2b23a2288ea7d5f25e5bf789;hb=f71c1052b2ecc33488b2136947088777adc17584;hp=d27cf03e57cb1b28e4876ec9d52b7c11ac05f67b;hpb=4db1ccae61d6f09173fcf51c60d1742bb9d37067;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp index d27cf03e5..9481a66f2 100644 --- a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp +++ b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Perpendicular.cpp -// Created: 12 March 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2020 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_Perpendicular.h" #include "SketcherPrs_Tools.h" @@ -13,58 +26,82 @@ #include #include +#include +#include +#include +#include -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Perpendicular, SketcherPrs_SymbolPrs); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Perpendicular, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; -SketcherPrs_Perpendicular::SketcherPrs_Perpendicular(SketchPlugin_Constraint* theConstraint, - const std::shared_ptr& thePlane) - : SketcherPrs_SymbolPrs(theConstraint, thePlane) +SketcherPrs_Perpendicular::SketcherPrs_Perpendicular(ModelAPI_Feature* theConstraint, + SketchPlugin_Sketch* theSketcher) + : SketcherPrs_SymbolPrs(theConstraint, theSketcher) +{ +} + +bool SketcherPrs_Perpendicular::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) { - myPntArray = new Graphic3d_ArrayOfPoints(2); - myPntArray->AddVertex(0., 0., 0.); - myPntArray->AddVertex(0., 0., 0.); -} - -void SketcherPrs_Perpendicular::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) + bool aReadyToDisplay = false; + if (thePlane) { + 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; +} + +bool SketcherPrs_Perpendicular::updateIfReadyToDisplay(double theStep, bool withColor) const { - prepareAspect(); + 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()); + ObjectPtr aObj1 = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); + ObjectPtr aObj2 = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B()); - std::shared_ptr aLine1 = SketcherPrs_Tools::getShape(aObj1); - if (aLine1.get() == NULL) - return; + GeomShapePtr aShp1 = SketcherPrs_Tools::getShape(aObj1); + GeomShapePtr aShp2 = SketcherPrs_Tools::getShape(aObj2); - std::shared_ptr aLine2 = SketcherPrs_Tools::getShape(aObj2); - if (aLine2.get() == NULL) - return; + GeomEdgePtr aEdge1(new GeomAPI_Edge(aShp1)); + GeomEdgePtr aEdge2(new GeomAPI_Edge(aShp2)); + GeomShapePtr anInter = aEdge1->intersect(aEdge2); + std::shared_ptr aPnt; + if (anInter && anInter->isVertex()) + aPnt = anInter->vertex()->point(); + + // Compute position of symbols SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); - gp_Pnt aP1 = aMgr->getPosition(aObj1, this); - gp_Pnt aP2 = aMgr->getPosition(aObj2, this); - - Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation); - aGroup->SetPrimitivesAspect(myAspect); - myPntArray->SetVertice(1, aP1); - myPntArray->SetVertice(2, aP2); - aGroup->AddPrimitiveArray(myPntArray); + gp_Pnt aP1 = aMgr->getPosition(aObj1, this, theStep, aPnt); + myPntArray = new Graphic3d_ArrayOfPoints(aPnt.get()? 1 : 2, withColor); + myPntArray->AddVertex(aP1); + if (!aPnt.get()) { + gp_Pnt aP2 = aMgr->getPosition(aObj2, this, theStep); + myPntArray->AddVertex(aP2); + } + return true; } -void SketcherPrs_Perpendicular::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const -{ - Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs); - - Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); - aGroup->SetPrimitivesAspect(aLineAspect); - addLine(aGroup, SketchPlugin_Constraint::ENTITY_A()); - addLine(aGroup, SketchPlugin_Constraint::ENTITY_B()); +void SketcherPrs_Perpendicular::drawLines(const Handle(Prs3d_Presentation)& thePrs, + Quantity_Color theColor) const +{ + // Draw constrained lines + for (int i = 0; i < 2; ++i) { + ObjectPtr anObj = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ATTRIBUTE(i)); + GeomShapePtr aShape = SketcherPrs_Tools::getShape(anObj); + if (!aShape) + return; + drawShape(aShape, thePrs, theColor); + } } -