X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Line.cpp;h=f4382e4314af3983bc7a57310c8228aa4a2128f2;hb=74e9ba33303efc2282db1261706e904efa36b255;hp=e31dfb59d02c13fc80236d88bfcdb8d81257a932;hpb=38afbd899a8645c83e17f2c24a17a2b7414911b4;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Line.cpp b/src/SketchPlugin/SketchPlugin_Line.cpp index e31dfb59d..f4382e431 100644 --- a/src/SketchPlugin/SketchPlugin_Line.cpp +++ b/src/SketchPlugin/SketchPlugin_Line.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -22,14 +23,16 @@ 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(); + + 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()); } @@ -97,12 +100,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()) {