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

0025951: Exception in intersection operation.

Browse Source 
The reason of the exception has been eliminated.
Integration of testing case for issue 25951

Adjusting test case for Linux platform
This commit is contained in:
bugmaster 2015-03-20 13:03:26 +03:00
parent 1cdee2a613
commit 1dee069608
3 changed files with 56 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/IntPatch/IntPatch_PrmPrmIntersection.cxx
View File

@ -353,7 +353,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
Point3dDebut = PW.Value(1).Value();
const IntSurf_PntOn2S& PointFin = PW.Value(PW.NbPoints());
Point3dFin = PointFin.Value();
for( ver = 1 ; (!RejetLigne) && (ver<= NbLigCalculee) ; ver++) {
for( ver = 1 ; ver<= NbLigCalculee ; ver++) {
const Handle(IntPatch_WLine)& verwline = *((Handle(IntPatch_WLine)*)&SLin.Value(ver));
// Check end point if it is on existing line.
@ -365,9 +365,11 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
const IntSurf_PntOn2S& verPointDebut = verwline->Point(1);
const IntSurf_PntOn2S& verPointFin = verwline->Point(verwline->NbPnts());
if( Point3dDebut.Distance(verPointDebut.Value()) <= TolTangency ) {
if(Point3dFin.Distance(verPointFin.Value()) <= TolTangency)
RejetLigne = Standard_True;
if( (Point3dDebut.Distance(verPointDebut.Value()) <= TolTangency) &&
(Point3dFin.Distance(verPointFin.Value()) <= TolTangency))
{
RejetLigne = Standard_True;
break;
}
}
@ -496,7 +498,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
Point3dDebut = PW.Value(1).Value();
const IntSurf_PntOn2S& PointFin = PW.Value(PW.NbPoints());
Point3dFin = PointFin.Value();
for(ver=1 ; (!RejetLigne) && (ver<= NbLigCalculee) ; ver++) {
for(ver=1 ; ver<= NbLigCalculee ; ver++) {
const Handle(IntPatch_WLine)& verwline = *((Handle(IntPatch_WLine)*)&SLin.Value(ver));
// Check end point if it is on existing line.
@ -508,11 +510,11 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
const IntSurf_PntOn2S& verPointDebut = verwline->Point(1);
const IntSurf_PntOn2S& verPointFin = verwline->Point(verwline->NbPnts());
if(Point3dDebut.Distance(verPointDebut.Value()) < TolTangency)
if( (Point3dDebut.Distance(verPointDebut.Value()) < TolTangency) ||
(Point3dFin.Distance(verPointFin.Value()) < TolTangency))
{
RejetLigne = Standard_True;
else {
if(Point3dFin.Distance(verPointFin.Value()) < TolTangency)
RejetLigne = Standard_True;
break;
}
}
@ -726,15 +728,15 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
RejetLigne = Standard_False;
Point3dDebut = PW.Value(1).Value();
Point3dFin = PW.Value(PW.NbPoints()).Value();
for(ver=1 ; (!RejetLigne) && (ver<= NbLigCalculee) ; ver++) {
for(ver=1 ; ver<= NbLigCalculee ; ver++) {
const Handle(IntPatch_WLine)& verwline = *((Handle(IntPatch_WLine)*)&SLin.Value(ver));
const IntSurf_PntOn2S& verPointDebut = verwline->Point(1);
const IntSurf_PntOn2S& verPointFin = verwline->Point(verwline->NbPnts());
if(Point3dDebut.Distance(verPointDebut.Value()) < TolTangency)
if( (Point3dDebut.Distance(verPointDebut.Value()) < TolTangency) ||
(Point3dFin.Distance(verPointFin.Value()) < TolTangency))
{
RejetLigne = Standard_True;
else {
if(Point3dFin.Distance(verPointFin.Value()) < TolTangency)
RejetLigne = Standard_True;
break;
}
}
@ -899,15 +901,15 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
RejetLigne = Standard_False;
Point3dDebut = PW.Value(1).Value();
Point3dFin = PW.Value(PW.NbPoints()).Value();
for( ver = 1 ; (!RejetLigne) && (ver<= NbLigCalculee) ; ver++) {
for( ver = 1 ; ver<= NbLigCalculee ; ver++) {
const Handle(IntPatch_WLine)& verwline = *((Handle(IntPatch_WLine)*)&SLin.Value(ver));
const IntSurf_PntOn2S& verPointDebut = verwline->Point(1);
const IntSurf_PntOn2S& verPointFin = verwline->Point(verwline->NbPnts());
if(Point3dDebut.Distance(verPointDebut.Value()) < TolTangency)
if( (Point3dDebut.Distance(verPointDebut.Value()) < TolTangency) ||
(Point3dFin.Distance(verPointFin.Value()) < TolTangency))
{
RejetLigne = Standard_True;
else {
if(Point3dFin.Distance(verPointFin.Value()) < TolTangency)
RejetLigne = Standard_True;
break;
}
}
@ -1533,7 +1535,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
Point3dDebut = PW.Value(1).Value();
const IntSurf_PntOn2S& PointFin = PW.Value(PW.NbPoints());
Point3dFin = PointFin.Value();
for( ver = 1 ; (!RejetLigne) && (ver<= NbLigCalculee) ; ver++) {
for( ver = 1 ; ver<= NbLigCalculee ; ver++) {
const Handle(IntPatch_WLine)& verwline = *((Handle(IntPatch_WLine)*)&SLin.Value(ver));
// Check end point if it is on existing line.
@ -1545,9 +1547,11 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)&
const IntSurf_PntOn2S& verPointDebut = verwline->Point(1);
const IntSurf_PntOn2S& verPointFin = verwline->Point(verwline->NbPnts());
if(Point3dDebut.Distance(verPointDebut.Value()) <= TolTangency) {
if(Point3dFin.Distance(verPointFin.Value()) <= TolTangency)
RejetLigne = Standard_True;
if( (Point3dDebut.Distance(verPointDebut.Value()) <= TolTangency) &&
(Point3dFin.Distance(verPointFin.Value()) <= TolTangency))
{
RejetLigne = Standard_True;
break;
}
}
@ -2356,6 +2360,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& Sur
//modified by NIZNHY-PKV Tue May 10 11:08:13 2011t
RejectLine = Standard_True;
ver--;
break;
}
}//for(m=1; m<iPWNbPoints; ++m){
@ -2898,7 +2903,7 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& Sur
const IntSurf_PntOn2S& PointFin = PW.Value(PW.NbPoints());
Point3dFin = PointFin.Value();
for(ver=1 ; (!RejetLigne) && (ver<= NbLigCalculee) ; ver++)
for(ver=1 ; ver<= NbLigCalculee ; ver++)
{
const Handle(IntPatch_WLine)& verwline = *((Handle(IntPatch_WLine)*)&SLin.Value(ver));
//-- Handle(IntPatch_WLine) verwline=Handle(IntPatch_WLine)::DownCast(SLin.Value(ver));
@ -2913,16 +2918,11 @@ void IntPatch_PrmPrmIntersection::Perform (const Handle(Adaptor3d_HSurface)& Sur
const IntSurf_PntOn2S& verPointDebut = verwline->Point(1);
const IntSurf_PntOn2S& verPointFin = verwline->Point(verwline->NbPnts());
if(Point3dDebut.Distance(verPointDebut.Value()) < TolTangency)
if( (Point3dDebut.Distance(verPointDebut.Value()) < TolTangency) ||
(Point3dFin.Distance(verPointFin.Value()) < TolTangency))
{
RejetLigne = Standard_True;
}
else
{
if(Point3dFin.Distance(verPointFin.Value()) < TolTangency)
{
RejetLigne = Standard_True;
}
break;
}
}

1
tests/bugs/fclasses/bug670
View File

@ -1,5 +1,6 @@
puts "TODO ?OCC12345 ALL: An exception was caught"
puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
puts "========"
puts "OCC670"

23
tests/bugs/modalg_5/bug25951 Normal file
View File

@ -0,0 +1,23 @@
puts "========"
puts "OCC25951"
puts "========"
puts ""
#######################################
# Exception in intersection operation
#######################################
restore [locate_data_file OCC25951-qff001.brep] q
explode q
copy q_1 b1
copy q_2 b2
bsection result b1 b2
set nb_v_good 1
set nb_e_good 0
set nb_w_good 0
set nb_f_good 0
set nb_sh_good 0
set nb_sol_good 0
set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 2