X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Utils.cxx;h=7be2d6b379927d604455637c003b95cf18f3bb6d;hb=4e1b53167581be7e084a3d71c075507bc6699c06;hp=529115262e5d2cf02bee3330e80eb5f458dd926b;hpb=a669e7b51b24e2e6ba94412fc5efabec364cdecb;p=modules%2Fhydro.git

diff --git a/src/HYDROCurveCreator/CurveCreator_Utils.cxx b/src/HYDROCurveCreator/CurveCreator_Utils.cxx
index 52911526..7be2d6b3 100644
--- a/src/HYDROCurveCreator/CurveCreator_Utils.cxx
+++ b/src/HYDROCurveCreator/CurveCreator_Utils.cxx
@@ -56,6 +56,8 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 
 #include <TColgp_HArray1OfPnt.hxx>
+#include <TColStd_HArray1OfBoolean.hxx>
+#include <TColgp_Array1OfVec.hxx>
 #include <GeomAPI_Interpolate.hxx>
 
 #include <ProjLib.hxx>
@@ -87,7 +89,48 @@ void CurveCreator_Utils::ConvertPointToClick( const gp_Pnt& thePoint,
 //=======================================================================
 gp_Pnt CurveCreator_Utils::ConvertClickToPoint( int x, int y, Handle(V3d_View) aView )
 {
-  return GEOMUtils::ConvertClickToPoint( x, y, aView );
+  // the 3D point, that is a projection of the pixels to the XYZ view plane
+  //return GEOMUtils::ConvertClickToPoint( x, y, aView );
+
+  // we need the projection to the XOY plane
+  // 1. find a point in the plane of the eye and the normal to the plane
+  Standard_Real X, Y, Z;
+  Quantity_Parameter Vx, Vy, Vz;
+  aView->ConvertWithProj( x, y, X, Y, Z, Vx, Vy, Vz );
+
+  // 2. build a ray from the point by the normal to the XOY plane and intersect it
+  // The ray equation is the following : p(x,y,z) = p0(x,y,z) + t*V(x,y,z)
+  // X,Y,Z - defines p0(x,y,z), Vx,Vy,Vz - defines V(x,y,z)
+  // p(x,y,z) - is a searched point, t - should to be calculated by the condition of XOY plane
+  // The system of equations is the following:
+  // p(x) = p0(x)+t*V(x)
+  // p(y) = p0(y)+t*V(y)
+  // p(z) = p0(z)+t*V(z)
+  // p(z) = 0
+
+  Standard_Real aXp, aYp, aZp;
+  //It is not possible to use Precision::Confusion(), because it is e-0.8, but V is sometimes e-6
+  Standard_Real aPrec = LOCAL_SELECTION_TOLERANCE;
+  if ( fabs( Vz ) > aPrec ) {
+    Standard_Real aT = -Z/Vz;
+    aXp = X + aT*Vx;
+    aYp = Y + aT*Vy;
+    aZp = Z + aT*Vz;
+  }
+  else { // Vz = 0 - the eyed plane is orthogonal to Z plane - XOZ, or YOZ
+    aXp = aYp = aZp = 0;
+    if ( fabs( Vy ) < aPrec ) // Vy = 0 - the YOZ plane
+      aYp = Y;
+    else if ( fabs( Vx ) < aPrec ) // Vx = 0 - the XOZ plane
+      aXp = X;
+  }
+  /*std::cout << "ConvertClickToPoint: " << std::endl
+            << "XYZ1 = (" << X << ", " << Y << ", " << Z << "); " << std::endl
+            << "Vxyz = (" << Vx << ", " << Vy << ", " << Vz << "); " << std::endl
+            << "Resp = (" << aXp << ", " << aYp << ", " << aZp << "); " << std::endl;*/
+
+  gp_Pnt ResultPoint( aXp, aYp, aZp );
+  return ResultPoint;
 }
 
 void CurveCreator_Utils::constructShape( const CurveCreator_ICurve* theCurve,
@@ -130,7 +173,10 @@ void CurveCreator_Utils::constructShape( const CurveCreator_ICurve* theCurve,
       aBuilder.Add( aComp, aVertex );
     }
     else if ( aNbPoints > 1 ) {
-      Handle(TColgp_HArray1OfPnt) aHCurvePoints = new TColgp_HArray1OfPnt (1, aNbPoints);
+      Handle(TColgp_HArray1OfPnt) aHCurvePoints = new TColgp_HArray1OfPnt(1, aNbPoints);
+      TColgp_Array1OfVec aTangents(1, aNbPoints);
+      Handle(TColStd_HArray1OfBoolean) aTangentFlags = new TColStd_HArray1OfBoolean(1, aNbPoints);
+      gp_Vec aNullVec(0, 0, 0);
 
       TopoDS_Edge aPointEdge;
       TopoDS_Vertex aVertex;
@@ -141,18 +187,29 @@ void CurveCreator_Utils::constructShape( const CurveCreator_ICurve* theCurve,
       int aHIndex = 1;
       aVertex = BRepBuilderAPI_MakeVertex( aPoint ).Vertex();
       aBuilder.Add( aComp, aVertex );
-      aHCurvePoints->SetValue(aHIndex++, aPoint);
+      if ( !isPolyline ) {
+        aHCurvePoints->SetValue( aHIndex, aPoint );
+        aTangents.SetValue( aHIndex, aNullVec );
+        aTangentFlags->SetValue( aHIndex, Standard_False );
+        aHIndex++;
+      }
+
       aPrevPoint = aPoint;
       aPointIt++;
       for( ; aPointIt != aPointLast; aPointIt++ ) {
         aPoint = *aPointIt;
         aVertex = BRepBuilderAPI_MakeVertex( aPoint ).Vertex();
         aBuilder.Add( aComp, aVertex );
-        aHCurvePoints->SetValue(aHIndex++, aPoint);
         if ( isPolyline ) {
           TopoDS_Edge aPointEdge = BRepBuilderAPI_MakeEdge( aPrevPoint, aPoint ).Edge();
           aBuilder.Add( aComp, aPointEdge );
         }
+        else {
+          aHCurvePoints->SetValue( aHIndex, aPoint );
+          aTangents.SetValue( aHIndex, aNullVec );
+          aTangentFlags->SetValue( aHIndex, Standard_False );
+          aHIndex++;
+        }
         aPrevPoint = aPoint;
       }
       if( aSectIsClosed && ( aNbPoints > 2 ) ) {
@@ -168,6 +225,14 @@ void CurveCreator_Utils::constructShape( const CurveCreator_ICurve* theCurve,
         // compute BSpline
         Handle(Geom_BSplineCurve) aBSplineCurve;
         GeomAPI_Interpolate aGBC(aHCurvePoints, aSectIsClosed, gp::Resolution());
+        // correct the spline degree to be as 3 for non-periodic spline if number of points
+        // less than 3. It is need to have a knot in each spline point. This knots are used
+        // to found a neighbour points when a new point is inserted between two existing.
+        if (!aSectIsClosed ) {
+          if (aHCurvePoints->Length() == 3)
+            aGBC.Load(aTangents, aTangentFlags);
+        }
+
         aGBC.Perform();
         if ( aGBC.IsDone() )
           aBSplineCurve = aGBC.Curve();