X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Line.cpp;h=33d087d2c6d5aff70cd11cd44c739062cd2ecff3;hb=31352237d1ac0cd952200e11f23aa52beeb7482a;hp=83ee216593697877dd81eec97f23c76792bef900;hpb=4b116f1c2ff374e8c5cc5afe2b64eb1fe2a8abd3;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Line.cpp b/src/SketchPlugin/SketchPlugin_Line.cpp index 83ee21659..33d087d2c 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 @@ -7,6 +9,7 @@ #include #include #include +#include #include #include @@ -20,14 +23,14 @@ using namespace std; SketchPlugin_Line::SketchPlugin_Line() - : SketchPlugin_Feature() + : SketchPlugin_SketchEntity() {} -void SketchPlugin_Line::initAttributes() +void SketchPlugin_Line::initDerivedClassAttributes() { - data()->addAttribute(START_ID(), GeomDataAPI_Point2D::type()); - data()->addAttribute(END_ID(), GeomDataAPI_Point2D::type()); - data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::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()); } @@ -95,12 +98,19 @@ 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 + if (theID == EXTERNAL_ID() || isFixed()) { std::shared_ptr aSelection = data()->selection(EXTERNAL_ID())->value(); // update arguments due to the selection value if (aSelection && !aSelection->isNull() && aSelection->isEdge()) {