OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

0025488: Wrong result of two trimmed cylinders intersection

Browse Source 
1. Function IsSame(...) for IntSurf_PntOn2S was added (see IntSurf_PntOn2S.cdl for detail information).
2. Inserting additional points is forbidden if existing WLine contains only two points coincided.

Test-case for issue #25488
This commit is contained in:
nbv
2014-11-21 14:44:01 +03:00
committed by bugmaster
parent 80d659a5a6
commit baf72cd2e7
4 changed files with 111 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
View File

@@ -2053,7 +2053,7 @@ Standard_Boolean IntCyCyTrim( const IntSurf_Quadric& theQuad1,
aWL1FindStatus = 2; //start a new line
}
}
if( ((aUSurf2f-aU22) <= theTol2D) &&
((aU22-aUSurf2l) <= theTol2D) &&
((aVSurf1f - aV12) <= theTol2D) &&
@@ -2237,15 +2237,29 @@ Standard_Boolean IntCyCyTrim( const IntSurf_Quadric& theQuad1,
}
else if(aWLine1->NbPnts() > 1)
{
isTheEmpty = Standard_False;
isAddedIntoWL1 = Standard_True;
Standard_Boolean isGood = Standard_True;
SeekAdditionalPoints(theQuad1, theQuad2, aWLine1->Curve(),
anEquationCoeffs, aNbPoints, aUSurf2f, aUSurf2l,
theTol2D, aPeriod, 1.0, isTheReverse);
if(aWLine1->NbPnts() == 2)
{
const IntSurf_PntOn2S& aPf = aWLine1->Point(1);
const IntSurf_PntOn2S& aPl = aWLine1->Point(2);
aWLine1->ComputeVertexParameters(theTol3D);
theSlin.Append(aWLine1);
if(aPf.IsSame(aPl, Precision::Confusion()))
isGood = Standard_False;
}
if(isGood)
{
isTheEmpty = Standard_False;
isAddedIntoWL1 = Standard_True;
SeekAdditionalPoints( theQuad1, theQuad2, aWLine1->Curve(),
anEquationCoeffs, aNbPoints, aUSurf2f, aUSurf2l,
theTol2D, aPeriod, 1.0, isTheReverse);
aWLine1->ComputeVertexParameters(theTol3D);
theSlin.Append(aWLine1);
}
}
else
{
@@ -2267,15 +2281,28 @@ Standard_Boolean IntCyCyTrim( const IntSurf_Quadric& theQuad1,
}
else if(aWLine2->NbPnts() > 1)
{
isTheEmpty = Standard_False;
isAddedIntoWL2 = Standard_True;
Standard_Boolean isGood = Standard_True;
if(aWLine2->NbPnts() == 2)
{
const IntSurf_PntOn2S& aPf = aWLine2->Point(1);
const IntSurf_PntOn2S& aPl = aWLine2->Point(2);
SeekAdditionalPoints(theQuad1, theQuad2, aWLine2->Curve(),
anEquationCoeffs, aNbPoints, aUSurf2f, aUSurf2l,
theTol2D, aPeriod, -1.0, isTheReverse);
if(aPf.IsSame(aPl, Precision::Confusion()))
isGood = Standard_False;
}
aWLine2->ComputeVertexParameters(theTol3D);
theSlin.Append(aWLine2);
if(isGood)
{
isTheEmpty = Standard_False;
isAddedIntoWL2 = Standard_True;
SeekAdditionalPoints(theQuad1, theQuad2, aWLine2->Curve(),
anEquationCoeffs, aNbPoints, aUSurf2f, aUSurf2l,
theTol2D, aPeriod, -1.0, isTheReverse);
aWLine2->ComputeVertexParameters(theTol3D);
theSlin.Append(aWLine2);
}
}
else
{

9
src/IntSurf/IntSurf_PntOn2S.cdl
View File

@@ -119,6 +119,15 @@ is
is static;
IsSame(me; theOterPoint : PntOn2S from IntSurf;
theTol3D, theTol2D: Real from Standard = 0.0)
---Purpose: Returns TRUE if 2D- and 3D-coordinates of theOterPoint are equal to
-- corresponding coordinates of me (with given tolerance).
-- If theTol2D == 0.0 we will compare 3D-points only.
returns Boolean from Standard;
fields

27
src/IntSurf/IntSurf_PntOn2S.cxx
View File

@@ -49,4 +49,31 @@ void IntSurf_PntOn2S::SetValue (const Standard_Boolean OnFirst,
}
Standard_Boolean IntSurf_PntOn2S::IsSame( const IntSurf_PntOn2S& theOterPoint,
const Standard_Real theTol3D,
const Standard_Real theTol2D) const
{
if(pt.SquareDistance(theOterPoint.Value()) > theTol3D*theTol3D)
return Standard_False;
if(IsEqual(theTol2D, 0.0))
{//We need not compare 2D-coordinates of the points
return Standard_True;
}
Standard_Real aU1 = 0.0, aV1 = 0.0, aU2 = 0.0, aV2 = 0.0;
theOterPoint.Parameters(aU1, aV1, aU2, aV2);
gp_Pnt2d aP1(u1, v1), aP2(aU1, aV1);
if(!aP1.IsEqual(aP2, theTol2D))
return Standard_False;
aP1.SetCoord(u2, v2);
aP2.SetCoord(aU2, aV2);
if(!aP1.IsEqual(aP2, theTol2D))
return Standard_False;
return Standard_True;
}