X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Angle.cpp;h=88d57dd1ad221a45737fbe9d091e878a1cb7e8bd;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=557099a7aa42655cb737396913a069e0232ded80;hpb=b8ee56da654b147ed1a537c744c35e9c60562936;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Angle.cpp b/src/SketcherPrs/SketcherPrs_Angle.cpp index 557099a7a..88d57dd1a 100644 --- a/src/SketcherPrs/SketcherPrs_Angle.cpp +++ b/src/SketcherPrs/SketcherPrs_Angle.cpp @@ -1,12 +1,25 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Angle.cpp -// Created: 20 August 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2023 CEA, EDF +// +// 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_DimensionStyle.h" #include "SketcherPrs_Tools.h" -#include "SketcherPrs_DimensionStyleListener.h" #include #include @@ -25,32 +38,49 @@ #include #include -#include +#include -#define PI 3.1415926535897932 +#if OCC_VERSION_HEX > 0x070400 +#include +#endif -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension); -IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, AIS_AngleDimension); +/// 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 -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), - myFirstPoint(gp_Pnt(0,0,0)), myCenterPoint(gp_Pnt(1,0,0)), mySecondPoint(gp_Pnt(0,1,0)), - myAngle(90), myValue("90"), myFlyOutPoint(0, 0.5, 0) +//#ifndef WNT +// #define COMPILATION_CORRECTION +//#endif + +IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, PrsDim_AngleDimension); + +SketcherPrs_Angle::SketcherPrs_Angle(ModelAPI_Feature* theConstraint, + SketchPlugin_Sketch* theSketcher) +: PrsDim_AngleDimension(gp_Pnt(0,0,0), gp_Pnt(1,0,0), gp_Pnt(0,1,0)), + myConstraint(theConstraint), + mySketcher(theSketcher), + myFirstPoint(gp_Pnt(0,0,0)), + mySecondPoint(gp_Pnt(0,1,0)), + myCenterPoint(gp_Pnt(1, 0, 0)), + myFlyOutPoint(0, 0.5, 0), + myValue(90., false, "") { myAspect = new Prs3d_DimensionAspect(); myAspect->MakeArrows3d(false); 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); - SetSelToleranceForText2d(SketcherPrs_Tools::getDefaultTextHeight()); - myStyleListener = new SketcherPrs_DimensionStyleListener(); + myStyleListener = new SketcherPrs_DimensionStyle(); } SketcherPrs_Angle::~SketcherPrs_Angle() @@ -71,11 +101,13 @@ bool SketcherPrs_Angle::readyToDisplay(ModelAPI_Feature* theConstraint, gp_Pnt& theCenterPoint) { bool aReadyToDisplay = false; + if (!thePlane) + return aReadyToDisplay; 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()) @@ -89,8 +121,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; @@ -105,27 +139,56 @@ 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(); + + if (aData->integer(SketchPlugin_ConstraintAngle::TYPE_ID())->value() == + (int)SketcherPrs_Tools::ANGLE_COMPLEMENTARY) + isReversed1 = !isReversed1; + + anAng = std::shared_ptr( + new GeomAPI_Angle2d(aLine1, isReversed1, aLine2, isReversed2)); } - gp_Pnt2d aFirstPoint = anAng->firstPoint()->impl(); + gp_Pnt2d aCenterPoint = anAng->center()->impl(); + gp_Pnt2d aFirstPoint, aSecondPoint; + try { + if (anAng->angleRadian() > 0.0) { + aFirstPoint = anAng->firstPoint()->impl(); + aSecondPoint = anAng->secondPoint()->impl(); + } + else { + aFirstPoint = anAng->secondPoint()->impl(); + aSecondPoint = anAng->firstPoint()->impl(); + } + } + catch (...) { + // one of angle lines is degenerated, the presentation cannot be shown + return false; + } + + if (aData->integer(SketchPlugin_ConstraintAngle::TYPE_ID())->value() == + (int)SketcherPrs_Tools::ANGLE_BACKWARD) + std::swap(aFirstPoint, aSecondPoint); + std::shared_ptr aPoint = thePlane->to3D(aFirstPoint.X(), aFirstPoint.Y()); theFirstPoint = aPoint->impl(); - gp_Pnt2d aCenterPoint = anAng->center()->impl(); aPoint = thePlane->to3D(aCenterPoint.X(), aCenterPoint.Y()); theCenterPoint = aPoint->impl(); - gp_Pnt2d aSecondPoint = anAng->secondPoint()->impl(); aPoint = thePlane->to3D(aSecondPoint.X(), aSecondPoint.Y()); theSecondPoint = aPoint->impl(); @@ -134,74 +197,73 @@ 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) { + if (!plane().get()) + return; + + DataPtr aData = myConstraint->data(); + gp_Pnt aFirstPoint, aSecondPoint, aCenterPoint; - bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aFirstPoint, aSecondPoint, aCenterPoint); + bool aReadyToDisplay = readyToDisplay(myConstraint, plane(), + aFirstPoint, aSecondPoint, aCenterPoint); if (aReadyToDisplay) { myFirstPoint = aFirstPoint; mySecondPoint = aSecondPoint; myCenterPoint = aCenterPoint; - DataPtr aData = myConstraint->data(); - AttributeDoublePtr aVal = aData->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID()); - myAngle = aVal->value(); - myValue = aVal->text(); + 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 = + plane()->to3D(aFlyoutAttr->x(), aFlyoutAttr->y()); myFlyOutPoint = aFlyoutPnt->impl(); } - DataPtr aData = myConstraint->data(); - std::shared_ptr aTypeAttr = std::dynamic_pointer_cast< - ModelAPI_AttributeInteger>(aData->attribute(SketchPlugin_ConstraintAngle::TYPE_ID())); - SketcherPrs_Tools::AngleType anAngleType = (SketcherPrs_Tools::AngleType)(aTypeAttr->value()); - double aDist = -1; - switch (anAngleType) { - case SketcherPrs_Tools::ANGLE_DIRECT: { - SetArrowVisible(Standard_False/*first*/, Standard_True/*second*/); - SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint); - bool isReversedPlanes = isAnglePlaneReversedToSketchPlane(); - SetAngleReversed(!isReversedPlanes); - } - break; - case SketcherPrs_Tools::ANGLE_COMPLEMENTARY: { - double anEdge1Length = aCenterPoint.Distance(myFirstPoint); - //aDist = calculateDistanceToFlyoutPoint(); - gp_Pnt aFirstPoint = aCenterPoint.Translated( - gp_Vec(myCenterPoint, myFirstPoint).Normalized() * (-anEdge1Length)); - SetMeasuredGeometry(aFirstPoint, myCenterPoint, mySecondPoint); - } - break; - case SketcherPrs_Tools::ANGLE_BACKWARD: { - SetArrowVisible(Standard_False/*first*/, Standard_True/*second*/); - SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint); - bool isReversedPlanes = isAnglePlaneReversedToSketchPlane(); - SetAngleReversed(isReversedPlanes); - } - break; - default: - break; - } +#ifndef COMPILATION_CORRECTION +#if OCC_VERSION_HEX > 0x070400 + SetArrowsVisibility(PrsDim_TypeOfAngleArrowVisibility_Both); +#else + SetArrowsVisibility(AIS_TOAV_Both); +#endif +#endif + SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint); +#ifndef COMPILATION_CORRECTION + bool isReversedPlanes = isAnglePlaneReversedToSketchPlane(); +#if OCC_VERSION_HEX > 0x070400 + SetType(!isReversedPlanes ? PrsDim_TypeOfAngle_Exterior : PrsDim_TypeOfAngle_Interior); +#else + SetType(!isReversedPlanes ? AIS_TOA_Exterior : AIS_TOA_Interior); +#endif +#endif if (aDist < 0) /// it was not calculated yet aDist = calculateDistanceToFlyoutPoint(); SetFlyout(aDist); - // Angle value is in degrees - SetCustomValue(myAngle); + // 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; - // Update text visualization: parameter value or parameter text - myStyleListener->updateDimensions(this, myHasParameters, myValue); + 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); + PrsDim_AngleDimension::Compute(thePresentationManager, thePresentation, theMode); if (!aReadyToDisplay) SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, @@ -228,32 +290,27 @@ 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; } } - AIS_AngleDimension::ComputeSelection(aSelection, aMode); + SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.); + PrsDim_AngleDimension::ComputeSelection(aSelection, aMode); } bool SketcherPrs_Angle::isAnglePlaneReversedToSketchPlane() { bool aReversed = false; - if (!mySketcherPlane.get()) + if (!plane().get()) return aReversed; gp_Pln aPlane = GetPlane(); gp_Dir aDir = aPlane.Axis().Direction(); - double aDot = mySketcherPlane->normal()->dot( + double aDot = plane()->normal()->dot( std::shared_ptr(new GeomAPI_Dir(aDir.X(), aDir.Y(), aDir.Z()))); return aDot < 0; } 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); }