X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Tangent.cpp;h=09fa6810969a7673009619641eac5509701e2d34;hb=c1d1f617a04aacf5f0d6246c1b8dea72dd2d6093;hp=c9adc9b55f38671a6fd811576aafc6f99144c009;hpb=79c2d06fc1aa7bfee1bd1ff23db8031aa9edaa6a;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Tangent.cpp b/src/SketcherPrs/SketcherPrs_Tangent.cpp index c9adc9b55..09fa68109 100644 --- a/src/SketcherPrs/SketcherPrs_Tangent.cpp +++ b/src/SketcherPrs/SketcherPrs_Tangent.cpp @@ -33,14 +33,27 @@ SketcherPrs_Tangent::SketcherPrs_Tangent(ModelAPI_Feature* theConstraint, myPntArray->AddVertex(0., 0., 0.); } -bool SketcherPrs_Tangent::updatePoints(double theStep) const +bool SketcherPrs_Tangent::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr&/* thePlane*/) { + 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_Tangent::updateIfReadyToDisplay(double theStep) const +{ + if (!IsReadyToDisplay(myConstraint, myPlane)) + return false; + 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; // Compute points coordinates SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();