X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Utils.h;h=0cf2364da527f89f0bc1dbe20e233307dd90a5be;hb=09d10e66ba0fac5353c8d1f138055fc6fe86fb65;hp=ab4a3503fe2447636b1ed52b670916de76699b57;hpb=28b09f8fc96218c317aa67805bb3fc0e296aedbd;p=modules%2Fhydro.git

diff --git a/src/HYDROCurveCreator/CurveCreator_Utils.h b/src/HYDROCurveCreator/CurveCreator_Utils.h
index ab4a3503..0cf2364d 100644
--- a/src/HYDROCurveCreator/CurveCreator_Utils.h
+++ b/src/HYDROCurveCreator/CurveCreator_Utils.h
@@ -72,6 +72,7 @@ public:
   /**
    * Find selected points in the context
    * \param theContext the viewer context
+   * \param theCurve a curve object, that contains data
    */
   CURVECREATOR_EXPORT static void getSelectedPoints( Handle(AIS_InteractiveContext) theContext,
                                          const CurveCreator_ICurve* theCurve,
@@ -80,6 +81,7 @@ public:
   /**
    * Set selected points to the context
    * \param theContext the viewer context
+   * \param theCurve a curve object, that contains data
    * \param thePoints the curve point indices to be selected in the context
    */
   CURVECREATOR_EXPORT static void setSelectedPoints(
@@ -90,30 +92,15 @@ public:
 
   /*!
    * \brief Sets the local point context for the 3D viewer.
+   * \param theCurve a curve object, that contains data
+   * \param theContext the viewer context
    * \param theOpen The flag to open or close the local context.
    */
   CURVECREATOR_EXPORT static void setLocalPointContext(
+                                        const CurveCreator_ICurve* theCurve,
                                         Handle(AIS_InteractiveContext) theContext,
                                         const bool theOpen );
 
-  /**
-   * Find the neighbour points by the clicked coordinates
-   * \param theContext the viewer context.
-   * \param theContext the V3D view.
-   * \param theX the X coordinate in the view.
-   * \param theY the Y coordinate in the view.
-   * \param thePoint the output point to be append to the model curve
-   * \param thePoint1 the output point to bound the line where a new point should be inserted
-   * \param thePoint2 the output point to bound the line where a new point should be inserted
-   */
-  CURVECREATOR_EXPORT static bool getNeighbourPoints(
-                                        Handle(AIS_InteractiveContext) theContext,
-                                        Handle(V3d_View) theView,
-                                        const int theX, const int theY,
-                                        gp_Pnt& thePoint, gp_Pnt& thePoint1,
-                                        gp_Pnt& thePoint2 );
-
-protected:
   /**
    * Checks whether the point belongs to the OCC object
    * \param theObject a line or shape with a bspline inside
@@ -129,6 +116,7 @@ protected:
                                                  gp_Pnt& thePoint, gp_Pnt& thePoint1,
                                                  gp_Pnt& thePoint2 );
 
+protected:
   /*
    * Returns whether the clicked point belong to the curve or has a very near projection
    * \param theX the X coordinate of a point clicked in the OCC viewer
@@ -140,8 +128,32 @@ protected:
                                                  Handle(V3d_View) theView,
                                                  const int theX, const int theY,
                                                  const Handle(Geom_Curve)& theCurve,
-                                                 Standard_Real& theParameter );
+                                                 Standard_Real& theParameter,
+                                                 int& theDelta );
+
+  /*
+   * Returns whether the X and Y coordinates is in the pixel tolerance
+   * \param theX the X coordinate of the first point
+   * \param theY the Y coordinate of the first point
+   * \param theOtherX the X coordinate of the second point
+   * \param theOtherY the Y coordinate of the second point
+   * \param theTolerance the tolerance to compare
+   * \param theDelta the sum of the a square of X and a square of Y
+   * \returns whether the points are provide to the pixel tolerance
+  */
+  CURVECREATOR_EXPORT static bool isEqualPixels( const int theX, const int theY,
+                                                 const int theOtherX, const int theOtherY,
+                                                 const double theTolerance, int& theDelta );
+
 
+  /*
+   * Returns whether the points are the same
+   * \param thePoint the first point
+   * \param theOtherPoint the second point
+   * \returns whether the points are provide to the pixel tolerance
+  */
+  CURVECREATOR_EXPORT static bool isEqualPoints( const gp_Pnt& thePoint,
+                                                 const gp_Pnt& theOtherPoint );
 };
 
 #endif // CURVECREATOR_UTILS_H