X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_Line.cpp;h=c69b6019b66178402ed5428caee05798617e002a;hb=07101b8a602b93c59576a7ff63aa0abd1a076283;hp=ea5d0a42b1e57039053e2a7ff2c63b1d0b34d0c5;hpb=a8c1a5e336ad22edeffd153d37768b485f56cade;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Line.cpp b/src/SketchPlugin/SketchPlugin_Line.cpp index ea5d0a42b..c69b6019b 100644 --- a/src/SketchPlugin/SketchPlugin_Line.cpp +++ b/src/SketchPlugin/SketchPlugin_Line.cpp @@ -26,13 +26,11 @@ SketchPlugin_Line::SketchPlugin_Line() : SketchPlugin_SketchEntity() {} -void SketchPlugin_Line::initAttributes() +void SketchPlugin_Line::initDerivedClassAttributes() { - SketchPlugin_SketchEntity::initAttributes(); - - 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()); } @@ -100,12 +98,21 @@ 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().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 && !aSelection->isNull() && aSelection->isEdge()) { @@ -119,4 +126,3 @@ void SketchPlugin_Line::attributeChanged(const std::string& theID) { } } } -