X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketcherPrs%2FSketcherPrs_LengthDimension.cpp;h=b15f0d05f0459ece2a964e17187769c4d103cbcb;hb=584f97832c77adf0c9df154b2f3eb1835bd3ce9e;hp=300d30c7fd9045a91852f59ed0693bca87716e58;hpb=c795030a80f70473cfcd9bd1bbe2d65f3b25fb0b;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_LengthDimension.cpp b/src/SketcherPrs/SketcherPrs_LengthDimension.cpp index 300d30c7f..b15f0d05f 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,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -23,9 +38,11 @@ #include #include +#include #include +#define OCCT_28850_FIXED /// Creates an aspect to be shown in length/radius dimension presentations /// \return an instance of aspect @@ -36,7 +53,7 @@ Handle(Prs3d_DimensionAspect) createDimensionAspect() anAspect->MakeText3d(false); anAspect->MakeTextShaded(false); anAspect->MakeUnitsDisplayed(false); - anAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getDefaultTextHeight()); + anAspect->TextAspect()->SetHeight(SketcherPrs_Tools::getConfigTextHeight()); anAspect->ArrowAspect()->SetLength(SketcherPrs_Tools::getArrowSize()); return anAspect; @@ -47,21 +64,38 @@ Handle(Prs3d_DimensionAspect) createDimensionAspect() /// \param theDimValue an arrow value /// \param theTextSize an arrow value void updateArrows(Handle(Prs3d_DimensionAspect) theDimAspect, - double theDimValue, double theTextSize) + double theDimValue, double theTextSize, SketcherPrs_Tools::LocationType theLocationType) { - double anArrowLength = theDimAspect->ArrowAspect()->Length(); - // This is not realy correct way to get viewer scale. - double aViewerScale = (double) SketcherPrs_Tools::getDefaultArrowSize() / anArrowLength; - - if(theTextSize > ((theDimValue - 3 * SketcherPrs_Tools::getArrowSize()) * aViewerScale)) { - theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Left); + 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); - } else { - theDimAspect->SetTextHorizontalPosition(Prs3d_DTHP_Center); - theDimAspect->SetArrowOrientation(Prs3d_DAO_Internal); + (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); @@ -75,10 +109,10 @@ static const gp_Pln MyDefPln(gp_Pnt(0,0,0), gp_Dir(0,0,1)); 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), @@ -87,6 +121,8 @@ SketcherPrs_LengthDimension::SketcherPrs_LengthDimension(ModelAPI_Feature* theCo { SetDimensionAspect(createDimensionAspect()); myStyleListener = new SketcherPrs_DimensionStyleListener(); + + setDirection(theConstraint, plane()); } SketcherPrs_LengthDimension::~SketcherPrs_LengthDimension() @@ -101,23 +137,68 @@ bool SketcherPrs_LengthDimension::IsReadyToDisplay(ModelAPI_Feature* theConstrai return readyToDisplay(theConstraint, thePlane, aPnt1, aPnt2); } +static bool isEqualPoints(ModelAPI_Feature* theConstraint, + const gp_Pnt& thePoint1, + const gp_Pnt& thePoint2) +{ + bool isEqual = false; + if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID()) + isEqual = Abs(thePoint1.X() - thePoint2.X()) < Precision::Confusion(); + else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) + isEqual = Abs(thePoint1.Y() - thePoint2.Y()) < Precision::Confusion(); + else + isEqual = thePoint1.SquareDistance(thePoint2) < Precision::SquareConfusion(); + return isEqual; +} + 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) { + if (isEqualPoints(myConstraint, aPnt1, aPnt2)) { + // adjust points to draw the dimension presentation + std::shared_ptr aDirAttr = std::dynamic_pointer_cast( + myConstraint->attribute(SketchPlugin_ConstraintDistance::DIRECTION_ID())); + double x = 0.0, y = 0.0; + if (aDirAttr && aDirAttr->isInitialized()) { + x = aDirAttr->x(); + y = aDirAttr->y(); + if (x == 0.0 && y == 0.0) + x = 1.0; + } + else if (myConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) + y = 1.0; + else + x = 1.0; + GeomPointPtr aCoord = plane()->to3D(x, y); + + gp_XYZ aDir(aCoord->x(), aCoord->y(), aCoord->z()); + aPnt1.ChangeCoord().Add(aDir * (-Precision::Confusion())); + aPnt2.ChangeCoord().Add(aDir * Precision::Confusion()); + } + myFirstPoint = aPnt1; mySecondPoint = aPnt2; myDistance = SketcherPrs_Tools::getFlyoutDistance(myConstraint); - myPlane = gp_Pln(mySketcherPlane->impl()); + myPlane = gp_Pln(plane()->impl()); DataPtr aData = myConstraint->data(); - AttributeDoublePtr anAttributeValue = aData->real(SketchPlugin_Constraint::VALUE()); + 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); + + setDirection(myConstraint, plane()); } // compute flyout distance @@ -128,7 +209,22 @@ void SketcherPrs_LengthDimension::Compute( double aTextSize = 0.0; GetValueString(aTextSize); - 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, myValue); @@ -144,6 +240,9 @@ 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 @@ -169,7 +268,9 @@ bool SketcherPrs_LengthDimension::readyToDisplay(ModelAPI_Feature* theConstraint 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); @@ -202,6 +303,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()); @@ -238,6 +348,17 @@ void SketcherPrs_LengthDimension::ComputeSelection(const Handle(SelectMgr_Select return; } } - SetSelToleranceForText2d(SketcherPrs_Tools::getTextHeight()); + SetSelToleranceForText2d(SketcherPrs_Tools::getArrowSize()/5.); AIS_LengthDimension::ComputeSelection(aSelection, aMode); } + +void SketcherPrs_LengthDimension::setDirection(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) +{ +#ifdef OCCT_28850_FIXED + if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceHorizontal::ID()) + SetDirection(thePlane->dirX()->impl(), true); + else if (theConstraint->getKind() == SketchPlugin_ConstraintDistanceVertical::ID()) + SetDirection(thePlane->dirY()->impl(), true); +#endif +}