X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Line.cpp;h=782f99a2472346eed9e2e785846da018e28853ca;hb=07889bdf129940bf25021b91aa58902e634a64ce;hp=63577ef08b4605525090f6ce1e6e7641c17d0dc7;hpb=036ba4eb4c2df048fd651a54f68882a01769eb08;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Line.cpp b/src/SketchPlugin/SketchPlugin_Line.cpp index 63577ef08..782f99a24 100644 --- a/src/SketchPlugin/SketchPlugin_Line.cpp +++ b/src/SketchPlugin/SketchPlugin_Line.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + // File: SketchPlugin_Line.cxx // Created: 27 Mar 2014 // Author: Mikhail PONIKAROV @@ -6,6 +8,11 @@ #include "SketchPlugin_Sketch.h" #include #include +#include +#include +#include +#include +#include #include #include @@ -16,39 +23,48 @@ using namespace std; -// face of the square-face displayed for selection of general plane -const double PLANE_SIZE = 200; - SketchPlugin_Line::SketchPlugin_Line() - : SketchPlugin_Feature() + : SketchPlugin_SketchEntity() +{} + +void SketchPlugin_Line::initAttributes() { + 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::initAttributes() +void SketchPlugin_Line::initDerivedClassAttributes() { - data()->addAttribute(SketchPlugin_Line::START_ID(), GeomDataAPI_Point2D::type()); - data()->addAttribute(SketchPlugin_Line::END_ID(), GeomDataAPI_Point2D::type()); + 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()); } -void SketchPlugin_Line::execute() +void SketchPlugin_Line::execute() { SketchPlugin_Sketch* aSketch = sketch(); if (aSketch) { // compute a start point in 3D view - boost::shared_ptr aStartAttr = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Line::START_ID())); + std::shared_ptr aStartAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(START_ID())); // compute an end point in 3D view - boost::shared_ptr anEndAttr = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Line::END_ID())); + std::shared_ptr anEndAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(END_ID())); if (aStartAttr->isInitialized() && anEndAttr->isInitialized()) { - boost::shared_ptr aStart(aSketch->to3D(aStartAttr->x(), aStartAttr->y())); - boost::shared_ptr anEnd(aSketch->to3D(anEndAttr->x(), anEndAttr->y())); + std::shared_ptr aStart(aSketch->to3D(aStartAttr->x(), aStartAttr->y())); + std::shared_ptr anEnd(aSketch->to3D(anEndAttr->x(), anEndAttr->y())); + //std::cout<<"Execute line "<x()<<" "<y()<<" "<z()<<" - " + // <x()<<" "<y()<<" "<z()< anEdge = GeomAlgoAPI_EdgeBuilder::line(aStart, anEnd); + std::shared_ptr anEdge = GeomAlgoAPI_EdgeBuilder::line(aStart, anEnd); // store the result - boost::shared_ptr aConstr = - document()->createConstruction(data()); + std::shared_ptr aConstr = document()->createConstruction( + data()); aConstr->setShape(anEdge); + aConstr->setIsInHistory(false); setResult(aConstr); } } @@ -56,38 +72,88 @@ void SketchPlugin_Line::execute() void SketchPlugin_Line::move(double theDeltaX, double theDeltaY) { - boost::shared_ptr aData = data(); + std::shared_ptr aData = data(); if (!aData->isValid()) return; - boost::shared_ptr aPoint1 = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Line::START_ID())); - aPoint1->setValue(aPoint1->x() + theDeltaX, aPoint1->y() + theDeltaY); + std::shared_ptr aPoint1 = std::dynamic_pointer_cast + (aData->attribute(START_ID())); + aPoint1->move(theDeltaX, theDeltaY); - boost::shared_ptr aPoint2 = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Line::END_ID())); - aPoint2->setValue(aPoint2->x() + theDeltaX, aPoint2->y() + theDeltaY); + std::shared_ptr aPoint2 = std::dynamic_pointer_cast + (aData->attribute(END_ID())); + aPoint2->move(theDeltaX, theDeltaY); } -double SketchPlugin_Line::distanceToPoint(const boost::shared_ptr& thePoint) +double SketchPlugin_Line::distanceToPoint(const std::shared_ptr& thePoint) { double aDelta = 0; - boost::shared_ptr aData = data(); - boost::shared_ptr aPoint1 = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Line::START_ID())); - boost::shared_ptr aPoint2 = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Line::END_ID())); + std::shared_ptr aData = data(); + std::shared_ptr aPoint1 = + std::dynamic_pointer_cast(aData->attribute(START_ID())); + std::shared_ptr aPoint2 = + std::dynamic_pointer_cast(aData->attribute(END_ID())); GeomAPI_Lin2d aLin2d(aPoint1->x(), aPoint1->y(), aPoint2->x(), aPoint2->y()); - if (false/*projection*/) { // TODO: if it has not been necessary, remove this block - boost::shared_ptr aResult = aLin2d.project(thePoint); + if (false/*projection*/) { // TODO: if it has not been necessary, remove this block + std::shared_ptr aResult = aLin2d.project(thePoint); aDelta = aResult->distance(thePoint); - } - else { // distance + } else { // distance aDelta = aLin2d.distance(thePoint); } 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().get() != NULL; +} + +void SketchPlugin_Line::attributeChanged(const std::string& theID) { + // 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(); + 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::dynamic_pointer_cast(attribute(START_ID())); + aStartAttr->setValue(sketch()->to2D(anEdge->firstPoint())); + 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); + } +}