X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintRadius.cpp;h=2acbc1ce6989f13e112df4dc11611282ad471ddc;hb=ce72dd01645885d720b731795d676e2feeabc8d6;hp=af53efa5d5424e0ba4a0ebfce0cd607c9cdd2f66;hpb=c7ed89ce495c3b8ef952f4afd45da259618d80ca;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintRadius.cpp b/src/SketchPlugin/SketchPlugin_ConstraintRadius.cpp index af53efa5d..2acbc1ce6 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintRadius.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintRadius.cpp @@ -1,32 +1,54 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_ConstraintRadius.cpp -// Created: 26 May 2014 -// Author: Artem ZHIDKOV +// 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 "SketchPlugin_ConstraintRadius.h" #include #include #include +#include #include +#include #include +#include #include +#include +#include #include #include #include #include +#include #include #include #include #include +const double tolerance = 1.e-7; + SketchPlugin_ConstraintRadius::SketchPlugin_ConstraintRadius() { + myFlyoutUpdate = false; } void SketchPlugin_ConstraintRadius::initAttributes() @@ -34,6 +56,18 @@ void SketchPlugin_ConstraintRadius::initAttributes() data()->addAttribute(SketchPlugin_Constraint::VALUE(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId()); data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::typeId()); + + data()->addAttribute(SketchPlugin_ConstraintRadius::LOCATION_TYPE_ID(), + ModelAPI_AttributeInteger::typeId()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), LOCATION_TYPE_ID()); +} + +void SketchPlugin_ConstraintRadius::colorConfigInfo(std::string& theSection, std::string& theName, + std::string& theDefault) +{ + theSection = "Visualization"; + theName = "sketch_dimension_color"; + theDefault = SKETCH_DIMENSION_COLOR; } void SketchPlugin_ConstraintRadius::execute() @@ -42,28 +76,8 @@ void SketchPlugin_ConstraintRadius::execute() ModelAPI_AttributeRefAttr>(data()->attribute(SketchPlugin_Constraint::ENTITY_A())); FeaturePtr aFeature = ModelAPI_Feature::feature(aRef->object()); if (aFeature) { - double aRadius = 0; - std::shared_ptr aData = aFeature->data(); - if (aFeature->getKind() == SketchPlugin_Circle::ID()) { - AttributeDoublePtr anAttribute = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Circle::RADIUS_ID())); - if (anAttribute) - aRadius = anAttribute->value(); - } else if (aFeature->getKind() == SketchPlugin_Arc::ID()) { - std::shared_ptr aCenterAttr = std::dynamic_pointer_cast< - GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Arc::CENTER_ID())); - std::shared_ptr aStartAttr = std::dynamic_pointer_cast< - GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Arc::START_ID())); - if (aCenterAttr && aStartAttr) - aRadius = aCenterAttr->pnt()->distance(aStartAttr->pnt()); - } - //std::shared_ptr aValueAttr = std::dynamic_pointer_cast< - // ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE())); - //if(!aValueAttr->isInitialized()) { - // aValueAttr->setValue(aRadius); - //} - - // the value should to be computed here, not in the getAISObject in order to change the model value + // 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 std::shared_ptr aFlyoutAttr = std::dynamic_pointer_cast< @@ -88,16 +102,17 @@ bool SketchPlugin_ConstraintRadius::compute(const std::string& theAttributeId) GeomDataAPI_Point2D>(data()->attribute(theAttributeId)); // Prepare a circle if (aCyrcFeature->getKind() == SketchPlugin_Circle::ID()) { // circle - std::shared_ptr aCenterAttr = std::dynamic_pointer_cast( + std::shared_ptr aCenterAttr = + std::dynamic_pointer_cast( aCyrcFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID())); double aShift = aRadius * 1.1; std::shared_ptr aPnt = aCenterAttr->pnt(); - std::shared_ptr aFPnt = + std::shared_ptr aFPnt = std::shared_ptr(new GeomAPI_Pnt2d(aPnt->x() + aShift, aPnt->y() + aShift)); aFlyoutAttr->setValue(aFPnt); } else { // arc std::shared_ptr aStartAttr = std::dynamic_pointer_cast< - GeomDataAPI_Point2D>(aCyrcFeature->data()->attribute(SketchPlugin_Arc::START_ID())); + GeomDataAPI_Point2D>(aCyrcFeature->data()->attribute(SketchPlugin_Arc::START_ID())); aFlyoutAttr->setValue(aStartAttr->pnt()); } return true; @@ -140,66 +155,60 @@ AISObjectPtr SketchPlugin_ConstraintRadius::getAISObject(AISObjectPtr thePreviou if (!sketch()) return thePrevious; - AISObjectPtr anAIS = thePrevious; - if (!anAIS) { - anAIS = SketcherPrs_Factory::radiusConstraint(this, sketch()->coordinatePlane()); - } - - // Set color from preferences - std::vector aRGB = Config_PropManager::color("Visualization", "sketch_dimension_color", - SKETCH_DIMENSION_COLOR); - anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]); + AISObjectPtr anAIS = SketcherPrs_Factory::radiusConstraint(this, sketch(), + thePrevious); + if (anAIS.get() && !thePrevious.get()) + SketchPlugin_Tools::setDimensionColor(anAIS); return anAIS; } -void SketchPlugin_ConstraintRadius::move(double theDeltaX, double theDeltaY) -{ - std::shared_ptr aData = data(); - if (!aData->isValid()) - return; - - std::shared_ptr aRef = std::dynamic_pointer_cast< - ModelAPI_AttributeRefAttr>(data()->attribute(SketchPlugin_Constraint::ENTITY_A())); - FeaturePtr aFeature = ModelAPI_Feature::feature(aRef->object()); - if (!aFeature) - return; - std::string aCenterAttrName; - if (aFeature->getKind() == SketchPlugin_Circle::ID()) - aCenterAttrName = SketchPlugin_Circle::CENTER_ID(); - else if (aFeature->getKind() == SketchPlugin_Arc::ID()) - aCenterAttrName = SketchPlugin_Arc::CENTER_ID(); - std::shared_ptr aCenterAttr = std::dynamic_pointer_cast< - GeomDataAPI_Point2D>(aFeature->data()->attribute(aCenterAttrName)); - std::shared_ptr aCenter = aCenterAttr->pnt(); - - // The specified delta applied on the circle curve, - // so it will be scaled due to distance between flyout and center points - std::shared_ptr aFlyoutAttr = std::dynamic_pointer_cast< - GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - std::shared_ptr aFlyout = aFlyoutAttr->pnt(); - - std::shared_ptr aRadius = std::dynamic_pointer_cast< - ModelAPI_AttributeDouble>(aData->attribute(SketchPlugin_Constraint::VALUE())); - double aScale = aFlyout->distance(aCenter) / aRadius->value(); - - std::shared_ptr aCircle(new GeomAPI_Circ2d(aCenter, aFlyout)); - aFlyout->setX(aFlyout->x() + aScale * theDeltaX); - aFlyout->setY(aFlyout->y() + aScale * theDeltaY); - aFlyout = aCircle->project(aFlyout); - - aFlyoutAttr->setValue(aFlyout->x(), aFlyout->y()); -} - void SketchPlugin_ConstraintRadius::attributeChanged(const std::string& theID) { 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 + if (!aValueAttr->isInitialized()) { + // only if it is not initialized, try to compute the current value std::shared_ptr aCyrcFeature; double aRadius = circleRadius(aCyrcFeature); if (aRadius > 0) { // set as value the radius of updated reference to another circle aValueAttr->setValue(aRadius); } } + } else if (theID == SketchPlugin_Constraint::FLYOUT_VALUE_PNT() && !myFlyoutUpdate) { + // Recalculate flyout point in local coordinates of the circle (or arc): + // coordinates are calculated according to center of the shape + std::shared_ptr aFlyoutAttr = + std::dynamic_pointer_cast( + attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); + + AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast( + attribute(SketchPlugin_Constraint::ENTITY_A())); + if (!aRefAttr || !aRefAttr->isObject()) + return; + FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr->object()); + if (!aFeature || (aFeature->getKind() != SketchPlugin_Arc::ID() && + aFeature->getKind() != SketchPlugin_Circle::ID())) + return; + + std::string aCenterAttrName; + if (aFeature->getKind() == SketchPlugin_Circle::ID()) + aCenterAttrName = SketchPlugin_Circle::CENTER_ID(); + else if (aFeature->getKind() == SketchPlugin_Arc::ID()) + aCenterAttrName = SketchPlugin_Arc::CENTER_ID(); + std::shared_ptr aCenterAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(aFeature->data()->attribute(aCenterAttrName)); + std::shared_ptr aCenter = aCenterAttr->pnt(); + std::shared_ptr aRadius = std::dynamic_pointer_cast< + ModelAPI_AttributeDouble>(attribute(SketchPlugin_Constraint::VALUE())); + + std::shared_ptr aFlyoutPnt = aFlyoutAttr->pnt(); + double aDist = aFlyoutPnt->distance(aCenter); + if (aDist < tolerance) + return; + + myFlyoutUpdate = true; + std::shared_ptr aFlyoutDir = aFlyoutPnt->xy()->decreased(aCenter->xy()); + aFlyoutAttr->setValue(aFlyoutDir->x(), aFlyoutDir->y()); + myFlyoutUpdate = false; } }