From ea06a25cd950e9bc824f73809ae5bab80dba14cd Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 11 Oct 2007 12:43:05 +0000 Subject: [PATCH] + // double delta = d1*d2*1e-6; PAL17233 + double delta = min( d1, d2 ) / 10.; --- src/SMESH/SMESH_Pattern.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx index 5054f5549..cfc66f348 100644 --- a/src/SMESH/SMESH_Pattern.cxx +++ b/src/SMESH/SMESH_Pattern.cxx @@ -36,10 +36,12 @@ #include #include #include -#include +//#include #include #include +#include #include +#include #include #include #include @@ -47,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -966,8 +967,9 @@ static bool intersectIsolines(const gp_XY& uv11, const gp_XY& uv12, const double // SKL 26.07.2007 for NPAL16567 double d1 = (uv11-uv12).Modulus(); double d2 = (uv21-uv22).Modulus(); - double delta = d1*d2*1e-6; - isDeformed = ( loc1 - loc2 ).SquareModulus() > delta; + // double delta = d1*d2*1e-6; PAL17233 + double delta = min( d1, d2 ) / 10.; + isDeformed = ( loc1 - loc2 ).SquareModulus() > delta * delta; // double len1 = ( uv11 - uv12 ).Modulus(); // double len2 = ( uv21 - uv22 ).Modulus(); @@ -991,6 +993,10 @@ static bool intersectIsolines(const gp_XY& uv11, const gp_XY& uv12, const double // resUV /= 2.; // } + if ( isDeformed ) { + MESSAGE("intersectIsolines(), d1 = " << d1 << ", d2 = " << d2 << ", delta = " << delta << + ", " << (loc1 - loc2).SquareModulus() << " > " << delta * delta); + } return true; } -- 2.39.2