OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0028081: Fix regression in HLR introduced by the fix for 28053

Browse Source 
The whole piece of the walking line between two vertices is no more checked for having length greater than Precision::Confusion(). Instead, only full duplicate points (comparing with gp::Resolution()) are removed, allowing the resulting line have any non-null length.

The test bugs modalg_6 bug27720_5 has been reverted to its original state.
This commit is contained in:
msv 2016-11-09 18:27:47 +03:00 committed by apn
parent 326b3e283a
commit eca0539260
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Contap/Contap_Contour.cxx
View File

@ -307,22 +307,23 @@ static void LineConstructor(Contap_TheSequenceOfLine& slin,
else { else {
//-- cout<<"ContapWLine : firtsp="<<firstp<<" lastp="<<lastp<<" Vtx:"<<i<<","<<i+1<<endl; //-- cout<<"ContapWLine : firtsp="<<firstp<<" lastp="<<lastp<<" Vtx:"<<i<<","<<i+1<<endl;
Handle(IntSurf_LineOn2S) LineOn2S = new IntSurf_LineOn2S(); Handle(IntSurf_LineOn2S) LineOn2S = new IntSurf_LineOn2S();
Contap_Line Line; LineOn2S->Add(L.Point(firstp));
Standard_Real aLen = 0.; for (Standard_Integer j = firstp + 1; j <= lastp; j++) {
for(Standard_Integer j=firstp; j<=lastp; j++) { Standard_Real aSqDist = L.Point(j).Value().
LineOn2S->Add(L.Point(j)); SquareDistance(L.Point(j - 1).Value());
if (j > firstp) if (aSqDist > gp::Resolution())
aLen += L.Point(j).Value().Distance(L.Point(j - 1).Value()); LineOn2S->Add(L.Point(j));
} }
if (aLen < Precision::Confusion()) if (LineOn2S->NbPoints() < 2)
continue; continue;
Contap_Line Line;
Line.SetLineOn2S(LineOn2S); Line.SetLineOn2S(LineOn2S);
Contap_Point pvtx = L.Vertex(i); Contap_Point pvtx = L.Vertex(i);
pvtx.SetParameter(1); pvtx.SetParameter(1);
Line.Add(pvtx); Line.Add(pvtx);
pvtx = L.Vertex(i+1); pvtx = L.Vertex(i+1);
pvtx.SetParameter(lastp-firstp+1); pvtx.SetParameter(LineOn2S->NbPoints());
Line.Add(pvtx); Line.Add(pvtx);
Line.SetTransitionOnS(L.TransitionOnS()); Line.SetTransitionOnS(L.TransitionOnS());
slin.Append(Line); slin.Append(Line);

2
tests/bugs/modalg_6/bug27720_5
View File

@ -21,6 +21,6 @@ build3d result
fit fit
checkprops result -l 0.841499 checkprops result -l 0.841499
checknbshapes result -vertex 94 -edge 47 checknbshapes result -vertex 92 -edge 46
checkview -screenshot -2d -path ${imagedir}/${test_image}.png checkview -screenshot -2d -path ${imagedir}/${test_image}.png