X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Radius.cpp;h=bd10874fcd469eca67559649a633c3767eaea594;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=306fa9577d2cfc8194b75d8a3e8fe0ce8c91de5f;hpb=3e40e36af7bb9e49d10924383c71efd6c8186c16;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Radius.cpp b/src/SketcherPrs/SketcherPrs_Radius.cpp index 306fa9577..bd10874fc 100644 --- a/src/SketcherPrs/SketcherPrs_Radius.cpp +++ b/src/SketcherPrs/SketcherPrs_Radius.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Radius.cpp -// Created: 26 March 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2019 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" @@ -18,22 +31,34 @@ #include #include #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, - const std::shared_ptr& thePlane) -: AIS_RadiusDimension(MyDefCirc), myConstraint(theConstraint), mySketcherPlane(thePlane), +SketcherPrs_Radius::SketcherPrs_Radius(ModelAPI_Feature* theConstraint, + SketchPlugin_Sketch* theSketcher) +: AIS_RadiusDimension(MyDefCirc), myConstraint(theConstraint), mySketcher(theSketcher), myCircle(MyDefCirc), myAnchorPoint(gp_Pnt(0, 0, 2)), myValue(1, false, "") { - SetDimensionAspect(SketcherPrs_Tools::createDimensionAspect()); + SetDimensionAspect(createDimensionAspect()); myStyleListener = new SketcherPrs_DimensionStyleListener(); } @@ -59,7 +84,7 @@ bool SketcherPrs_Radius::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()) { @@ -67,7 +92,7 @@ bool SketcherPrs_Radius::readyToDisplay(ModelAPI_Feature* theConstraint, } // Get circle - std::shared_ptr anAttr = + std::shared_ptr anAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_Constraint::ENTITY_A())); if (!anAttr) @@ -84,18 +109,18 @@ bool SketcherPrs_Radius::readyToDisplay(ModelAPI_Feature* theConstraint, 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::shared_ptr aStartAttr = // std::dynamic_pointer_cast // (aCyrcFeature->data()->attribute(SketchPlugin_Arc::START_ID())); //theRadius = aCenterAttr->pnt()->distance(aStartAttr->pnt()); - AttributeDoublePtr aCircRadius = + AttributeDoublePtr aCircRadius = std::dynamic_pointer_cast( aCyrcFeature->data()->attribute(SketchPlugin_Arc::RADIUS_ID())); aRadius = aCircRadius->value(); @@ -104,7 +129,8 @@ bool SketcherPrs_Radius::readyToDisplay(ModelAPI_Feature* theConstraint, std::shared_ptr aNormal = thePlane->normal(); GeomAPI_Circ aCircle(aCenter, aNormal, aRadius); - std::shared_ptr anAnchor = SketcherPrs_Tools::getAnchorPoint(theConstraint, thePlane); + std::shared_ptr anAnchor = + SketcherPrs_Tools::getAnchorPoint(theConstraint, thePlane); theCircle = aCircle.impl(); theAnchorPoint = anAnchor->impl(); @@ -114,13 +140,16 @@ bool SketcherPrs_Radius::readyToDisplay(ModelAPI_Feature* theConstraint, return aReadyToDisplay; } -void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +void SketcherPrs_Radius::Compute( + const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode) { + if (!plane().get()) + return; gp_Circ aCircle; gp_Pnt anAnchorPoint; - bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aCircle, anAnchorPoint); + bool aReadyToDisplay = readyToDisplay(myConstraint, plane(), aCircle, anAnchorPoint); if (aReadyToDisplay) { myCircle = aCircle; myAnchorPoint = anAnchorPoint; @@ -136,9 +165,13 @@ void SketcherPrs_Radius::Compute(const Handle(PrsMgr_PresentationManager3d)& the // Update variable aspect parameters (depending on viewer scale) double aTextSize = 0.0; GetValueString(aTextSize); - SketcherPrs_Tools::updateArrows(DimensionAspect(), GetValue(), aTextSize); - + AttributeIntegerPtr aLocAttr = std::dynamic_pointer_cast + (myConstraint->data()->attribute(SketchPlugin_ConstraintRadius::LOCATION_TYPE_ID())); + SketcherPrs_Tools::LocationType aLocationType = aLocAttr->isInitialized() ? + (SketcherPrs_Tools::LocationType)(aLocAttr->value()) : SketcherPrs_Tools::LOCATION_AUTOMATIC; + updateArrows(DimensionAspect(), GetValue(), aTextSize, aLocationType); + AIS_RadiusDimension::Compute(thePresentationManager, thePresentation, theMode); if (!aReadyToDisplay) @@ -167,8 +200,9 @@ void SketcherPrs_Radius::ComputeSelection(const Handle(SelectMgr_Selection)& aSe 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::getArrowSize()/5.); AIS_RadiusDimension::ComputeSelection(aSelection, aMode); }