X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Point.cpp;h=cf718db760dd812324db95cf16a10a297494b29b;hb=64fc7e4fdd63997ec7a502b233ef5f88186d5bbb;hp=036fde19db093340f6a632a0b73b2f860e7e26a7;hpb=a8c1a5e336ad22edeffd153d37768b485f56cade;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Point.cpp b/src/SketchPlugin/SketchPlugin_Point.cpp index 036fde19d..cf718db76 100644 --- a/src/SketchPlugin/SketchPlugin_Point.cpp +++ b/src/SketchPlugin/SketchPlugin_Point.cpp @@ -29,8 +29,8 @@ void SketchPlugin_Point::initAttributes() { SketchPlugin_SketchEntity::initAttributes(); - data()->addAttribute(SketchPlugin_Point::COORD_ID(), GeomDataAPI_Point2D::type()); - data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::type()); + data()->addAttribute(SketchPlugin_Point::COORD_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXTERNAL_ID()); } @@ -63,21 +63,13 @@ void SketchPlugin_Point::move(double theDeltaX, double theDeltaY) aPoint1->move(theDeltaX, theDeltaY); } -double SketchPlugin_Point::distanceToPoint(const std::shared_ptr& thePoint) -{ - std::shared_ptr aData = data(); - std::shared_ptr aPoint = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Point::COORD_ID())); - - return aPoint->pnt()->distance(thePoint); -} - bool SketchPlugin_Point::isFixed() { return data()->selection(EXTERNAL_ID())->context().get() != NULL; } void SketchPlugin_Point::attributeChanged(const std::string& theID) { - if (theID == EXTERNAL_ID()) { + // the second condition for unability to move external point 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->isVertex()) {