X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_LengthDimension.cpp;h=6f1179f59a1263b0c1f8a71b59b6552de8facf51;hb=4ce1fd8af764a1293ff5c54ef2bd723864fe8cdb;hp=2dc2a3b3daa6c65cb80baa1c1a6310779f11b12b;hpb=b8ee56da654b147ed1a537c744c35e9c60562936;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp index 2dc2a3b3d..6f1179f59 100644 --- a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp +++ b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_LengthDimension.cpp -// Created: 27 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_LengthDimension.h" #include "SketcherPrs_Tools.h" @@ -11,12 +24,12 @@ #include #include #include +#include +#include #include #include #include -#include - #include #include #include @@ -25,33 +38,96 @@ #include #include +#include #include +#define OCCT_28850_FIXED + +/// Creates an aspect to be shown in length/radius dimension presentations +/// \return an instance of aspect +Handle(Prs3d_DimensionAspect) createDimensionAspect() +{ + Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect(); + anAspect->MakeArrows3d(false); + anAspect->MakeText3d(false); + anAspect->MakeTextShaded(false); + anAspect->MakeUnitsDisplayed(false); + anAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getConfigTextHeight()); + anAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize()); + + return anAspect; +} + +/// 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 +void updateArrows(Handle(Prs3d_DimensionAspect) theDimAspect, + double theDimValue, double theTextSize, SketcherPrs_Tools::LocationType theLocationType) +{ + if (theLocationType == SketcherPrs_Tools::LOCATION_AUTOMATIC) { + double anArrowLength = theDimAspect->ArrowAspect()->Length(); + // This is not realy correct way to get viewer scale. + double aViewerScale = (double) SketcherPrs_Tools::getConfigArrowSize() / anArrowLength; + + if(theTextSize > ((theDimValue - 3 * SketcherPrs_Tools::getArrowSize()) * aViewerScale)) { + theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Left); + theDimAspect->SetArrowOrientation(Prs3d_DAO_External); + theDimAspect->SetExtensionSize( + (theTextSize / aViewerScale + SketcherPrs_Tools::getArrowSize()) / 2.0); + } else { + theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Center); + theDimAspect->SetArrowOrientation(Prs3d_DAO_Internal); + } + } + else if (theLocationType == SketcherPrs_Tools::LOCATION_RIGHT || + theLocationType == SketcherPrs_Tools::LOCATION_LEFT) { + theDimAspect->SetTextHorizontalPosition( + theLocationType == SketcherPrs_Tools::LOCATION_LEFT ? Prs3d_DTHP_Left : Prs3d_DTHP_Right); + theDimAspect->SetArrowOrientation(Prs3d_DAO_External); + + double anArrowLength = theDimAspect->ArrowAspect()->Length(); + // This is not realy correct way to get viewer scale. + double aViewerScale = (double) SketcherPrs_Tools::getConfigArrowSize() / anArrowLength; + theDimAspect->SetExtensionSize( + (theTextSize / aViewerScale + SketcherPrs_Tools::getArrowSize()) / 2.0); + } + theDimAspect->TextAspect()->SetFont(Config_PropManager::string("Visualization", + "dimension_font").c_str()); + + theDimAspect->SetArrowTailSize(theDimAspect->ArrowAspect()->Length()); + // The value of vertical aligment is sometimes changed + theDimAspect->TextAspect()->SetVerticalJustification(Graphic3d_VTA_CENTER); +} + static const gp_Pnt MyDefStart(0,0,0); static const gp_Pnt MyDefEnd(1,0,0); static const gp_Pln MyDefPln(gp_Pnt(0,0,0), gp_Dir(0,0,1)); -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_LengthDimension, AIS_LengthDimension); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_LengthDimension, AIS_LengthDimension); SketcherPrs_LengthDimension::SketcherPrs_LengthDimension(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) + SketchPlugin_Sketch* theSketcher) : AIS_LengthDimension(MyDefStart, MyDefEnd, MyDefPln), myConstraint(theConstraint), - mySketcherPlane(thePlane), + mySketcher(theSketcher), myFirstPoint(MyDefStart), mySecondPoint(MyDefEnd), myPlane(MyDefPln), - myHasParameters(false), - myValue(""), - myDistance(1) + myDistance(1), + myValue(0., false, "") { - SetDimensionAspect(SketcherPrs_Tools::createDimensionAspect()); - SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); - + SetDimensionAspect(createDimensionAspect()); myStyleListener = new SketcherPrs_DimensionStyleListener(); + +#ifdef OCCT_28850_FIXED + if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID()) + SetDirection(plane()->dirX()->impl(), true); + else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) + SetDirection(plane()->dirY()->impl(), true); +#endif } SketcherPrs_LengthDimension::~SketcherPrs_LengthDimension() @@ -66,23 +142,30 @@ bool SketcherPrs_LengthDimension::IsReadyToDisplay(ModelAPI_Feature* theConstrai return readyToDisplay(theConstraint, thePlane, aPnt1, aPnt2); } -void SketcherPrs_LengthDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +void SketcherPrs_LengthDimension::Compute( + const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode) { + if (!plane().get()) + return; gp_Pnt aPnt1, aPnt2; - bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aPnt1, aPnt2); + bool aReadyToDisplay = readyToDisplay(myConstraint, plane(), aPnt1, aPnt2); if (aReadyToDisplay) { myFirstPoint = aPnt1; mySecondPoint = aPnt2; myDistance = SketcherPrs_Tools::getFlyoutDistance(myConstraint); - myPlane = gp_Pln(mySketcherPlane->impl()); - - AttributeDoublePtr anAttributeValue = myConstraint->data()->real(SketchPlugin_Constraint::VALUE()); - - myHasParameters = anAttributeValue->usedParameters().size() > 0; - myValue = anAttributeValue->text(); + myPlane = gp_Pln(plane()->impl()); + + DataPtr aData = myConstraint->data(); + AttributeDoublePtr anAttributeValue; + if (myConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID() || + myConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) + anAttributeValue = aData->real(SketchPlugin_ConstraintDistanceAlongDir::DISTANCE_VALUE_ID()); + else + anAttributeValue = aData->real(SketchPlugin_Constraint::VALUE()); + myValue.init(anAttributeValue); } // compute flyout distance @@ -92,10 +175,26 @@ void SketcherPrs_LengthDimension::Compute(const Handle(PrsMgr_PresentationManage // Update variable aspect parameters (depending on viewer scale) double aTextSize = 0.0; GetValueString(aTextSize); - SketcherPrs_Tools::updateArrows(DimensionAspect(), GetValue(), aTextSize); + + std::string aLocationAttribute; + std::string aConstraintKind = myConstraint->getKind(); + if (aConstraintKind == SketchPlugin_ConstraintLength::ID()) + aLocationAttribute = SketchPlugin_ConstraintLength::LOCATION_TYPE_ID(); + else if (aConstraintKind == SketchPlugin_ConstraintDistance::ID()) + aLocationAttribute = SketchPlugin_ConstraintDistance::LOCATION_TYPE_ID(); + else if (aConstraintKind == SketchPlugin_ConstraintDistanceHorizontal::ID()) + aLocationAttribute = SketchPlugin_ConstraintDistanceHorizontal::LOCATION_TYPE_ID(); + else if (aConstraintKind == SketchPlugin_ConstraintDistanceVertical::ID()) + aLocationAttribute = SketchPlugin_ConstraintDistanceVertical::LOCATION_TYPE_ID(); + + AttributeIntegerPtr aLocAttr = std::dynamic_pointer_cast + (myConstraint->data()->attribute(aLocationAttribute)); + SketcherPrs_Tools::LocationType aLocationType = aLocAttr->isInitialized() ? + (SketcherPrs_Tools::LocationType)(aLocAttr->value()) : SketcherPrs_Tools::LOCATION_AUTOMATIC; + updateArrows(DimensionAspect(), GetValue(), aTextSize, aLocationType); // Update text visualization: parameter value or parameter text - myStyleListener->updateDimensions(this, myHasParameters, myValue); + myStyleListener->updateDimensions(this, myValue); AIS_LengthDimension::Compute(thePresentationManager, thePresentation, theMode); @@ -108,10 +207,13 @@ bool SketcherPrs_LengthDimension::readyToDisplay(ModelAPI_Feature* theConstraint const std::shared_ptr& thePlane, gp_Pnt& thePnt1, gp_Pnt& thePnt2) { + if (!thePlane) + return false; + DataPtr aData = theConstraint->data(); if (theConstraint->getKind() == SketchPlugin_ConstraintLength::ID()) { // The constraint is length - std::shared_ptr anAttr = + std::shared_ptr anAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_Constraint::ENTITY_A())); if (!anAttr) @@ -123,17 +225,19 @@ bool SketcherPrs_LengthDimension::readyToDisplay(ModelAPI_Feature* theConstraint // Get geometry of the object DataPtr aLineData = aFeature->data(); - std::shared_ptr aStartPoint = + std::shared_ptr aStartPoint = std::dynamic_pointer_cast (aLineData->attribute(SketchPlugin_Line::START_ID())); - std::shared_ptr aEndPoint = + std::shared_ptr aEndPoint = std::dynamic_pointer_cast (aLineData->attribute(SketchPlugin_Line::END_ID())); thePnt1 = thePlane->to3D(aStartPoint->x(), aStartPoint->y())->impl(); thePnt2 = thePlane->to3D(aEndPoint->x(), aEndPoint->y())->impl(); return true; - } else if (theConstraint->getKind() == SketchPlugin_ConstraintDistance::ID()) { + } else if (theConstraint->getKind() == SketchPlugin_ConstraintDistance::ID() || + theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID() || + theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) { // The constraint is distance std::shared_ptr aPoint_A = SketcherPrs_Tools::getFeaturePoint( aData, SketchPlugin_Constraint::ENTITY_A(), thePlane); @@ -166,6 +270,15 @@ bool SketcherPrs_LengthDimension::readyToDisplay(ModelAPI_Feature* theConstraint if (!aPnt_A || !aPnt_B) // Objects not found return false; + if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID()) { + if (fabs(aPnt_A->x() - aPnt_B->x()) < Precision::Confusion()) + return false; + } + else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) { + if (fabs(aPnt_A->y() - aPnt_B->y()) < Precision::Confusion()) + return false; + } + // Get points from these object std::shared_ptr aPoint1 = thePlane->to3D(aPnt_A->x(), aPnt_A->y()); std::shared_ptr aPoint2 = thePlane->to3D(aPnt_B->x(), aPnt_B->y()); @@ -202,6 +315,6 @@ void SketcherPrs_LengthDimension::ComputeSelection(const Handle(SelectMgr_Select return; } } - SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); + SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.); AIS_LengthDimension::ComputeSelection(aSelection, aMode); }