X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Perpendicular.cpp;h=314c74cb283f94240d26868b9fb39ffceb17e4c2;hb=8d8cd4bfaf5af5db0fe563e3e75b2526e472dbe0;hp=287c5fe69dc13f916334038927d0fb46b323d897;hpb=e7f1ac7ab6a29efa09daecae84b2add0ff630c8d;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp index 287c5fe69..314c74cb2 100644 --- a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp +++ b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp @@ -1,85 +1,117 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Perpendicular.cpp -// Created: 12 March 2015 -// Author: Vitaly SMETANNIKOV +// 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 +// 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" #include "SketcherPrs_PositionMgr.h" -#include - #include -#include -#include - -#include -#include -#include - -#include -#include #include -#include - - -// Function which is defined in SketchPlugin_ConstraintDistance.cpp -extern std::shared_ptr getFeaturePoint(DataPtr theData, - const std::string& theAttribute); +#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; + + 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::getLine(aObj1); - if (aLine1.get() == NULL) - return; + GeomShapePtr aShp1 = SketcherPrs_Tools::getShape(aObj1); + GeomShapePtr aShp2 = SketcherPrs_Tools::getShape(aObj2); - std::shared_ptr aLine2 = SketcherPrs_Tools::getLine(aObj2); - if (aLine2.get() == NULL) - return; + GeomEdgePtr aEdge1(new GeomAPI_Edge(aShp1)); + GeomEdgePtr aEdge2(new GeomAPI_Edge(aShp2)); + std::shared_ptr aLin1 = aEdge1->line(); + std::shared_ptr aLin2 = aEdge2->line(); + + std::shared_ptr aPnt = aLin1->intersect(aLin2); + double aParam1 = aLin1->projParam(aPnt); + double aParam2 = aLin2->projParam(aPnt); + + GeomAPI_Curve aCurve1(aShp1); + GeomAPI_Curve aCurve2(aShp2); + bool isInside1 = (aParam1 >= (aCurve1.startParam() - Precision::Confusion())) && + (aParam1 <= (aCurve1.endParam() + Precision::Confusion())); + bool isInside2 = (aParam2 >= (aCurve2.startParam() - Precision::Confusion())) && + (aParam2 <= (aCurve2.endParam() + Precision::Confusion())); + + if (!(isInside1 && isInside2)) + aPnt = std::shared_ptr(); + + // 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 + +void SketcherPrs_Perpendicular::drawLines(const Handle(Prs3d_Presentation)& thePrs, + Quantity_Color theColor) const { - Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs); + Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePrs); - Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); + Handle(Graphic3d_AspectLine3d) aLineAspect = + new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); aGroup->SetPrimitivesAspect(aLineAspect); + // Draw constrained lines addLine(aGroup, SketchPlugin_Constraint::ENTITY_A()); addLine(aGroup, SketchPlugin_Constraint::ENTITY_B()); }