X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Utils.cxx;h=7be2d6b379927d604455637c003b95cf18f3bb6d;hb=4e1b53167581be7e084a3d71c075507bc6699c06;hp=f0ee112738b60724e4f477ca71feb86dcbf73689;hpb=d6a39d0ff1901a6d762c8a904774517b2dc5ba27;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Utils.cxx b/src/HYDROCurveCreator/CurveCreator_Utils.cxx index f0ee1127..7be2d6b3 100644 --- a/src/HYDROCurveCreator/CurveCreator_Utils.cxx +++ b/src/HYDROCurveCreator/CurveCreator_Utils.cxx @@ -56,6 +56,8 @@ #include #include +#include +#include #include #include @@ -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(); @@ -180,26 +245,27 @@ void CurveCreator_Utils::constructShape( const CurveCreator_ICurve* theCurve, theShape = aComp; } -class ComparePnt +class CompareSectionToPoint { public: - ComparePnt( const gp_Pnt& thePoint ) : myPoint( thePoint) {}; - ~ComparePnt() {} + CompareSectionToPoint( const int theISection = -1, const int theIPoint = -1 ) + : mySectionId( theISection ), myPointId( theIPoint ) {}; + ~CompareSectionToPoint() {} - bool operator < ( const ComparePnt& theOtherPoint ) const + bool operator < ( const CompareSectionToPoint& theOther ) const { - bool isLess = myPoint.X() < theOtherPoint.myPoint.X(); - if ( !isLess && myPoint.X() == theOtherPoint.myPoint.X() ) { - isLess = myPoint.Y() < theOtherPoint.myPoint.Y(); - if ( !isLess && myPoint.Y() == theOtherPoint.myPoint.Y() ) - isLess = myPoint.Z() < theOtherPoint.myPoint.Z(); - } + bool isLess = mySectionId < theOther.mySectionId; + if ( !isLess && mySectionId == theOther.mySectionId ) + isLess = myPointId < theOther.myPointId; return isLess; } + private: - gp_Pnt myPoint; + int mySectionId; + int myPointId; }; + void CurveCreator_Utils::getSelectedPoints( Handle(AIS_InteractiveContext) theContext, const CurveCreator_ICurve* theCurve, CurveCreator_ICurve::SectionToPointList& thePoints ) @@ -208,7 +274,7 @@ void CurveCreator_Utils::getSelectedPoints( Handle(AIS_InteractiveContext) theCo std::list aSelectedPoints; gp_Pnt aPnt; - std::map aPntMap; + std::map aPointsMap; CurveCreator_ICurve::SectionToPointList aPoints; for ( theContext->InitSelected(); theContext->MoreSelected(); theContext->NextSelected() ) { @@ -220,15 +286,19 @@ void CurveCreator_Utils::getSelectedPoints( Handle(AIS_InteractiveContext) theCo if ( aVertex.IsNull() ) continue; aPnt = BRep_Tool::Pnt( aVertex ); - if ( aPntMap.find( aPnt ) != aPntMap.end() ) - continue; - aPntMap[aPnt] = 0; CurveCreator_UtilsICurve::findSectionsToPoints( theCurve, aPnt.X(), aPnt.Y(), aPoints ); CurveCreator_ICurve::SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end(); - for ( ; anIt != aLast; anIt++ ) + CompareSectionToPoint aPoint; + for ( ; anIt != aLast; anIt++ ) { + aPoint = CompareSectionToPoint( (*anIt).first, (*anIt).second ); + if ( aPointsMap.find( aPoint ) != aPointsMap.end() ) + continue; + aPointsMap[aPoint] = 0; + thePoints.push_back( *anIt ); + } } }