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

0025111: Incomplete section curve between Conical and Toroidal surfaces

Browse Source 
Correction of test cases for CR25111

Test cases for issue CR25111
This commit is contained in:
jgv 2014-08-21 12:04:56 +04:00 committed by bugmaster
parent 21678ea94a
commit 10ee997695
4 changed files with 90 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/IntPatch/IntPatch_ImpPrmIntersection.cxx
View File

@ -2330,6 +2330,8 @@ static Standard_Boolean DecomposeResult(const Handle(IntPatch_Line)& theLine,
// build WLine parts (if any)
Standard_Boolean flNextLine = Standard_True;
Standard_Boolean hasBeenDecomposed = Standard_False;
Standard_Boolean PrePointExist = Standard_False;
IntSurf_PntOn2S PrePoint;
while(flNextLine)
{
// reset variables
@ -2342,6 +2344,12 @@ static Standard_Boolean DecomposeResult(const Handle(IntPatch_Line)& theLine,
//if((Lindex-Findex+1) <= 2 )
if(aLindex <= aFindex)
return hasBeenDecomposed;
if (PrePointExist)
{
sline->Add(PrePoint);
PrePointExist = Standard_False;
}
// analyze other points
for(Standard_Integer k = aFindex; k <= aLindex; k++)
@ -2358,6 +2366,7 @@ static Standard_Boolean DecomposeResult(const Handle(IntPatch_Line)& theLine,
}
sline->Add(aSSLine->Value(k));
PrePoint = aSSLine->Value(k);
continue;
}
@ -2374,10 +2383,56 @@ static Standard_Boolean DecomposeResult(const Handle(IntPatch_Line)& theLine,
{
aBindex = k;
isDecomposited = Standard_True;
////
if (Abs(U1) <= Precision::PConfusion() ||
Abs(U1 - 2*M_PI) <= Precision::PConfusion())
{
IntSurf_PntOn2S NewPoint;
IntSurf_PntOn2S CurPoint = aSSLine->Value(k);
gp_Pnt thePnt = CurPoint.Value();
Standard_Real theU1, theV1, theU2, theV2;
theU1 = (Abs(U1) <= Precision::PConfusion())? 2*M_PI : 0.;
theV1 = V1;
NewPoint.SetValue(thePnt);
if (!IsReversed)
{
CurPoint.ParametersOnS2(theU2, theV2);
NewPoint.SetValue(theU1, theV1, theU2, theV2);
}
else
{
CurPoint.ParametersOnS1(theU2, theV2);
NewPoint.SetValue(theU2, theV2, theU1, theV1);
}
sline->Add(NewPoint);
}
else if (Abs(AnU1) <= Precision::PConfusion() ||
Abs(AnU1 - 2*M_PI) <= Precision::PConfusion())
{
//Modify <PrePoint>
PrePointExist = Standard_True;
Standard_Real theU1, theV1;
if (!IsReversed)
{
PrePoint.ParametersOnS1(theU1, theV1);
theU1 = (Abs(AnU1) <= Precision::PConfusion())? 2*M_PI : 0.;
PrePoint.SetValue(Standard_True, //on first
theU1, theV1);
}
else
{
PrePoint.ParametersOnS2(theU1, theV1);
theU1 = (Abs(AnU1) <= Precision::PConfusion())? 2*M_PI : 0.;
PrePoint.SetValue(Standard_False, //on second
theU1, theV1);
}
}
////
break;
}
sline->Add(aSSLine->Value(k));
PrePoint = aSSLine->Value(k);
AnU1=U1;
}

8
tests/bugs/modalg_4/bug825
View File

@ -31,12 +31,12 @@ if { [ catch { set info_result [OCC825 a1 a2 a3 res1 res2 0] } ] } {
}
checkshape res1
set nbFace_exp 0
set nbShell_exp 0
set nbSolid_exp 0
set nbFace_exp 2
set nbShell_exp 1
set nbSolid_exp 1
set nbCompSolid_exp 0
set nbCompound_exp 1
set nbShape_exp 1
set nbShape_exp 15
set nb_info [nbshapes res1]
regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_face

30
tests/bugs/modalg_5/bug25111 Normal file
View File

@ -0,0 +1,30 @@
puts "============"
puts "OCC25111"
puts "============"
puts ""
#######################################################################
# Incomplete section curve between Conical and Toroidal surfaces
#######################################################################
restore [locate_data_file bug25111_s1.draw] s1
restore [locate_data_file bug25111_s2.draw] s2
mkface f1 s1
mkface f2 s2
bop f1 f2
bopsection result
set length 53.1714
set nb_v_good 3
set nb_e_good 2
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 6
set 2dviewer 1

1
tests/draft/angle/G2 Normal file → Executable file
View File

@ -1,5 +1,6 @@
#E6----------------------------------------------
puts "TODO ?OCC22803 ALL: Faulty shapes in variables faulty_1 to faulty_"
puts "TODO ?OCC25111 ALL: The area of the resulting shape is"
ptorus pt 25 24 90
profile pr o 20 18 5 p 0 -1 0 1 0 0 l 10 t 0 30 \