X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Point.cpp;h=74860bb6290c7e4384ac8bc546b1bd9fa53b18ce;hb=e6aea428c7da7751e753eac36b99e16b7e3166e4;hp=fa77d2494eb1366507d2ab213a35342f81da56cb;hpb=7ecefe4ca74618ab6fc2e7990b6ad50c12bca63c;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_Point.cpp b/src/SketchPlugin/SketchPlugin_Point.cpp
index fa77d2494..74860bb62 100644
--- a/src/SketchPlugin/SketchPlugin_Point.cpp
+++ b/src/SketchPlugin/SketchPlugin_Point.cpp
@@ -4,16 +4,16 @@
 
 #include "SketchPlugin_Point.h"
 #include "SketchPlugin_Sketch.h"
+
 #include <ModelAPI_Data.h>
-////#include <GeomAPI_Pnt.h>
-////#include <GeomAlgoAPI_EdgeBuilder.h>
+
+#include <GeomAPI_Pnt2d.h>
+
 #include <GeomDataAPI_Point2D.h>
+#include <GeomAlgoAPI_PointBuilder.h>
 
 using namespace std;
 
-////// face of the square-face displayed for selection of general plane
-////const double PLANE_SIZE = 200;
-
 SketchPlugin_Point::SketchPlugin_Point()
 {
 }
@@ -30,13 +30,34 @@ void SketchPlugin_Point::execute()
 const boost::shared_ptr<GeomAPI_Shape>& SketchPlugin_Point::preview()
 {
   SketchPlugin_Sketch* aSketch = sketch();
-  // compute a point in 3D view
-  boost::shared_ptr<GeomDataAPI_Point2D> aPoint = 
-    boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(data()->attribute(POINT_ATTR_COORD));
-  boost::shared_ptr<GeomAPI_Pnt> aPoint3D(aSketch->to3D(aPoint->x(), aPoint->y()));
-  // make a visible point
-  //boost::shared_ptr<GeomAPI_Shape> anEdge = GeomAlgoAPI_EdgeBuilder::line(aStart, anEnd);
-  //setPreview(anEdge);
-
+  if (aSketch) {
+    // compute a point in 3D view
+    boost::shared_ptr<GeomDataAPI_Point2D> aPoint = 
+      boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(data()->attribute(POINT_ATTR_COORD));
+    boost::shared_ptr<GeomAPI_Pnt> aPoint3D(aSketch->to3D(aPoint->x(), aPoint->y()));
+    // make a visible point
+    boost::shared_ptr<GeomAPI_Shape> aPointShape = GeomAlgoAPI_PointBuilder::point(aPoint3D);
+    setPreview(aPointShape);
+  }
   return getPreview();
 }
+
+void SketchPlugin_Point::move(double theDeltaX, double theDeltaY)
+{
+  boost::shared_ptr<ModelAPI_Data> aData = data();
+  if (!aData->isValid())
+    return;
+
+  boost::shared_ptr<GeomDataAPI_Point2D> aPoint1 =
+        boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(aData->attribute(POINT_ATTR_COORD));
+  aPoint1->setValue(aPoint1->x() + theDeltaX, aPoint1->y() + theDeltaY);
+}
+
+double SketchPlugin_Point::distanceToPoint(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint)
+{
+  boost::shared_ptr<ModelAPI_Data> aData = data();
+  boost::shared_ptr<GeomDataAPI_Point2D> aPoint =
+        boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(aData->attribute(POINT_ATTR_COORD));
+
+  return aPoint->pnt()->distance(thePoint);
+}