X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_LengthDimension.cpp;h=2dc2a3b3daa6c65cb80baa1c1a6310779f11b12b;hb=bd9061e324388f26ea22a3a6071066daefd52300;hp=9a4509794036c4cfdca5447d6441b4b3b27b54d8;hpb=4732946855f20ff628e7e34255287082819a31f4;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp index 9a4509794..2dc2a3b3d 100644 --- a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp +++ b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp @@ -6,6 +6,7 @@ #include "SketcherPrs_LengthDimension.h" #include "SketcherPrs_Tools.h" +#include "SketcherPrs_DimensionStyleListener.h" #include #include @@ -14,6 +15,8 @@ #include #include +#include + #include #include #include @@ -21,6 +24,9 @@ #include #include +#include + +#include static const gp_Pnt MyDefStart(0,0,0); @@ -30,70 +36,81 @@ static const gp_Pln MyDefPln(gp_Pnt(0,0,0), gp_Dir(0,0,1)); IMPLEMENT_STANDARD_HANDLE(SketcherPrs_LengthDimension, AIS_LengthDimension); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_LengthDimension, AIS_LengthDimension); -SketcherPrs_LengthDimension::SketcherPrs_LengthDimension(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) -: AIS_LengthDimension(MyDefStart, MyDefEnd, MyDefPln), -myConstraint(theConstraint), myPlane(thePlane) +SketcherPrs_LengthDimension::SketcherPrs_LengthDimension(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) +: AIS_LengthDimension(MyDefStart, MyDefEnd, MyDefPln), + myConstraint(theConstraint), + mySketcherPlane(thePlane), + myFirstPoint(MyDefStart), + mySecondPoint(MyDefEnd), + myPlane(MyDefPln), + myHasParameters(false), + myValue(""), + myDistance(1) +{ + SetDimensionAspect(SketcherPrs_Tools::createDimensionAspect()); + SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); + + myStyleListener = new SketcherPrs_DimensionStyleListener(); +} + +SketcherPrs_LengthDimension::~SketcherPrs_LengthDimension() { - myAspect = new Prs3d_DimensionAspect(); - myAspect->MakeArrows3d(false); - myAspect->MakeText3d(false); - myAspect->MakeTextShaded(false); - myAspect->MakeUnitsDisplayed(false); - myAspect->TextAspect()->SetHeight(MyTextHeight); - myAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize()); - - SetSelToleranceForText2d(MyTextHeight); - SetDimensionAspect(myAspect); + delete myStyleListener; } +bool SketcherPrs_LengthDimension::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) +{ + gp_Pnt aPnt1, aPnt2; + return readyToDisplay(theConstraint, thePlane, aPnt1, aPnt2); +} void SketcherPrs_LengthDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode) { gp_Pnt aPnt1, aPnt2; - if (!getPoints(aPnt1, aPnt2)) - return; - //DataPtr aData = myConstraint->data(); - - //AttributePtr aFlyOutAttribute = aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()); - //if (!aFlyOutAttribute->isInitialized()) { - // return; // not possible to show length because points are not defined - //} - //std::shared_ptr aFlyOutAttr = - // std::dynamic_pointer_cast(aFlyOutAttribute); - //std::shared_ptr aFlyoutPnt = myPlane->to3D(aFlyOutAttr->x(), aFlyOutAttr->y()); - //gp_Pnt aFlyPnt = aFlyoutPnt->impl(); - - //double aDistance = aPnt1.Distance(aPnt2); - - //double aFlyout = 0; - //double aDist = 0.0; - //if (aDistance < Precision::Confusion()) - // aDist = aPnt1.Distance(aFlyPnt); - //else { - // gp_Lin aLine(aPnt1, gp_Vec(aPnt1, aPnt2)); - // aDist = aLine.Distance(aFlyPnt); - //} - - //gp_XYZ aLineDir = aPnt2.XYZ().Subtracted(aPnt1.XYZ()); - //gp_XYZ aFOutDir = aFlyPnt.XYZ().Subtracted(aPnt1.XYZ()); - //gp_XYZ aNorm = myPlane->norm()->xyz()->impl(); - //if (aLineDir.Crossed(aFOutDir).Dot(aNorm) < 0) - // aDist = -aDist; - //aFlyout = aDist; - - //SetFlyout(aFlyout); - SetFlyout(SketcherPrs_Tools::getFlyoutDistance(myConstraint)); - SetMeasuredGeometry(aPnt1, aPnt2, myPlane->impl()); + bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aPnt1, aPnt2); + if (aReadyToDisplay) { + myFirstPoint = aPnt1; + mySecondPoint = aPnt2; + + myDistance = SketcherPrs_Tools::getFlyoutDistance(myConstraint); + myPlane = gp_Pln(mySketcherPlane->impl()); + + AttributeDoublePtr anAttributeValue = myConstraint->data()->real(SketchPlugin_Constraint::VALUE()); + + myHasParameters = anAttributeValue->usedParameters().size() > 0; + myValue = anAttributeValue->text(); + } + + // compute flyout distance + SetFlyout(myDistance); + SetMeasuredGeometry(myFirstPoint, mySecondPoint, myPlane); + + // Update variable aspect parameters (depending on viewer scale) + double aTextSize = 0.0; + GetValueString(aTextSize); + SketcherPrs_Tools::updateArrows(DimensionAspect(), GetValue(), aTextSize); + + // Update text visualization: parameter value or parameter text + myStyleListener->updateDimensions(this, myHasParameters, myValue); + AIS_LengthDimension::Compute(thePresentationManager, thePresentation, theMode); + + if (!aReadyToDisplay) + SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, + "An empty AIS presentation: SketcherPrs_LengthDimension"); } -bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) const +bool SketcherPrs_LengthDimension::readyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane, + gp_Pnt& thePnt1, gp_Pnt& thePnt2) { - DataPtr aData = myConstraint->data(); - if (myConstraint->getKind() == SketchPlugin_ConstraintLength::ID()) { + DataPtr aData = theConstraint->data(); + if (theConstraint->getKind() == SketchPlugin_ConstraintLength::ID()) { + // The constraint is length std::shared_ptr anAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_Constraint::ENTITY_A())); @@ -104,6 +121,7 @@ bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) co if (!aFeature || aFeature->getKind() != SketchPlugin_Line::ID()) return false; + // Get geometry of the object DataPtr aLineData = aFeature->data(); std::shared_ptr aStartPoint = std::dynamic_pointer_cast @@ -111,22 +129,25 @@ bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) co std::shared_ptr aEndPoint = std::dynamic_pointer_cast (aLineData->attribute(SketchPlugin_Line::END_ID())); - thePnt1 = myPlane->to3D(aStartPoint->x(), aStartPoint->y())->impl(); - thePnt2 = myPlane->to3D(aEndPoint->x(), aEndPoint->y())->impl(); + thePnt1 = thePlane->to3D(aStartPoint->x(), aStartPoint->y())->impl(); + thePnt2 = thePlane->to3D(aEndPoint->x(), aEndPoint->y())->impl(); return true; - } else if (myConstraint->getKind() == SketchPlugin_ConstraintDistance::ID()) { + } else if (theConstraint->getKind() == SketchPlugin_ConstraintDistance::ID()) { + // The constraint is distance std::shared_ptr aPoint_A = SketcherPrs_Tools::getFeaturePoint( - aData, SketchPlugin_Constraint::ENTITY_A()); + aData, SketchPlugin_Constraint::ENTITY_A(), thePlane); std::shared_ptr aPoint_B = SketcherPrs_Tools::getFeaturePoint( - aData, SketchPlugin_Constraint::ENTITY_B()); + aData, SketchPlugin_Constraint::ENTITY_B(), thePlane); std::shared_ptr aPnt_A; std::shared_ptr aPnt_B; if (aPoint_A && aPoint_B) { + // Both objects are points aPnt_A = aPoint_A->pnt(); aPnt_B = aPoint_B->pnt(); } else if (!aPoint_A && aPoint_B) { + // First object is line FeaturePtr aLine = SketcherPrs_Tools::getFeatureLine( aData, SketchPlugin_Constraint::ENTITY_A()); if (aLine) { @@ -134,6 +155,7 @@ bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) co aPnt_A = SketcherPrs_Tools::getProjectionPoint(aLine, aPnt_B); } } else if (aPoint_A && !aPoint_B) { + // Second object is line FeaturePtr aLine = SketcherPrs_Tools::getFeatureLine( aData, SketchPlugin_Constraint::ENTITY_B()); if (aLine) { @@ -141,11 +163,12 @@ bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) co aPnt_B = SketcherPrs_Tools::getProjectionPoint(aLine, aPnt_A); } } - if (!aPnt_A || !aPnt_B) + if (!aPnt_A || !aPnt_B) // Objects not found return false; - std::shared_ptr aPoint1 = myPlane->to3D(aPnt_A->x(), aPnt_A->y()); - std::shared_ptr aPoint2 = myPlane->to3D(aPnt_B->x(), aPnt_B->y()); + // Get points from these object + std::shared_ptr aPoint1 = thePlane->to3D(aPnt_A->x(), aPnt_A->y()); + std::shared_ptr aPoint2 = thePlane->to3D(aPnt_B->x(), aPnt_B->y()); thePnt1 = aPoint1->impl(); thePnt2 = aPoint2->impl(); return true; @@ -158,6 +181,7 @@ bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) co void SketcherPrs_LengthDimension::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer theMode) { + // Map the application selection modes to standard ones Standard_Integer aMode; switch (theMode) { case 0: // we should use selection of all objects @@ -178,5 +202,6 @@ void SketcherPrs_LengthDimension::ComputeSelection(const Handle(SelectMgr_Select return; } } + SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); AIS_LengthDimension::ComputeSelection(aSelection, aMode); }