X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Line.cpp;h=23cbe266674cfd4cc376d113f1d9807341e8a32b;hb=6a9eb86984ff6892c0dd95700ee6f37e5235c10e;hp=50d8f438f5072358de6535d2d05472f8f110e230;hpb=7bf19255421b34594c7b0a76d0ce28166d0ce895;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Line.cpp b/src/SketchPlugin/SketchPlugin_Line.cpp index 50d8f438f..23cbe2666 100644 --- a/src/SketchPlugin/SketchPlugin_Line.cpp +++ b/src/SketchPlugin/SketchPlugin_Line.cpp @@ -1,14 +1,33 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_Line.cxx -// Created: 27 Mar 2014 -// Author: Mikhail PONIKAROV +// 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_Line.h" #include "SketchPlugin_Sketch.h" +#include "SketchPlugin_ConstraintCoincidence.h" + #include +#include #include #include +#include +#include #include #include @@ -19,17 +38,23 @@ #include #include -using namespace std; - SketchPlugin_Line::SketchPlugin_Line() - : SketchPlugin_Feature() + : SketchPlugin_SketchEntity() {} void SketchPlugin_Line::initAttributes() { - data()->addAttribute(START_ID(), GeomDataAPI_Point2D::type()); - data()->addAttribute(END_ID(), GeomDataAPI_Point2D::type()); - data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::type()); + SketchPlugin_SketchEntity::initAttributes(); + /// new attributes should be added to end of the feature in order to provide + /// correct attribute values in previous saved studies + data()->addAttribute(LENGTH_ID(), ModelAPI_AttributeDouble::typeId()); +} + +void SketchPlugin_Line::initDerivedClassAttributes() +{ + data()->addAttribute(START_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(END_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXTERNAL_ID()); } @@ -56,23 +81,37 @@ void SketchPlugin_Line::execute() aConstr->setShape(anEdge); aConstr->setIsInHistory(false); setResult(aConstr); + + static Events_ID anId = ModelAPI_EventReentrantMessage::eventId(); + std::shared_ptr aMessage = std::shared_ptr + (new ModelAPI_EventReentrantMessage(anId, this)); + aMessage->setCreatedFeature(ModelAPI_Feature::feature( + data()->attribute(START_ID())->owner())); + Events_Loop::loop()->send(aMessage); } } } -void SketchPlugin_Line::move(double theDeltaX, double theDeltaY) +std::string SketchPlugin_Line::processEvent(const std::shared_ptr& theMessage) { - std::shared_ptr aData = data(); - if (!aData->isValid()) - return; - - std::shared_ptr aPoint1 = std::dynamic_pointer_cast - (aData->attribute(START_ID())); - aPoint1->move(theDeltaX, theDeltaY); - - std::shared_ptr aPoint2 = std::dynamic_pointer_cast - (aData->attribute(END_ID())); - aPoint2->move(theDeltaX, theDeltaY); + std::string aFilledAttributeName; + + std::shared_ptr aReentrantMessage = + std::dynamic_pointer_cast(theMessage); + if (aReentrantMessage.get()) { + FeaturePtr aCreatedFeature = aReentrantMessage->createdFeature(); + + // Initialize new line with first point equal to end of previous + std::shared_ptr aSFData = aCreatedFeature->data(); + std::shared_ptr aSPoint = std::dynamic_pointer_cast( + aSFData->attribute(SketchPlugin_Line::END_ID())); + std::shared_ptr aNFData = data(); + std::shared_ptr aNPoint = std::dynamic_pointer_cast( + aNFData->attribute(SketchPlugin_Line::START_ID())); + aNPoint->setValue(aSPoint->x(), aSPoint->y()); + SketchPlugin_ConstraintCoincidence::createCoincidenceFeature(sketch(), aSPoint, aNPoint); + } + return aFilledAttributeName; } double SketchPlugin_Line::distanceToPoint(const std::shared_ptr& thePoint) @@ -80,9 +119,9 @@ double SketchPlugin_Line::distanceToPoint(const std::shared_ptr& double aDelta = 0; std::shared_ptr aData = data(); - std::shared_ptr aPoint1 = + std::shared_ptr aPoint1 = std::dynamic_pointer_cast(aData->attribute(START_ID())); - std::shared_ptr aPoint2 = + std::shared_ptr aPoint2 = std::dynamic_pointer_cast(aData->attribute(END_ID())); GeomAPI_Lin2d aLin2d(aPoint1->x(), aPoint1->y(), aPoint2->x(), aPoint2->y()); @@ -97,23 +136,53 @@ double SketchPlugin_Line::distanceToPoint(const std::shared_ptr& return aDelta; } +const std::string& SketchPlugin_Line::getKind() +{ + static std::string MY_KIND = SketchPlugin_Line::ID(); + return MY_KIND; +} + bool SketchPlugin_Line::isFixed() { - return data()->selection(EXTERNAL_ID())->context(); + return data()->selection(EXTERNAL_ID())->context().get() != NULL; } void SketchPlugin_Line::attributeChanged(const std::string& theID) { - if (theID == EXTERNAL_ID()) { + // the second condition for unability to move external segments anywhere + // isCopy() is checked temporary for case when copied lines stored external id state + // to be removed after debug + if ((theID == EXTERNAL_ID() || isFixed()) && !isCopy()) { std::shared_ptr aSelection = data()->selection(EXTERNAL_ID())->value(); - // update arguments due to the selection 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 aStartAttr = + std::shared_ptr aStartAttr = std::dynamic_pointer_cast(attribute(START_ID())); aStartAttr->setValue(sketch()->to2D(anEdge->firstPoint())); - std::shared_ptr anEndAttr = + std::shared_ptr anEndAttr = std::dynamic_pointer_cast(attribute(END_ID())); anEndAttr->setValue(sketch()->to2D(anEdge->lastPoint())); + updateLenghtValue(); } } + else if (theID == START_ID() || theID == END_ID()) { + updateLenghtValue(); + } } +void SketchPlugin_Line::updateLenghtValue() +{ + std::shared_ptr aStartAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(START_ID())); + std::shared_ptr anEndAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(END_ID())); + if (aStartAttr->isInitialized() && anEndAttr->isInitialized()) { + double aDistance = aStartAttr->pnt()->distance(anEndAttr->pnt()); + data()->real(LENGTH_ID())->setValue(aDistance); + } +}