X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintLength.cpp;h=21a84e4fa6b1e9c1a820f6e1c1cb625b2c816325;hb=c0e273c1479a9940dbe4f966853c82a6b8709d88;hp=224ea32b5239cb53b2c8bc06a945a1f17b2aaca6;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp index 224ea32b5..21a84e4fa 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp @@ -1,34 +1,73 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_ConstraintLength.cpp -// Created: 30 May 2014 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2022 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 "SketchPlugin_ConstraintLength.h" #include +#include #include +#include +#include + #include +#include #include #include +#include +#include #include +#include #include #include +#include #include +#include + +const double tolerance = 1e-7; + SketchPlugin_ConstraintLength::SketchPlugin_ConstraintLength() { + myFlyoutUpdate = false; } void SketchPlugin_ConstraintLength::initAttributes() { - data()->addAttribute(SketchPlugin_Constraint::VALUE(), ModelAPI_AttributeDouble::type()); - data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::type()); - data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::type()); + data()->addAttribute(SketchPlugin_Constraint::VALUE(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId()); + + data()->addAttribute(SketchPlugin_ConstraintLength::LOCATION_TYPE_ID(), + ModelAPI_AttributeInteger::typeId()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), LOCATION_TYPE_ID()); +} + +void SketchPlugin_ConstraintLength::colorConfigInfo(std::string& theSection, std::string& theName, + std::string& theDefault) +{ + theSection = "Visualization"; + theName = "sketch_dimension_color"; + theDefault = SKETCH_DIMENSION_COLOR; } void SketchPlugin_ConstraintLength::execute() @@ -43,14 +82,55 @@ void SketchPlugin_ConstraintLength::execute() std::shared_ptr aPoint2 = std::dynamic_pointer_cast< GeomDataAPI_Point2D>(aFeature->data()->attribute(SketchPlugin_Line::END_ID())); - double aLenght = aPoint1->pnt()->distance(aPoint2->pnt()); + if (aPoint1.get() && aPoint2.get()) { + // the value should to be computed here, not in the getAISObject + // in order to change the model value + // inside the object transaction. This is important for creating a constraint by preselection. + // The display of the presentation in this case happens after the transaction commit + AttributePtr aFlyOutAttribute = + data()->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()); + if (!aFlyOutAttribute->isInitialized()) { + compute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()); + } + } + } +} + +bool SketchPlugin_ConstraintLength::compute(const std::string& theAttributeId) +{ + if (theAttributeId != SketchPlugin_Constraint::FLYOUT_VALUE_PNT()) + return false; + + std::shared_ptr aPoint1, aPoint2; + std::shared_ptr aStartPoint, anEndPoint; + if (!getPoints(aPoint1, aPoint2, aStartPoint, anEndPoint)) + return false; + + std::shared_ptr aFlyOutAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(theAttributeId)); - //std::shared_ptr aValueAttr = std::dynamic_pointer_cast< - // ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE())); - //if(!aValueAttr->isInitialized()) { - // aValueAttr->setValue(aLenght); - //} + std::shared_ptr aLine = + std::shared_ptr(new GeomAPI_Lin2d(aStartPoint->pnt(), anEndPoint->pnt())); + if (!aFlyOutAttr->isInitialized() || + (fabs(aFlyOutAttr->x()) < tolerance && fabs(aFlyOutAttr->y()) < tolerance)) { + double aDist = aPoint1->distance(aPoint2)/5.; + std::shared_ptr aFPnt = aLine->shiftedLocation(aDist); + aFlyOutAttr->setValue(aFPnt); + } + + return true; +} + +bool SketchPlugin_ConstraintLength::computeLenghtValue(double& theValue) +{ + bool aResult = false; + std::shared_ptr aPoint1, aPoint2; + std::shared_ptr aStartPoint, anEndPoint; + if (getPoints(aPoint1, aPoint2, aStartPoint, anEndPoint)) { + theValue = aPoint1->distance(aPoint2); + aResult = true; } + return aResult; } bool SketchPlugin_ConstraintLength::getPoints( @@ -60,7 +140,6 @@ bool SketchPlugin_ConstraintLength::getPoints( { if (!sketch()) return false; - std::shared_ptr aPlane = sketch()->plane(); std::shared_ptr anAttr = std::dynamic_pointer_cast< ModelAPI_AttributeRefAttr>(data()->attribute(SketchPlugin_Constraint::ENTITY_A())); if (!anAttr) @@ -80,72 +159,54 @@ bool SketchPlugin_ConstraintLength::getPoints( AISObjectPtr SketchPlugin_ConstraintLength::getAISObject(AISObjectPtr thePrevious) { - std::shared_ptr aPoint1, aPoint2; - std::shared_ptr aStartPoint, anEndPoint; - if (!getPoints(aPoint1, aPoint2, aStartPoint, anEndPoint)) - return thePrevious; // not possible to show length because points are not defined + if (!sketch()) + return thePrevious; - std::shared_ptr aPlane = sketch()->plane(); - std::shared_ptr aFlyOutAttr = std::dynamic_pointer_cast< - GeomDataAPI_Point2D>(data()->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - std::shared_ptr aFlyoutPnt = std::shared_ptr(); - if (aFlyOutAttr->isInitialized()) { - aFlyoutPnt = sketch()->to3D(aFlyOutAttr->x(), aFlyOutAttr->y()); - } else { - std::shared_ptr aLine = - std::shared_ptr(new GeomAPI_Lin2d(aStartPoint->pnt(), anEndPoint->pnt())); - double aDist = aPoint1->distance(aPoint2)/5.; - std::shared_ptr aFPnt = aLine->shiftedLocation(aDist); - aFlyOutAttr->setValue(aFPnt); - aFlyoutPnt = sketch()->to3D(aFPnt->x(), aFPnt->y()); - } - // value calculation - // TODO: has to be calculated on definition of reference object - double aDistance = aPoint1->distance(aPoint2); - std::shared_ptr aValueAttr = std::dynamic_pointer_cast< - ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE())); - double aValue = aDistance; - if (aValueAttr->isInitialized()) - aValue = aValueAttr->value(); - else - aValueAttr->setValue(aValue); - // End TODO - - AISObjectPtr anAIS = thePrevious; - if (!anAIS) - anAIS = AISObjectPtr(new GeomAPI_AISObject); - anAIS->createDistance(aPoint1, aPoint2, aFlyoutPnt, aPlane, aValue); - - // Set color from preferences - std::vector aRGB = - Config_PropManager::color("Visualization", "length_color", LENGTH_COLOR); - anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]); + AISObjectPtr anAIS = SketcherPrs_Factory::lengthDimensionConstraint(this, + sketch(), thePrevious); + if (anAIS.get() && !thePrevious.get()) + SketchPlugin_Tools::setDimensionColor(anAIS); return anAIS; } -void SketchPlugin_ConstraintLength::move(double theDeltaX, double theDeltaY) -{ - std::shared_ptr aData = data(); - if (!aData->isValid()) - return; - - std::shared_ptr aPoint = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - aPoint->move(theDeltaX, theDeltaY); -} - void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) { - if (theID == SketchPlugin_Constraint::ENTITY_A()) + if (theID == SketchPlugin_Constraint::ENTITY_A()) { std::shared_ptr aValueAttr = std::dynamic_pointer_cast< - ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE())); - if (!aValueAttr->isInitialized()) { // only if it is not initialized, try to compute the current value - std::shared_ptr aPoint1, aPoint2; - std::shared_ptr aStartPoint, anEndPoint; - if (getPoints(aPoint1, aPoint2, aStartPoint, anEndPoint)) { - double aLength = aPoint1->distance(aPoint2); + ModelAPI_AttributeDouble>(attribute(SketchPlugin_Constraint::VALUE())); + if (!aValueAttr->isInitialized()) { + // only if it is not initialized, try to compute the current value + double aLength; + if (computeLenghtValue(aLength)) aValueAttr->setValue(aLength); - } } + } else if (theID == SketchPlugin_Constraint::FLYOUT_VALUE_PNT() && !myFlyoutUpdate) { + // Recalculate flyout point in local coordinates of the line: + // the X coordinate is a length of projection of the flyout point on the line + // the Y coordinate is a distance from the point to the line + std::shared_ptr aFlyoutAttr = + std::dynamic_pointer_cast( + attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); + AttributeRefAttrPtr aLineAttr = std::dynamic_pointer_cast( + attribute(SketchPlugin_Constraint::ENTITY_A())); + if (!aLineAttr || !aLineAttr->isObject()) + return; + FeaturePtr aLine = ModelAPI_Feature::feature(aLineAttr->object()); + if (!aLine || aLine->getKind() != SketchPlugin_Line::ID()) + return; + + std::shared_ptr aFlyoutPnt = aFlyoutAttr->pnt(); + std::shared_ptr aStartPnt = std::dynamic_pointer_cast( + aLine->attribute(SketchPlugin_Line::START_ID()))->pnt()->xy(); + std::shared_ptr aEndPnt = std::dynamic_pointer_cast( + aLine->attribute(SketchPlugin_Line::END_ID()))->pnt()->xy(); + + myFlyoutUpdate = true; + std::shared_ptr aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt))); + std::shared_ptr aFlyoutDir = aFlyoutPnt->xy()->decreased(aStartPnt); + double X = aFlyoutDir->dot(aLineDir->xy()); + double Y = -aFlyoutDir->cross(aLineDir->xy()); + aFlyoutAttr->setValue(X, Y); + myFlyoutUpdate = false; } }