X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Radius.cpp;h=1d833ab938b1abeaa2ba586d924c2d0dd5e1d3e3;hb=f71c1052b2ecc33488b2136947088777adc17584;hp=aeabe0eae97ca416eac8d5251ab8ef0b159a2416;hpb=05980d60d4b120a4bb9244fc923d1925ff4b4bfc;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Radius.cpp b/src/SketcherPrs/SketcherPrs_Radius.cpp index aeabe0eae..1d833ab93 100644 --- a/src/SketcherPrs/SketcherPrs_Radius.cpp +++ b/src/SketcherPrs/SketcherPrs_Radius.cpp @@ -1,50 +1,65 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Radius.cpp -// Created: 26 March 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2020 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 "SketcherPrs_DimensionStyle.h" #include #include #include #include -#include - #include #include #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), myPlane(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, "") { - // Set default values of the presentation - myAspect = new Prs3d_DimensionAspect(); - myAspect->MakeArrows3d(false); - myAspect->MakeText3d(false); - myAspect->MakeTextShaded(false); - myAspect->MakeUnitsDisplayed(false); - myAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getDefaultTextHeight()); - myAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize()); - - SetDimensionAspect(myAspect); - SetSelToleranceForText2d(SketcherPrs_Tools::getDefaultTextHeight()); - - myStyleListener = new SketcherPrs_DimensionStyleListener(); + SetDimensionAspect(createDimensionAspect()); + myStyleListener = new SketcherPrs_DimensionStyle(); } SketcherPrs_Radius::~SketcherPrs_Radius() @@ -54,13 +69,22 @@ SketcherPrs_Radius::~SketcherPrs_Radius() bool SketcherPrs_Radius::IsReadyToDisplay(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane) +{ + 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()) { @@ -68,13 +92,14 @@ bool SketcherPrs_Radius::IsReadyToDisplay(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) 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 @@ -84,113 +109,74 @@ bool SketcherPrs_Radius::IsReadyToDisplay(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::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 = thePlane->to3D(aCenterAttr->x(), aCenterAttr->y()); 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(); - gp_Circ aCirc = aCircle.impl(); - gp_Pnt anAncorPnt = anAnchor->impl(); - // anchor point should not coincide to the location point of the circle - // OCCT does not process this case. + aReadyToDisplay = theAnchorPoint.Distance(theCircle.Location()) > 1e-7; - aReadyToDisplay = anAncorPnt.Distance(aCirc.Location()) > 1e-7; 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 (!IsReadyToDisplay(myConstraint, myPlane)) { - Events_Error::throwException("An empty AIS presentation: SketcherPrs_Radius"); + if (!plane().get()) return; + gp_Circ aCircle; + gp_Pnt anAnchorPoint; + bool aReadyToDisplay = readyToDisplay(myConstraint, plane(), aCircle, anAnchorPoint); + if (aReadyToDisplay) { + myCircle = aCircle; + myAnchorPoint = anAnchorPoint; + + DataPtr aData = myConstraint->data(); + AttributeDoublePtr anAttributeValue = aData->real(SketchPlugin_Constraint::VALUE()); + myValue.init(anAttributeValue); } - DataPtr aData = myConstraint->data(); - - // Flyout point - std::shared_ptr aFlyoutAttr = - std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - - // Get circle - std::shared_ptr anAttr = - std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_Constraint::ENTITY_A())); - - std::shared_ptr aCyrcFeature = ModelAPI_Feature::feature(anAttr->object()); - double aRadius = 1; - std::shared_ptr aCenterAttr; - if (aCyrcFeature->getKind() == SketchPlugin_Circle::ID()) { // circle - aCenterAttr = std::dynamic_pointer_cast( - aCyrcFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID())); - 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 aCenter = myPlane->to3D(aCenterAttr->x(), aCenterAttr->y()); - std::shared_ptr aNormal = myPlane->normal(); - - GeomAPI_Circ aCircle(aCenter, aNormal, aRadius); - - std::shared_ptr anAnchor = SketcherPrs_Tools::getAnchorPoint(myConstraint, myPlane); - - gp_Circ aCirc = aCircle.impl(); - gp_Pnt anAncorPnt = anAnchor->impl(); - - SetMeasuredGeometry(aCirc, anAncorPnt); - SetCustomValue(aRadius); + SetMeasuredGeometry(myCircle, myAnchorPoint); + myStyleListener->updateDimensions(this, myValue); // Update variable aspect parameters (depending on viewer scale) - double anArrowLength = myAspect->ArrowAspect()->Length(); - // This is not realy correct way to get viewer scale. - double aViewerScale = (double) SketcherPrs_Tools::getDefaultArrowSize() / anArrowLength; - double aDimensionValue = GetValue(); double aTextSize = 0.0; GetValueString(aTextSize); - if(aTextSize > ((aDimensionValue - 2 * SketcherPrs_Tools::getArrowSize()) * aViewerScale)) { - myAspect->SetTextHorizontalPosition(Prs3d_DTHP_Left); - myAspect->SetArrowOrientation(Prs3d_DAO_External); - myAspect->SetExtensionSize(aTextSize / aViewerScale - SketcherPrs_Tools::getArrowSize() / 2.0); - } else { - myAspect->SetTextHorizontalPosition(Prs3d_DTHP_Center); - myAspect->SetArrowOrientation(Prs3d_DAO_Internal); - } - myAspect->SetArrowTailSize(myAspect->ArrowAspect()->Length()); - - // The value of vertical aligment is sometimes changed - myAspect->TextAspect()->SetVerticalJustification(Graphic3d_VTA_CENTER); - - AttributeDoublePtr aValue = myConstraint->data()->real(SketchPlugin_Constraint::VALUE()); - SketcherPrs_Tools::setDisplaySpecialSymbol(this, aValue->usedParameters().size() > 0); - - myStyleListener->updateDimensions(this, aValue); + 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) + SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, + "An empty AIS presentation: SketcherPrs_Radius"); } void SketcherPrs_Radius::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, @@ -214,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); }