Fix regressions

[modules/smesh.git] / src / StdMeshers / StdMeshers_Projection_2D.cxx

diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx
index 31db57e967fd3f2702c6bd6fbf8d17131acccf48..2888a362cf23aeda129c0e8ea361791f16d9bb58 100644 (file)
--- a/src/StdMeshers/StdMeshers_Projection_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx
@@ -704,9 +704,9 @@ namespace {
             tgtMeshDS->SetNodeOnEdge( n, tgtE, srcU );
             if ( !tgtFace.IsPartner( srcFace ))
             {
             tgtMeshDS->SetNodeOnEdge( n, tgtE, srcU );
             if ( !tgtFace.IsPartner( srcFace ))
             {

-              bool isOk = true;

               edgeHelper.SetSubShape( tgtE );
               edgeHelper.SetSubShape( tgtE );

-              edgeHelper.GetNodeU( tgtE, n, 0, &isOk );
+              double tol = BRep_Tool::Tolerance( tgtE );
+              bool isOk = edgeHelper.CheckNodeU( tgtE, n, srcU, 2 * tol, /*force=*/true );

               if ( !isOk ) // projection of n to tgtE failed (23395)
               {
                 double sF, sL, tF, tL;
               if ( !isOk ) // projection of n to tgtE failed (23395)
               {
                 double sF, sL, tF, tL;


@@ -717,7 +717,6 @@ namespace {
                 tgtMeshDS->SetNodeOnEdge( n, tgtE, tgtU );
                 gp_Pnt newP = BRepAdaptor_Curve( tgtE ).Value( tgtU );
                 double dist = newP.Distance( tgtP );
                 tgtMeshDS->SetNodeOnEdge( n, tgtE, tgtU );
                 gp_Pnt newP = BRepAdaptor_Curve( tgtE ).Value( tgtU );
                 double dist = newP.Distance( tgtP );

-                double tol = BRep_Tool::Tolerance( tgtE );

                 if ( tol < dist && dist < 1000*tol )
                   tgtMeshDS->MoveNode( n, newP.X(), newP.Y(), newP.Z() );
               }
                 if ( tol < dist && dist < 1000*tol )
                   tgtMeshDS->MoveNode( n, newP.X(), newP.Y(), newP.Z() );
               }