X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Angle.cpp;h=c8f79b464d7f1b696f4b4a56cf0b1e8fc69688cc;hb=db25cb9e9be0ce3e2332141f7f2f47f088956bea;hp=c481c2873bef0836c60eea38ecd8edd58819a442;hpb=09e632d5370843e3cd13de6f2e4d84fb3c7a5b0e;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Angle.cpp b/src/SketcherPrs/SketcherPrs_Angle.cpp index c481c2873..c8f79b464 100644 --- a/src/SketcherPrs/SketcherPrs_Angle.cpp +++ b/src/SketcherPrs/SketcherPrs_Angle.cpp @@ -1,12 +1,26 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Angle.cpp -// Created: 20 August 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2017 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_Angle.h" -#include "SketcherPrs_Tools.h" #include "SketcherPrs_DimensionStyleListener.h" +#include "SketcherPrs_Tools.h" #include #include @@ -25,16 +39,22 @@ #include #include +/// Update variable aspect parameters (depending on viewer scale) +/// \param theDimAspect an aspect to be changed +/// \param theDimValue an arrow value +/// \param theTextSize an arrow value +extern void updateArrows(Handle_Prs3d_DimensionAspect theDimAspect, + double theDimValue, double theTextSize, SketcherPrs_Tools::LocationType theLocationType); + #define PI 3.1415926535897932 //#ifndef WNT // #define COMPILATION_CORRECTION //#endif -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, AIS_AngleDimension); -SketcherPrs_Angle::SketcherPrs_Angle(ModelAPI_Feature* theConstraint, +SketcherPrs_Angle::SketcherPrs_Angle(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane) : AIS_AngleDimension(gp_Pnt(0,0,0), gp_Pnt(1,0,0), gp_Pnt(0,1,0)), myConstraint(theConstraint), mySketcherPlane(thePlane), @@ -46,9 +66,9 @@ SketcherPrs_Angle::SketcherPrs_Angle(ModelAPI_Feature* theConstraint, myAspect->MakeText3d(false); myAspect->MakeTextShaded(false); myAspect->MakeUnitsDisplayed(false); - myAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getDefaultTextHeight()); + myAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getConfigTextHeight()); myAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize()); - + SetDimensionAspect(myAspect); myStyleListener = new SketcherPrs_DimensionStyleListener(); @@ -76,7 +96,7 @@ bool SketcherPrs_Angle::readyToDisplay(ModelAPI_Feature* theConstraint, DataPtr aData = theConstraint->data(); // Flyout point - std::shared_ptr aFlyoutAttr = + std::shared_ptr aFlyoutAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); if (!aFlyoutAttr->isInitialized()) @@ -90,8 +110,10 @@ bool SketcherPrs_Angle::readyToDisplay(ModelAPI_Feature* theConstraint, if (!anAttr2->isInitialized()) return aReadyToDisplay; - FeaturePtr aLineA = SketcherPrs_Tools::getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_A()); - FeaturePtr aLineB = SketcherPrs_Tools::getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_B()); + FeaturePtr aLineA = + SketcherPrs_Tools::getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_A()); + FeaturePtr aLineB = + SketcherPrs_Tools::getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_B()); if (!aLineA.get() || !aLineB.get()) return aReadyToDisplay; @@ -106,16 +128,22 @@ bool SketcherPrs_Angle::readyToDisplay(ModelAPI_Feature* theConstraint, aLineB->attribute(SketchPlugin_Line::END_ID())); std::shared_ptr anAng; - if (!aData->attribute(SketchPlugin_ConstraintAngle::ANGLE_REVERSED_FIRST_LINE_ID())->isInitialized() || - !aData->attribute(SketchPlugin_ConstraintAngle::ANGLE_REVERSED_SECOND_LINE_ID())->isInitialized()) + bool isFirstPnt = aData->attribute( + SketchPlugin_ConstraintAngle::ANGLE_REVERSED_FIRST_LINE_ID())->isInitialized(); + bool isSecondPnt = aData->attribute( + SketchPlugin_ConstraintAngle::ANGLE_REVERSED_SECOND_LINE_ID())->isInitialized(); + if (!isFirstPnt || !isSecondPnt) anAng = std::shared_ptr(new GeomAPI_Angle2d( aStartA->pnt(), aEndA->pnt(), aStartB->pnt(), aEndB->pnt())); else { std::shared_ptr aLine1(new GeomAPI_Lin2d(aStartA->pnt(), aEndA->pnt())); - bool isReversed1 = aData->boolean(SketchPlugin_ConstraintAngle::ANGLE_REVERSED_FIRST_LINE_ID())->value(); + bool isReversed1 = + aData->boolean(SketchPlugin_ConstraintAngle::ANGLE_REVERSED_FIRST_LINE_ID())->value(); std::shared_ptr aLine2(new GeomAPI_Lin2d(aStartB->pnt(), aEndB->pnt())); - bool isReversed2 = aData->boolean(SketchPlugin_ConstraintAngle::ANGLE_REVERSED_SECOND_LINE_ID())->value(); - anAng = std::shared_ptr(new GeomAPI_Angle2d(aLine1, isReversed1, aLine2, isReversed2)); + bool isReversed2 = + aData->boolean(SketchPlugin_ConstraintAngle::ANGLE_REVERSED_SECOND_LINE_ID())->value(); + anAng = std::shared_ptr( + new GeomAPI_Angle2d(aLine1, isReversed1, aLine2, isReversed2)); } gp_Pnt2d aFirstPoint = anAng->firstPoint()->impl(); @@ -135,24 +163,27 @@ bool SketcherPrs_Angle::readyToDisplay(ModelAPI_Feature* theConstraint, void SketcherPrs_Angle::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, + const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { gp_Pnt aFirstPoint, aSecondPoint, aCenterPoint; - bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aFirstPoint, aSecondPoint, aCenterPoint); + bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, + aFirstPoint, aSecondPoint, aCenterPoint); if (aReadyToDisplay) { myFirstPoint = aFirstPoint; mySecondPoint = aSecondPoint; myCenterPoint = aCenterPoint; DataPtr aData = myConstraint->data(); - AttributeDoublePtr anAttributeValue = aData->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID()); + AttributeDoublePtr anAttributeValue = + aData->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID()); myValue.init(anAttributeValue); - std::shared_ptr aFlyoutAttr = + std::shared_ptr aFlyoutAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - std::shared_ptr aFlyoutPnt = mySketcherPlane->to3D(aFlyoutAttr->x(), aFlyoutAttr->y()); + std::shared_ptr aFlyoutPnt = + mySketcherPlane->to3D(aFlyoutAttr->x(), aFlyoutAttr->y()); myFlyOutPoint = aFlyoutPnt->impl(); } @@ -165,12 +196,12 @@ void SketcherPrs_Angle::Compute(const Handle(PrsMgr_PresentationManager3d)& theP switch (anAngleType) { case SketcherPrs_Tools::ANGLE_DIRECT: { #ifndef COMPILATION_CORRECTION - SetArrowVisible(Standard_False/*first*/, Standard_True/*second*/); + SetArrowsVisibility(AIS_TOAV_Second); #endif SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint); #ifndef COMPILATION_CORRECTION bool isReversedPlanes = isAnglePlaneReversedToSketchPlane(); - SetAngleReversed(!isReversedPlanes); + SetType(!isReversedPlanes ? AIS_TOA_Exterior : AIS_TOA_Interior); #endif } break; @@ -181,18 +212,18 @@ void SketcherPrs_Angle::Compute(const Handle(PrsMgr_PresentationManager3d)& theP gp_Vec(myCenterPoint, myFirstPoint).Normalized() * (-anEdge1Length)); SetMeasuredGeometry(aFirstPoint, myCenterPoint, mySecondPoint); #ifndef COMPILATION_CORRECTION - SetAngleReversed(false); + SetType(AIS_TOA_Interior); #endif } break; case SketcherPrs_Tools::ANGLE_BACKWARD: { #ifndef COMPILATION_CORRECTION - SetArrowVisible(Standard_False/*first*/, Standard_True/*second*/); + SetArrowsVisibility(AIS_TOAV_Second); #endif SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint); bool isReversedPlanes = isAnglePlaneReversedToSketchPlane(); #ifndef COMPILATION_CORRECTION - SetAngleReversed(isReversedPlanes); + SetType(isReversedPlanes ? AIS_TOA_Exterior : AIS_TOA_Interior); #endif } break; @@ -206,8 +237,19 @@ void SketcherPrs_Angle::Compute(const Handle(PrsMgr_PresentationManager3d)& theP // Update text visualization: parameter value or parameter text myStyleListener->updateDimensions(this, myValue); - myAspect->SetExtensionSize(myAspect->ArrowAspect()->Length()); - myAspect->SetArrowTailSize(myAspect->ArrowAspect()->Length()); + double aTextSize = 0.0; + GetValueString(aTextSize); + AttributeIntegerPtr aLocAttr = std::dynamic_pointer_cast + (myConstraint->data()->attribute(SketchPlugin_ConstraintAngle::LOCATION_TYPE_ID())); + SketcherPrs_Tools::LocationType aLocationType = aLocAttr->isInitialized() ? + (SketcherPrs_Tools::LocationType)(aLocAttr->value()) : SketcherPrs_Tools::LOCATION_AUTOMATIC; + + double aRadius = myCenterPoint.Translated( + gp_Vec(myCenterPoint, myFirstPoint).Normalized()*aDist).Distance(myCenterPoint); + double anAngleValue = myValue.myDoubleValue; + double anAngleCircleLength = aRadius * anAngleValue * PI / 180.; + + updateArrows(myAspect, anAngleCircleLength, aTextSize, aLocationType); AIS_AngleDimension::Compute(thePresentationManager, thePresentation, theMode); @@ -236,10 +278,10 @@ void SketcherPrs_Angle::ComputeSelection(const Handle(SelectMgr_Selection)& aSel default: { // there are own selection modes, so the others should be ignored // otherwise, the text selection appears in the viewer - return; + return; } } - SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); + SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.); AIS_AngleDimension::ComputeSelection(aSelection, aMode); } @@ -258,11 +300,5 @@ bool SketcherPrs_Angle::isAnglePlaneReversedToSketchPlane() double SketcherPrs_Angle::calculateDistanceToFlyoutPoint() { - gp_Dir aBisector((myFirstPoint.XYZ() + mySecondPoint.XYZ()) * 0.5 - myCenterPoint.XYZ()); - //gp_Pnt aFlyPnt(aFlyoutPnt->x(), aFlyoutPnt->y(), aFlyoutPnt->z()); - gp_XYZ aFlyDir = myFlyOutPoint.XYZ() - myCenterPoint.XYZ(); - double aDistance = aFlyDir.Dot(aBisector.XYZ()); - // make a positive distance in order to AIS angle presentation is not reversed - aDistance = fabs(aDistance); - return aDistance; + return myFlyOutPoint.Distance(myCenterPoint); }