X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketcherPrs%2FSketcherPrs_LengthDimension.cpp;h=3253d2716a790b26e7b31a9fe9a2310657364885;hb=d34842c50d5f335cca443c78910c16c54139c7d0;hp=34cae3a54cde252acae1a195cf3517f3ae1420be;hpb=551524964a46d4af95f0c27fb093545a3b1d4730;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp index 34cae3a54..3253d2716 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 @@ -30,10 +31,6 @@ static const gp_Pnt MyDefStart(0,0,0); static const gp_Pnt MyDefEnd(1,0,0); static const gp_Pln MyDefPln(gp_Pnt(0,0,0), gp_Dir(0,0,1)); -// it is not possible to use 0x2211 as summ symbol because it is not supported by -// debian Linux platform -static const Standard_ExtCharacter MySummSymbol(0x03A3); - IMPLEMENT_STANDARD_HANDLE(SketcherPrs_LengthDimension, AIS_LengthDimension); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_LengthDimension, AIS_LengthDimension); @@ -41,67 +38,74 @@ SketcherPrs_LengthDimension::SketcherPrs_LengthDimension(ModelAPI_Feature* theCo const std::shared_ptr& thePlane) : AIS_LengthDimension(MyDefStart, MyDefEnd, MyDefPln), myConstraint(theConstraint), - myPlane(thePlane), - myAspect(new Prs3d_DimensionAspect()) + mySketcherPlane(thePlane), + myFirstPoint(MyDefStart), + mySecondPoint(MyDefEnd), + myPlane(MyDefPln), + myDistance(1), + myValue(0., false, "") { - myAspect->MakeArrows3d(false); - myAspect->MakeText3d(false); - myAspect->MakeTextShaded(false); - myAspect->MakeUnitsDisplayed(false); - myAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getDefaultTextHeight()); - myAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize()); - + SetDimensionAspect(SketcherPrs_Tools::createDimensionAspect()); SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); - SetDimensionAspect(myAspect); + + myStyleListener = new SketcherPrs_DimensionStyleListener(); +} + +SketcherPrs_LengthDimension::~SketcherPrs_LengthDimension() +{ + 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; + bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aPnt1, aPnt2); + if (aReadyToDisplay) { + myFirstPoint = aPnt1; + mySecondPoint = aPnt2; + + myDistance = SketcherPrs_Tools::getFlyoutDistance(myConstraint); + myPlane = gp_Pln(mySketcherPlane->impl()); + + DataPtr aData = myConstraint->data(); + AttributeDoublePtr anAttributeValue = aData->real(SketchPlugin_Constraint::VALUE()); + myValue.init(anAttributeValue); + } // compute flyout distance - SetFlyout(SketcherPrs_Tools::getFlyoutDistance(myConstraint)); - SetMeasuredGeometry(aPnt1, aPnt2, myPlane->impl()); + SetFlyout(myDistance); + SetMeasuredGeometry(myFirstPoint, mySecondPoint, myPlane); // Update variable aspect parameters (depending on viewer scale) - double anArrowLength = myAspect->ArrowAspect()->Length(); - // This is not realy correct way to get viewer scale. - double aViewerScale = (double) SketcherPrs_Tools::getDefaultArrowSize() / anArrowLength; - double aDimensionValue = GetValue(); double aTextSize = 0.0; GetValueString(aTextSize); + SketcherPrs_Tools::updateArrows(DimensionAspect(), GetValue(), aTextSize); - if(aTextSize > ((aDimensionValue - 3 * SketcherPrs_Tools::getArrowSize()) * aViewerScale)) { - myAspect->SetTextHorizontalPosition(Prs3d_DTHP_Left); - myAspect->SetArrowOrientation(Prs3d_DAO_External); - myAspect->SetExtensionSize(aTextSize / aViewerScale - SketcherPrs_Tools::getArrowSize() / 2.0); - } else { - myAspect->SetTextHorizontalPosition(Prs3d_DTHP_Center); - myAspect->SetArrowOrientation(Prs3d_DAO_Internal); - } - myAspect->SetArrowTailSize(myAspect->ArrowAspect()->Length()); - - // The value of vertical aligment is sometimes changed - myAspect->TextAspect()->SetVerticalJustification(Graphic3d_VTA_CENTER); - - AttributeDoublePtr aValue = myConstraint->data()->real(SketchPlugin_Constraint::VALUE()); - std::set aParams = aValue->usedParameters(); - if (aParams.size() > 0) { - SetSpecialSymbol(MySummSymbol); - SetDisplaySpecialSymbol(AIS_DSS_Before); - } + // Update text visualization: parameter value or parameter text + myStyleListener->updateDimensions(this, 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) +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 @@ -121,16 +125,16 @@ bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) 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(), myPlane); + aData, SketchPlugin_Constraint::ENTITY_A(), thePlane); std::shared_ptr aPoint_B = SketcherPrs_Tools::getFeaturePoint( - aData, SketchPlugin_Constraint::ENTITY_B(), myPlane); + aData, SketchPlugin_Constraint::ENTITY_B(), thePlane); std::shared_ptr aPnt_A; std::shared_ptr aPnt_B; @@ -158,9 +162,9 @@ bool SketcherPrs_LengthDimension::getPoints(gp_Pnt& thePnt1, gp_Pnt& thePnt2) if (!aPnt_A || !aPnt_B) // Objects not found return false; - // Get points from these objects - 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;