-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// 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
//
#include "SketcherPrs_Angle.h"
-#include "SketcherPrs_DimensionStyleListener.h"
+#include "SketcherPrs_DimensionStyle.h"
#include "SketcherPrs_Tools.h"
#include <SketchPlugin_ConstraintAngle.h>
#include <TopExp.hxx>
#include <BRep_Tool.hxx>
+#include <Standard_Version.hxx>
+
+#if OCC_VERSION_HEX > 0x070400
+#include <PrsDim_TypeOfAngleArrowVisibility.hxx>
+#endif
+
/// Update variable aspect parameters (depending on viewer scale)
/// \param theDimAspect an aspect to be changed
/// \param theDimValue an arrow value
// #define COMPILATION_CORRECTION
//#endif
-IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, AIS_AngleDimension);
+IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Angle, PrsDim_AngleDimension);
SketcherPrs_Angle::SketcherPrs_Angle(ModelAPI_Feature* theConstraint,
- const std::shared_ptr<GeomAPI_Ax3>& 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)
+ 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);
SetDimensionAspect(myAspect);
- myStyleListener = new SketcherPrs_DimensionStyleListener();
+ myStyleListener = new SketcherPrs_DimensionStyle();
}
SketcherPrs_Angle::~SketcherPrs_Angle()
gp_Pnt& theCenterPoint)
{
bool aReadyToDisplay = false;
+ if (!thePlane)
+ return aReadyToDisplay;
DataPtr aData = theConstraint->data();
std::shared_ptr<GeomAPI_Lin2d> aLine2(new GeomAPI_Lin2d(aStartB->pnt(), aEndB->pnt()));
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<GeomAPI_Angle2d>(
new GeomAPI_Angle2d(aLine1, isReversed1, aLine2, isReversed2));
}
- gp_Pnt2d aFirstPoint = anAng->firstPoint()->impl<gp_Pnt2d>();
+ gp_Pnt2d aCenterPoint = anAng->center()->impl<gp_Pnt2d>();
+ gp_Pnt2d aFirstPoint, aSecondPoint;
+ try {
+ if (anAng->angleRadian() > 0.0) {
+ aFirstPoint = anAng->firstPoint()->impl<gp_Pnt2d>();
+ aSecondPoint = anAng->secondPoint()->impl<gp_Pnt2d>();
+ }
+ else {
+ aFirstPoint = anAng->secondPoint()->impl<gp_Pnt2d>();
+ aSecondPoint = anAng->firstPoint()->impl<gp_Pnt2d>();
+ }
+ }
+ 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<GeomAPI_Pnt> aPoint = thePlane->to3D(aFirstPoint.X(), aFirstPoint.Y());
theFirstPoint = aPoint->impl<gp_Pnt>();
- gp_Pnt2d aCenterPoint = anAng->center()->impl<gp_Pnt2d>();
aPoint = thePlane->to3D(aCenterPoint.X(), aCenterPoint.Y());
theCenterPoint = aPoint->impl<gp_Pnt>();
- gp_Pnt2d aSecondPoint = anAng->secondPoint()->impl<gp_Pnt2d>();
aPoint = thePlane->to3D(aSecondPoint.X(), aSecondPoint.Y());
theSecondPoint = aPoint->impl<gp_Pnt>();
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,
+ bool aReadyToDisplay = readyToDisplay(myConstraint, plane(),
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::dynamic_pointer_cast<GeomDataAPI_Point2D>
(aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
std::shared_ptr<GeomAPI_Pnt> aFlyoutPnt =
- mySketcherPlane->to3D(aFlyoutAttr->x(), aFlyoutAttr->y());
+ plane()->to3D(aFlyoutAttr->x(), aFlyoutAttr->y());
myFlyOutPoint = aFlyoutPnt->impl<gp_Pnt>();
}
- DataPtr aData = myConstraint->data();
- std::shared_ptr<ModelAPI_AttributeInteger> 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: {
#ifndef COMPILATION_CORRECTION
- SetArrowsVisibility(AIS_TOAV_Second);
+#if OCC_VERSION_HEX > 0x070400
+ SetArrowsVisibility(PrsDim_TypeOfAngleArrowVisibility_Both);
+#else
+ SetArrowsVisibility(AIS_TOAV_Both);
#endif
- SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint);
-#ifndef COMPILATION_CORRECTION
- bool isReversedPlanes = isAnglePlaneReversedToSketchPlane();
- SetType(!isReversedPlanes ? AIS_TOA_Exterior : AIS_TOA_Interior);
#endif
- }
- 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);
+ SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint);
#ifndef COMPILATION_CORRECTION
- SetType(AIS_TOA_Interior);
+ 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
- }
- break;
- case SketcherPrs_Tools::ANGLE_BACKWARD: {
-#ifndef COMPILATION_CORRECTION
- SetArrowsVisibility(AIS_TOAV_Second);
-#endif
- SetMeasuredGeometry(myFirstPoint, myCenterPoint, mySecondPoint);
- bool isReversedPlanes = isAnglePlaneReversedToSketchPlane();
-#ifndef COMPILATION_CORRECTION
- SetType(isReversedPlanes ? AIS_TOA_Exterior : AIS_TOA_Interior);
#endif
- }
- break;
- default:
- break;
- }
if (aDist < 0) /// it was not calculated yet
aDist = calculateDistanceToFlyoutPoint();
SetFlyout(aDist);
updateArrows(myAspect, anAngleCircleLength, aTextSize, aLocationType);
- AIS_AngleDimension::Compute(thePresentationManager, thePresentation, theMode);
+ PrsDim_AngleDimension::Compute(thePresentationManager, thePresentation, theMode);
if (!aReadyToDisplay)
SketcherPrs_Tools::sendEmptyPresentationError(myConstraint,
}
}
SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.);
- AIS_AngleDimension::ComputeSelection(aSelection, aMode);
+ 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<GeomAPI_Dir>(new GeomAPI_Dir(aDir.X(), aDir.Y(), aDir.Z())));
return aDot < 0;
}
