OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0025193: Bad Intersection curveobtained by Surface/Surface Intersection Algorithm.

Browse Source 
Test case for issue CR25193

Correction of test case for issue CR25193
This commit is contained in:
jgv
2014-12-11 16:34:23 +03:00
committed by bugmaster
parent fa0f5a5558
commit 68cdb44b0a
5 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/IntPatch/IntPatch_WLine.cxx
View File

@@ -119,8 +119,8 @@ static void RecadreMemePeriode(IntSurf_PntOn2S& POn2S,const IntSurf_PntOn2S& Ref
POn2S.SetValue(u1,v1,u2,v2);
}
static Standard_Boolean CompareVertexAndPoint(const gp_Pnt& V,const gp_Pnt& P,const Standard_Real& Tol) {
return(V.Distance(P)<=Tol);
static Standard_Boolean CompareVertexAndPoint(const gp_Pnt& V, const gp_Pnt& P, const Standard_Real& Tol) {
return (V.Distance(P) <= Tol);
}
void IntPatch_WLine::SetPeriod(const Standard_Real pu1,
@@ -770,8 +770,9 @@ void IntPatch_WLine::ComputeVertexParameters( const Standard_Real RTol,
for(i=1;
(vtxfound==Standard_False) && (i<=nbvtx);i++) {
const IntPatch_Point& V = svtx.Value(i);
Standard_Real vTol = V.Tolerance();
if(CompareVertexAndPoint(V.Value(),curv->Value(1).Value(),vTol)) {
//jgv: to avoid loops
//Standard_Real vTol = V.Tolerance();
if(CompareVertexAndPoint(V.Value(), curv->Value(1).Value(), Precision::Confusion()/*vTol*/)) {
vtx = V;
vtx.SetParameters(pu1,pv1,pu2,pv2);
vtxfound = Standard_True;
@@ -794,8 +795,9 @@ void IntPatch_WLine::ComputeVertexParameters( const Standard_Real RTol,
for(i=1;
(vtxfound==Standard_False) && (i<=nbvtx);i++) {
const IntPatch_Point& V = svtx.Value(i);
Standard_Real vTol = V.Tolerance();
if(CompareVertexAndPoint(V.Value(),curv->Value(nbponline).Value(),vTol)) {
//jgv: to avoid loops
//Standard_Real vTol = V.Tolerance();
if(CompareVertexAndPoint(V.Value(), curv->Value(nbponline).Value(), Precision::Confusion()/*vTol*/)) {
vtx = V;
vtx.SetParameters(pu1,pv1,pu2,pv2);
vtxfound = Standard_True;

18
src/IntWalk/IntWalk_PWalking.cxx
View File

@@ -1328,6 +1328,24 @@ void IntWalk_PWalking::Perform(const TColStd_Array1OfReal& ParDep,
bFlag2=u2 >= Um2-aTol2D && v2 >= Vm2-aTol2D && u2 <= UM2+aTol2D && v2 <= VM2+aTol2D;
if (bFlag1 && bFlag2)
{
if (line->NbPoints() > 1)
{
IntSurf_PntOn2S prevprevPoint = line->Value(line->NbPoints()-1);
Standard_Real ppU1, ppV1, ppU2, ppV2;
prevprevPoint.Parameters(ppU1, ppV1, ppU2, ppV2);
Standard_Real pU1, pV1, pU2, pV2;
previousPointSave.Parameters(pU1, pV1, pU2, pV2);
gp_Vec2d V1onS1(gp_Pnt2d(ppU1, ppV1), gp_Pnt2d(pU1, pV1));
gp_Vec2d V2onS1(gp_Pnt2d(pU1, pV1), gp_Pnt2d(u1, v1));
gp_Vec2d V1onS2(gp_Pnt2d(ppU2, ppV2), gp_Pnt2d(pU2, pV2));
gp_Vec2d V2onS2(gp_Pnt2d(pU2, pV2), gp_Pnt2d(u2, v2));
if (V1onS1 * V2onS1 < 0. ||
V1onS2 * V2onS2 < 0.)
{
Arrive = Standard_True;
break;
}
}
/*
if(u1 <= UM1 && u2 <= UM2 && v1 <= VM1 &&
v2 <= VM2 && u1 >= Um1 && u2 >= Um2 &&