X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Circle.cpp;h=0975e57e43db79f00e2bde9e7f1bc3a8b6fda85b;hb=0c54e2dea1ee3052eda2e551bfb9108f97183f90;hp=9d2cda07ba75f07aca6484a297c04332382a88e5;hpb=6b437d84d92c29ba8c2c843735fa2feb4f0664c7;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Circle.cpp b/src/SketchPlugin/SketchPlugin_Circle.cpp index 9d2cda07b..0975e57e4 100644 --- a/src/SketchPlugin/SketchPlugin_Circle.cpp +++ b/src/SketchPlugin/SketchPlugin_Circle.cpp @@ -1,96 +1,123 @@ -// File: SketchPlugin_Circle.cpp -// Created: 26 May 2014 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2017 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_Circle.h" #include "SketchPlugin_Sketch.h" #include +#include +#include +#include +#include +#include +#include #include - +#include +#include +#include +#include #include #include - #include #include #include -#include +#include + +const double tolerance = 1e-7; + SketchPlugin_Circle::SketchPlugin_Circle() - : SketchPlugin_Feature() +: SketchPlugin_SketchEntity() { } -void SketchPlugin_Circle::initAttributes() +void SketchPlugin_Circle::initDerivedClassAttributes() { - data()->addAttribute(CIRCLE_ATTR_CENTER, GeomDataAPI_Point2D::type()); - data()->addAttribute(CIRCLE_ATTR_RADIUS, ModelAPI_AttributeDouble::type()); -} + data()->addAttribute(CENTER_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(RADIUS_ID(), ModelAPI_AttributeDouble::typeId()); -void SketchPlugin_Circle::execute() -{ + data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId()); + ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXTERNAL_ID()); } -const boost::shared_ptr& SketchPlugin_Circle::preview() +void SketchPlugin_Circle::execute() { SketchPlugin_Sketch* aSketch = sketch(); - if (aSketch) { - std::list > aShapes; - - // compute a circle point in 3D view - boost::shared_ptr aCenterAttr = - boost::dynamic_pointer_cast(data()->attribute(CIRCLE_ATTR_CENTER)); - if (aCenterAttr->isInitialized()) { - boost::shared_ptr aCenter(aSketch->to3D(aCenterAttr->x(), aCenterAttr->y())); - // make a visible point - boost::shared_ptr aCenterPointShape = GeomAlgoAPI_PointBuilder::point(aCenter); - aShapes.push_back(aCenterPointShape); - - // make a visible circle - boost::shared_ptr aNDir = - boost::dynamic_pointer_cast(aSketch->data()->attribute(SKETCH_ATTR_NORM)); - bool aHasPlane = aNDir && !(aNDir->x() == 0 && aNDir->y() == 0 && aNDir->z() == 0); - if (aHasPlane) { - boost::shared_ptr aNormal(new GeomAPI_Dir(aNDir->x(), aNDir->y(), aNDir->z())); - // compute the circle radius - AttributeDoublePtr aRadiusAttr = - boost::dynamic_pointer_cast(data()->attribute(CIRCLE_ATTR_RADIUS)); - double aRadius = aRadiusAttr->value(); - - boost::shared_ptr aCircleShape = - GeomAlgoAPI_EdgeBuilder::lineCircle(aCenter, aNormal, aRadius); - aShapes.push_back(aCircleShape); - } - } - boost::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aShapes); - setPreview(aCompound); + if(!aSketch) { + return; } - return getPreview(); -} -boost::shared_ptr SketchPlugin_Circle::getAISObject( - boost::shared_ptr thePrevious) -{ - return prepareAISShape(thePrevious); -} + // Compute a circle in 3D view. + std::shared_ptr aCenterAttr = + std::dynamic_pointer_cast(data()->attribute(CENTER_ID())); + AttributeDoublePtr aRadiusAttr = real(RADIUS_ID()); + if(!aCenterAttr->isInitialized() || !aRadiusAttr->isInitialized()) { + return; + } -void SketchPlugin_Circle::move(double theDeltaX, double theDeltaY) -{ - boost::shared_ptr aData = data(); - if (!aData->isValid()) + double aRadius = aRadiusAttr->value(); + if(aRadius < tolerance) { return; + } + + // Make a visible point. + SketchPlugin_Sketch::createPoint2DResult(this, sketch(), CENTER_ID(), 0); + + // Make a visible circle. + std::shared_ptr aCenter(aSketch->to3D(aCenterAttr->x(), aCenterAttr->y())); + std::shared_ptr aNDir = std::dynamic_pointer_cast( + aSketch->data()->attribute(SketchPlugin_Sketch::NORM_ID())); + std::shared_ptr aNormal(new GeomAPI_Dir(aNDir->x(), aNDir->y(), aNDir->z())); - boost::shared_ptr aPoint1 = - boost::dynamic_pointer_cast(aData->attribute(CIRCLE_ATTR_CENTER)); - aPoint1->setValue(aPoint1->x() + theDeltaX, aPoint1->y() + theDeltaY); + std::shared_ptr aCircleShape = + GeomAlgoAPI_EdgeBuilder::lineCircle(aCenter, aNormal, aRadius); + + std::shared_ptr aResult = document()->createConstruction(data(), 1); + aResult->setShape(aCircleShape); + aResult->setIsInHistory(false); + setResult(aResult, 1); } -double SketchPlugin_Circle::distanceToPoint(const boost::shared_ptr& thePoint) -{ - boost::shared_ptr aData = data(); - boost::shared_ptr aPoint = - boost::dynamic_pointer_cast(aData->attribute(CIRCLE_ATTR_CENTER)); +bool SketchPlugin_Circle::isFixed() { + return data()->selection(EXTERNAL_ID())->context().get() != NULL; +} - return aPoint->pnt()->distance(thePoint); +void SketchPlugin_Circle::attributeChanged(const std::string& theID) { + // the second condition for unability to move external segments anywhere + if (theID == EXTERNAL_ID() || isFixed()) { + std::shared_ptr aSelection = data()->selection(EXTERNAL_ID())->value(); + if (!aSelection) { + // empty shape in selection shows that the shape is equal to context + ResultPtr anExtRes = selection(EXTERNAL_ID())->context(); + if (anExtRes) + aSelection = anExtRes->shape(); + } + // update arguments due to the selection value + if (aSelection && !aSelection->isNull() && aSelection->isEdge()) { + std::shared_ptr anEdge( new GeomAPI_Edge(aSelection)); + std::shared_ptr aCirc = anEdge->circle(); + std::shared_ptr aCenterAttr = + std::dynamic_pointer_cast(attribute(CENTER_ID())); + aCenterAttr->setValue(sketch()->to2D(aCirc->center())); + real(RADIUS_ID())->setValue(aCirc->radius()); + } + } }