OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0032915: Geom2dAPI_InterCurveCurve, The algorithm lost an intersection point.

Browse Source 
Get rid of strange code: preliminary check of self-intersections is made on a polygonal representation of a curve, it is able to find possible intersections, but after that it filter out segments neighbor to the pair of non-intersected segments.

Test case de step_4 I1 has been marked BAD, because the self-intersection is treated correctly, but the projection algorithm generates such crooked 2D curve.

Reference data in test cases heal split_angle_advanced ZA5 and ZA6 has been updated, because those shapes have self-intersected edges, which are being detected now.
This commit is contained in:
azv 2022-04-08 11:03:53 +03:00 committed by afokin
parent a29bae45f9
commit 63fa56bc83
5 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/IntCurve/IntCurve_IntPolyPolyGen.gxx
View File

@ -388,9 +388,6 @@ void IntCurve_IntPolyPolyGen::Perform( const TheCurve& C1
} }
} }
Standard_Integer Nelarg=(Poly1.NbSegments()/20);
if(Nelarg<2) Nelarg=2;
for(Standard_Integer sp=1; sp <= Nbsp; sp++) { for(Standard_Integer sp=1; sp <= Nbsp; sp++) {
if(TriIndex[sp]>0) { if(TriIndex[sp]>0) {
const Intf_SectionPoint& SPnt = InterPP.PntValue(TriIndex[sp]); const Intf_SectionPoint& SPnt = InterPP.PntValue(TriIndex[sp]);
@ -401,20 +398,7 @@ void IntCurve_IntPolyPolyGen::Perform( const TheCurve& C1
if(Abs(SegIndex1-SegIndex2)>1) { if(Abs(SegIndex1-SegIndex2)>1) {
EIP.Perform(Poly1,Poly1,SegIndex1,SegIndex2,ParamOn1,ParamOn2); EIP.Perform(Poly1,Poly1,SegIndex1,SegIndex2,ParamOn1,ParamOn2);
if(EIP.NbRoots()==0) { if(EIP.NbRoots()>=1) {
//-- All neighbor segments are removed
for(Standard_Integer k=sp+1;k<=Nbsp;k++) {
Standard_Integer kk=TriIndex[k];
// --- avoid negative indices as well as in outer done
if( kk > 0 ) {
if( Abs(SegIndex1-PtrSegIndex1[kk])< Nelarg
&& Abs(SegIndex2-PtrSegIndex2[kk])< Nelarg) {
TriIndex[k]=-k;
}
}
}
}
else if(EIP.NbRoots()>=1) {
//-------------------------------------------------------------------- //--------------------------------------------------------------------
//-- It is checked if the found point is a root //-- It is checked if the found point is a root
//-------------------------------------------------------------------- //--------------------------------------------------------------------

18
tests/bugs/modalg_8/bug32915 Normal file
View File

@ -0,0 +1,18 @@
puts "================================================="
puts "0032915: Geom2dAPI_InterCurveCurve, The algorithm lost an intersection point."
puts "================================================="
puts ""
restore [locate_data_file bug32915.brep] e
mkcurve c3d e
plane p 0 0 1
project c2d c3d p
set inter [2dintersect c2d]
if {[regexp -all "Intersection point" $inter] != 29} {
puts "Error: Wrong number of self-intersections (expected 29 points)."
}
v2d
2dfit
checkview -screenshot -2d -path ${imagedir}/${test_image}.png

1
tests/de/step_4/I1
View File

@ -1,4 +1,5 @@
# !!!! This file is generated automatically, do not edit manually! See end script # !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO ALL: Error : 1 differences with reference data found"
set filename PRO7187.stp set filename PRO7187.stp

2
tests/heal/data/advanced/ZA5
View File

@ -1,5 +1,5 @@
if {[string compare $command "SplitAngle"] == 0 } { if {[string compare $command "SplitAngle"] == 0 } {
puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_4 " puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
} }
restore [locate_data_file SEB-1.brep] a restore [locate_data_file SEB-1.brep] a

2
tests/heal/data/advanced/ZA6
View File

@ -1,5 +1,5 @@
if {[string compare $command "SplitAngle"] == 0 } { if {[string compare $command "SplitAngle"] == 0 } {
puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_4 " puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
} }
restore [locate_data_file SEB-1B.brep] a restore [locate_data_file SEB-1B.brep] a