X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Perpendicular.cpp;h=ecfd72d1181c21d3da822e6086c97f0c46b9497e;hb=a14e0b4435c39ab9bb062693c9c5b132a8463d2d;hp=d27cf03e57cb1b28e4876ec9d52b7c11ac05f67b;hpb=4db1ccae61d6f09173fcf51c60d1742bb9d37067;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp index d27cf03e5..ecfd72d11 100644 --- a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp +++ b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp @@ -20,7 +20,7 @@ IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Perpendicular, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; -SketcherPrs_Perpendicular::SketcherPrs_Perpendicular(SketchPlugin_Constraint* theConstraint, +SketcherPrs_Perpendicular::SketcherPrs_Perpendicular(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane) : SketcherPrs_SymbolPrs(theConstraint, thePlane) { @@ -29,34 +29,25 @@ SketcherPrs_Perpendicular::SketcherPrs_Perpendicular(SketchPlugin_Constraint* th myPntArray->AddVertex(0., 0., 0.); } -void SketcherPrs_Perpendicular::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) -{ - prepareAspect(); +bool SketcherPrs_Perpendicular::updatePoints(double theStep) const +{ 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; - - std::shared_ptr aLine2 = SketcherPrs_Tools::getShape(aObj2); - if (aLine2.get() == NULL) - return; + if (SketcherPrs_Tools::getShape(aObj1).get() == NULL) + return false; + if (SketcherPrs_Tools::getShape(aObj2).get() == NULL) + return false; 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); + gp_Pnt aP1 = aMgr->getPosition(aObj1, this, theStep); + gp_Pnt aP2 = aMgr->getPosition(aObj2, this, theStep); myPntArray->SetVertice(1, aP1); myPntArray->SetVertice(2, aP2); - aGroup->AddPrimitiveArray(myPntArray); + return true; } + void SketcherPrs_Perpendicular::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const { Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs);