X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintLength.cpp;h=cfe1da52f31c811bdfdf8be32dbf34b47a3d0115;hb=86f4ec4eb5ff5f119914f3d44cf945b49845d8c2;hp=9a87f7f26c77d526ae4f33c9ad7a3663523476fb;hpb=6da8c412d0102f5997e2af9734edf23627daf937;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp index 9a87f7f26..cfe1da52f 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp @@ -1,19 +1,37 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_ConstraintLength.cpp -// Created: 30 May 2014 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2023 CEA, EDF +// +// 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 @@ -38,6 +56,10 @@ void SketchPlugin_ConstraintLength::initAttributes() 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, @@ -60,20 +82,16 @@ 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()); - - //std::shared_ptr aValueAttr = std::dynamic_pointer_cast< - // ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE())); - //if(!aValueAttr->isInitialized()) { - // aValueAttr->setValue(aLenght); - //} - - // 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()); + 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()); + } } } } @@ -91,9 +109,9 @@ bool SketchPlugin_ConstraintLength::compute(const std::string& theAttributeId) std::shared_ptr aFlyOutAttr = std::dynamic_pointer_cast< GeomDataAPI_Point2D>(data()->attribute(theAttributeId)); - std::shared_ptr aLine = + std::shared_ptr aLine = std::shared_ptr(new GeomAPI_Lin2d(aStartPoint->pnt(), anEndPoint->pnt())); - if (!aFlyOutAttr->isInitialized() || + if (!aFlyOutAttr->isInitialized() || (fabs(aFlyOutAttr->x()) < tolerance && fabs(aFlyOutAttr->y()) < tolerance)) { double aDist = aPoint1->distance(aPoint2)/5.; std::shared_ptr aFPnt = aLine->shiftedLocation(aDist); @@ -122,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) @@ -145,54 +162,25 @@ AISObjectPtr SketchPlugin_ConstraintLength::getAISObject(AISObjectPtr thePreviou if (!sketch()) return thePrevious; - AISObjectPtr anAIS = SketcherPrs_Factory::lengthDimensionConstraint(this, sketch()->coordinatePlane(), - thePrevious); + 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; - - 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; - - // Recalculate a shift of flyout point in terms of local coordinates - std::shared_ptr aDir(new GeomAPI_XY(theDeltaX, theDeltaY)); - 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(); - std::shared_ptr aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt))); - double dX = aDir->dot(aLineDir->xy()); - double dY = -aDir->cross(aLineDir->xy()); - - myFlyoutUpdate = true; - std::shared_ptr aPoint = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - aPoint->setValue(aPoint->x() + dX, aPoint->y() + dY); - myFlyoutUpdate = false; -} - 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>(attribute(SketchPlugin_Constraint::VALUE())); - if (!aValueAttr->isInitialized()) { // only if it is not initialized, try to compute the current 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) { - myFlyoutUpdate = true; // 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 @@ -213,6 +201,7 @@ void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) { 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());