X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketcherPrs%2FSketcherPrs_Angle.cpp;h=99ac0c247e54fcd4539949978fbe1a406103cf95;hb=066d35261d20a2d10910172a20882e9f0ef24fc3;hp=2d4e5838e0602850e304151545f1a75a9efeb906;hpb=676ee79de539b14b242a561857c1505cce13d951;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Angle.cpp b/src/SketcherPrs/SketcherPrs_Angle.cpp index 2d4e5838e..99ac0c247 100644 --- a/src/SketcherPrs/SketcherPrs_Angle.cpp +++ b/src/SketcherPrs/SketcherPrs_Angle.cpp @@ -6,13 +6,17 @@ #include "SketcherPrs_Angle.h" #include "SketcherPrs_Tools.h" +#include "SketcherPrs_DimensionStyleListener.h" #include #include +#include #include #include #include +#include +#include #include #include @@ -21,8 +25,6 @@ #include #include -#include - #define PI 3.1415926535897932 IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension); @@ -30,7 +32,10 @@ IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, AIS_AngleDimension); 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), myPlane(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)), + myValue(90., false, ""), myFlyOutPoint(0, 0.5, 0) { myAspect = new Prs3d_DimensionAspect(); myAspect->MakeArrows3d(false); @@ -42,10 +47,26 @@ SketcherPrs_Angle::SketcherPrs_Angle(ModelAPI_Feature* theConstraint, SetDimensionAspect(myAspect); SetSelToleranceForText2d(SketcherPrs_Tools::getDefaultTextHeight()); + + myStyleListener = new SketcherPrs_DimensionStyleListener(); +} + +SketcherPrs_Angle::~SketcherPrs_Angle() +{ + delete myStyleListener; } bool SketcherPrs_Angle::IsReadyToDisplay(ModelAPI_Feature* theConstraint, - const std::shared_ptr&/* thePlane*/) + const std::shared_ptr& thePlane) +{ + gp_Pnt aFirstPoint, aSecondPoint, aCenterPoint; + return readyToDisplay(theConstraint, thePlane, aFirstPoint, aSecondPoint, aCenterPoint); +} + +bool SketcherPrs_Angle::readyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane, + gp_Pnt& theFirstPoint, gp_Pnt& theSecondPoint, + gp_Pnt& theCenterPoint) { bool aReadyToDisplay = false; @@ -66,107 +87,120 @@ bool SketcherPrs_Angle::IsReadyToDisplay(ModelAPI_Feature* theConstraint, if (!anAttr2->isInitialized()) return aReadyToDisplay; - // Get angle edges - ObjectPtr aObj1 = anAttr1->object(); - ObjectPtr aObj2 = anAttr2->object(); + FeaturePtr aLineA = SketcherPrs_Tools::getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_A()); + FeaturePtr aLineB = SketcherPrs_Tools::getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_B()); - std::shared_ptr aShape1 = SketcherPrs_Tools::getShape(aObj1); - std::shared_ptr aShape2 = SketcherPrs_Tools::getShape(aObj2); + if (!aLineA.get() || !aLineB.get()) + return aReadyToDisplay; + + std::shared_ptr aStartA = std::dynamic_pointer_cast( + aLineA->attribute(SketchPlugin_Line::START_ID())); + std::shared_ptr aEndA = std::dynamic_pointer_cast( + aLineA->attribute(SketchPlugin_Line::END_ID())); + std::shared_ptr aStartB = std::dynamic_pointer_cast( + aLineB->attribute(SketchPlugin_Line::START_ID())); + std::shared_ptr aEndB = std::dynamic_pointer_cast( + 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()) + 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(); + 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)); + } - aReadyToDisplay = aShape1.get() && aShape2.get(); - return aReadyToDisplay; + gp_Pnt2d aFirstPoint = anAng->firstPoint()->impl(); + 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(); + + return true; } + void SketcherPrs_Angle::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { - DataPtr aData = myConstraint->data(); - - if (!IsReadyToDisplay(myConstraint, myPlane)) { - Events_Error::throwException("An empty AIS presentation: SketcherPrs_Angle"); - return; // can not create a good presentation + gp_Pnt 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()); + myValue.init(anAttributeValue); + + 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()); + 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()); - // Flyout point - std::shared_ptr aFlyoutAttr = - std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - std::shared_ptr aFlyoutPnt = myPlane->to3D(aFlyoutAttr->x(), aFlyoutAttr->y()); - - AttributeRefAttrPtr anAttr1 = aData->refattr(SketchPlugin_Constraint::ENTITY_A()); - AttributeRefAttrPtr anAttr2 = aData->refattr(SketchPlugin_Constraint::ENTITY_B()); - - // Get angle edges - ObjectPtr aObj1 = anAttr1->object(); - ObjectPtr aObj2 = anAttr2->object(); - - std::shared_ptr aShape1 = SketcherPrs_Tools::getShape(aObj1); - std::shared_ptr aShape2 = SketcherPrs_Tools::getShape(aObj2); - - TopoDS_Shape aTEdge1 = aShape1->impl(); - TopoDS_Shape aTEdge2 = aShape2->impl(); - - TopoDS_Edge aEdge1 = TopoDS::Edge(aTEdge1); - TopoDS_Edge aEdge2 = TopoDS::Edge(aTEdge2); - + double aDist = -1; switch (anAngleType) { case SketcherPrs_Tools::ANGLE_DIRECT: { - SetGeometryOrientedAngle(true, false); - SetArrowVisible(Standard_False, Standard_True); - SetMeasuredGeometry(aEdge1, aEdge2); + SetArrowVisible(Standard_False/*first*/, Standard_True/*second*/); + SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint); + bool isReversedPlanes = isAnglePlaneReversedToSketchPlane(); + SetAngleReversed(!isReversedPlanes); } break; case SketcherPrs_Tools::ANGLE_COMPLEMENTARY: { - // to calculate center, first and end points - SetGeometryOrientedAngle(false, false); - SetMeasuredGeometry(aEdge1, aEdge2); - gp_Pnt aCenterPnt = CenterPoint(); - gp_Pnt aFirstPnt = FirstPoint(); - gp_Pnt aSecondPnt = SecondPoint(); - double anEdge2Length = aCenterPnt.Distance(aSecondPnt); - aSecondPnt = aCenterPnt.Translated (gp_Vec(aCenterPnt, aSecondPnt).Normalized() * (-anEdge2Length)); - SetArrowVisible(Standard_True, Standard_False); - SetMeasuredGeometry(aFirstPnt, aCenterPnt, aSecondPnt); + double anEdge1Length = aCenterPoint.Distance(myFirstPoint); + //aDist = calculateDistanceToFlyoutPoint(); + gp_Pnt aFirstPoint = aCenterPoint.Translated( + gp_Vec(myCenterPoint, myFirstPoint).Normalized() * (-anEdge1Length)); + SetMeasuredGeometry(aFirstPoint, myCenterPoint, mySecondPoint); + SetAngleReversed(false); } break; case SketcherPrs_Tools::ANGLE_BACKWARD: { - SetGeometryOrientedAngle(true, true); - SetArrowVisible(Standard_False, Standard_True); - SetMeasuredGeometry(aEdge1, aEdge2); + SetArrowVisible(Standard_False/*first*/, Standard_True/*second*/); + SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint); + bool isReversedPlanes = isAnglePlaneReversedToSketchPlane(); + SetAngleReversed(isReversedPlanes); } break; default: break; } - - - const gp_Pnt& aCenter = CenterPoint(); - const gp_Pnt& aFirst = FirstPoint(); - const gp_Pnt& aSecond = SecondPoint(); - - gp_Dir aBisector((aFirst.XYZ() + aSecond.XYZ()) * 0.5 - aCenter.XYZ()); - - gp_Pnt aFlyPnt(aFlyoutPnt->x(), aFlyoutPnt->y(), aFlyoutPnt->z()); - gp_XYZ aFlyDir = aFlyPnt.XYZ() - aCenter.XYZ(); - double aDist = aFlyDir.Dot(aBisector.XYZ()); + if (aDist < 0) /// it was not calculated yet + aDist = calculateDistanceToFlyoutPoint(); SetFlyout(aDist); - // Angle value is in degrees - AttributeDoublePtr aVal = aData->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID()); - SetCustomValue(aVal->value() * PI / 180.0); + // Update text visualization: parameter value or parameter text + myStyleListener->updateDimensions(this, myValue); myAspect->SetExtensionSize(myAspect->ArrowAspect()->Length()); myAspect->SetArrowTailSize(myAspect->ArrowAspect()->Length()); - AttributeDoublePtr aValue = myConstraint->data()->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID()); - SketcherPrs_Tools::setDisplaySpecialSymbol(this, aValue->usedParameters().size() > 0); - AIS_AngleDimension::Compute(thePresentationManager, thePresentation, theMode); + + if (!aReadyToDisplay) + SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, + "An empty AIS presentation: SketcherPrs_Angle"); } void SketcherPrs_Angle::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, @@ -194,3 +228,27 @@ void SketcherPrs_Angle::ComputeSelection(const Handle(SelectMgr_Selection)& aSel } AIS_AngleDimension::ComputeSelection(aSelection, aMode); } + +bool SketcherPrs_Angle::isAnglePlaneReversedToSketchPlane() +{ + bool aReversed = false; + if (!mySketcherPlane.get()) + return aReversed; + + gp_Pln aPlane = GetPlane(); + gp_Dir aDir = aPlane.Axis().Direction(); + double aDot = mySketcherPlane->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; +}