X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Radius.cpp;h=bc784cb38bae61cce5fe03bce358da9eab450438;hb=b4fa4c082ef0d0e75ee8bf7f3f440b3f9c86e63c;hp=a3643fe08698926dd83629401a1afe6adeeb77b6;hpb=cc84ddead2c5dcb864d24de04df60b378f750824;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Radius.cpp b/src/SketcherPrs/SketcherPrs_Radius.cpp index a3643fe08..bc784cb38 100644 --- a/src/SketcherPrs/SketcherPrs_Radius.cpp +++ b/src/SketcherPrs/SketcherPrs_Radius.cpp @@ -1,11 +1,26 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Radius.cpp -// Created: 26 March 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_Radius.h" #include "SketcherPrs_Tools.h" +#include "SketcherPrs_DimensionStyleListener.h" #include #include @@ -18,93 +33,155 @@ #include #include +#include + +/// Creates an aspect to be shown in length/radius dimension presentations +/// \return an instance of aspect +extern Handle(Prs3d_DimensionAspect) createDimensionAspect(); + +/// 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); + + static const gp_Circ MyDefCirc(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1)), 1); -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Radius, AIS_RadiusDimension); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Radius, AIS_RadiusDimension); -SketcherPrs_Radius::SketcherPrs_Radius(ModelAPI_Feature* theConstraint, +SketcherPrs_Radius::SketcherPrs_Radius(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane) -: AIS_RadiusDimension(MyDefCirc), myConstraint(theConstraint), myPlane(thePlane) +: AIS_RadiusDimension(MyDefCirc), myConstraint(theConstraint), mySketcherPlane(thePlane), + myCircle(MyDefCirc), + myAnchorPoint(gp_Pnt(0, 0, 2)), + myValue(1, false, "") { - myAspect = new Prs3d_DimensionAspect(); - myAspect->MakeArrows3d(false); - myAspect->MakeText3d(false); - myAspect->MakeTextShaded(false); - myAspect->MakeUnitsDisplayed(false); - myAspect->TextAspect()->SetHeight(MyTextHeight); - myAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize()); - - SetDimensionAspect(myAspect); - SetSelToleranceForText2d(MyTextHeight); + SetDimensionAspect(createDimensionAspect()); + myStyleListener = new SketcherPrs_DimensionStyleListener(); } +SketcherPrs_Radius::~SketcherPrs_Radius() +{ + delete myStyleListener; +} -void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +bool SketcherPrs_Radius::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) { - DataPtr aData = myConstraint->data(); + gp_Circ aCircle; + gp_Pnt anAnchorPoint; + return readyToDisplay(theConstraint, thePlane, aCircle, anAnchorPoint); +} + +bool SketcherPrs_Radius::readyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane, + gp_Circ& theCircle, gp_Pnt& theAnchorPoint) +{ + bool aReadyToDisplay = false; + + 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()) - return; // can not create a good presentation - - std::shared_ptr aFlyoutPnt = myPlane->to3D(aFlyoutAttr->x(), aFlyoutAttr->y()); + if (!aFlyoutAttr->isInitialized()) { + return aReadyToDisplay; // can not create a good presentation + } // Get circle - std::shared_ptr anAttr = + std::shared_ptr anAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_Constraint::ENTITY_A())); - if (!anAttr) return; + if (!anAttr) + return aReadyToDisplay; std::shared_ptr aCyrcFeature = ModelAPI_Feature::feature(anAttr->object()); + //theRadius = 1; double aRadius = 1; std::shared_ptr aCenterAttr; + // it is possible that circle result becomes zero, in this case the presentation should disappear + // for example, it happens when circle radius is set to zero + if (!aCyrcFeature) + return aReadyToDisplay; if (aCyrcFeature->getKind() == SketchPlugin_Circle::ID()) { // circle aCenterAttr = std::dynamic_pointer_cast( aCyrcFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID())); - AttributeDoublePtr aCircRadius = + AttributeDoublePtr aCircRadius = std::dynamic_pointer_cast( aCyrcFeature->data()->attribute(SketchPlugin_Circle::RADIUS_ID())); aRadius = aCircRadius->value(); } else { // arc aCenterAttr = std::dynamic_pointer_cast( aCyrcFeature->data()->attribute(SketchPlugin_Arc::CENTER_ID())); - std::shared_ptr aStartAttr = - std::dynamic_pointer_cast - (aCyrcFeature->data()->attribute(SketchPlugin_Arc::START_ID())); - aRadius = aCenterAttr->pnt()->distance(aStartAttr->pnt()); + //std::shared_ptr aStartAttr = + // std::dynamic_pointer_cast + // (aCyrcFeature->data()->attribute(SketchPlugin_Arc::START_ID())); + //theRadius = aCenterAttr->pnt()->distance(aStartAttr->pnt()); + AttributeDoublePtr aCircRadius = + std::dynamic_pointer_cast( + aCyrcFeature->data()->attribute(SketchPlugin_Arc::RADIUS_ID())); + aRadius = aCircRadius->value(); } - std::shared_ptr aCenter = myPlane->to3D(aCenterAttr->x(), aCenterAttr->y()); - std::shared_ptr aNormal = myPlane->norm(); + std::shared_ptr aCenter = thePlane->to3D(aCenterAttr->x(), aCenterAttr->y()); + std::shared_ptr aNormal = thePlane->normal(); GeomAPI_Circ aCircle(aCenter, aNormal, aRadius); - //gp_Circ aCircle(gp_Ax2(aCenter->impl(), aNormal->impl()), aRadius); - - std::shared_ptr anAnchor = aCircle.project(aFlyoutPnt); - std::shared_ptr anAnchorXYZ = anAnchor->xyz(); - anAnchorXYZ = anAnchorXYZ->decreased(aCenter->xyz()); - std::shared_ptr aDeltaDir(new GeomAPI_Dir(anAnchorXYZ)); - const double aDelta = 1e-3; - anAnchor->setX(anAnchor->x() + aDelta * aDeltaDir->x()); - anAnchor->setY(anAnchor->y() + aDelta * aDeltaDir->y()); - anAnchor->setZ(anAnchor->z() + aDelta * aDeltaDir->z()); - - SetMeasuredGeometry(aCircle.impl(), anAnchor->impl()); - SetCustomValue(aRadius); + std::shared_ptr anAnchor = + SketcherPrs_Tools::getAnchorPoint(theConstraint, thePlane); + + theCircle = aCircle.impl(); + theAnchorPoint = anAnchor->impl(); + + aReadyToDisplay = theAnchorPoint.Distance(theCircle.Location()) > 1e-7; + + return aReadyToDisplay; +} + +void SketcherPrs_Radius::Compute( + const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode) +{ + gp_Circ aCircle; + gp_Pnt anAnchorPoint; + bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aCircle, anAnchorPoint); + if (aReadyToDisplay) { + myCircle = aCircle; + myAnchorPoint = anAnchorPoint; + + DataPtr aData = myConstraint->data(); + AttributeDoublePtr anAttributeValue = aData->real(SketchPlugin_Constraint::VALUE()); + myValue.init(anAttributeValue); + } + + SetMeasuredGeometry(myCircle, myAnchorPoint); + myStyleListener->updateDimensions(this, myValue); + + // Update variable aspect parameters (depending on viewer scale) + double aTextSize = 0.0; + GetValueString(aTextSize); + updateArrows(DimensionAspect(), GetValue(), aTextSize, SketcherPrs_Tools::LOCATION_AUTOMATIC); + AIS_RadiusDimension::Compute(thePresentationManager, thePresentation, theMode); + + if (!aReadyToDisplay) + SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, + "An empty AIS presentation: SketcherPrs_Radius"); } void SketcherPrs_Radius::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer theMode) { + // Map the application selection modes to standard ones Standard_Integer aMode; switch (theMode) { + case 0: // we should use selection of all objects + aMode = 0; + break; case SketcherPrs_Tools::Sel_Dimension_All: aMode = 0; break; @@ -114,8 +191,12 @@ void SketcherPrs_Radius::ComputeSelection(const Handle(SelectMgr_Selection)& aSe case SketcherPrs_Tools::Sel_Dimension_Text: aMode = 2; break; - default: - aMode = theMode; + default: { + // there are own selection modes, so the others should be ignored + // otherwise, the text selection appears in the viewer + return; + } } + SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); AIS_RadiusDimension::ComputeSelection(aSelection, aMode); }