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

0023143: Suspicious else

Browse Source 
Changes description:
In src\IntPatch\IntPatch_ImpPrmIntersection.cxx , in ForcedPurgePoints function changed
ParametersOnS2() to ParametersOnS1() in cases of
Standard_Boolean IsReversed == false in lines 1522 & 1540
Got rid from duplicated code in function static void ForcedPurgePoints(...)
This commit is contained in:
omy 2012-11-15 12:59:23 +04:00
parent 3c3131a05d
commit 3fa7e3e72f
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/IntPatch/IntPatch_ImpPrmIntersection.cxx
View File

@ -1510,19 +1510,20 @@ static void ForcedPurgePoints(Handle(IntSurf_LineOn2S)& Result,
if(Result->NbPoints() <= 30) return; if(Result->NbPoints() <= 30) return;
Standard_Integer Index = 0, IndexLimF = 8, IndexLimL = 8; Standard_Integer Index = 0, IndexLimF = 8, IndexLimL = 8;
if(Quad.TypeQuadric() == GeomAbs_Cone) { Standard_Real U1 = 0., V1 = 0., U2 = 0., V2 = 0.;
Standard_Real Uapx = 0., Vapx = 0.;
Quad.Parameters(Quad.Cone().Apex(),Uapx,Vapx);
Standard_Real U1 = 0., V1 = 0., U2 = 0., V2 = 0.;
if(IsReversed) { if(IsReversed) {
Result->Value(1).ParametersOnS2(U1,V1); Result->Value(1).ParametersOnS2(U1,V1);
Result->Value(Result->NbPoints()).ParametersOnS2(U2,V2); Result->Value(Result->NbPoints()).ParametersOnS2(U2,V2);
} }
else { else {
Result->Value(1).ParametersOnS2(U1,V1); Result->Value(1).ParametersOnS1(U1,V1);
Result->Value(Result->NbPoints()).ParametersOnS2(U2,V2); Result->Value(Result->NbPoints()).ParametersOnS1(U2,V2);
} }
if(Quad.TypeQuadric() == GeomAbs_Cone) {
Standard_Real Uapx = 0., Vapx = 0.;
Quad.Parameters(Quad.Cone().Apex(),Uapx,Vapx);
if(fabs(V1-Vapx) <= 1.e-3) if(fabs(V1-Vapx) <= 1.e-3)
IndexLimF = 12; IndexLimF = 12;
if(fabs(V2-Vapx) <= 1.e-3) if(fabs(V2-Vapx) <= 1.e-3)
@ -1531,16 +1532,7 @@ static void ForcedPurgePoints(Handle(IntSurf_LineOn2S)& Result,
if(Quad.TypeQuadric() == GeomAbs_Sphere) { if(Quad.TypeQuadric() == GeomAbs_Sphere) {
Standard_Real Vapx1 = M_PI/2., Vapx2 = -M_PI/2.; Standard_Real Vapx1 = M_PI/2., Vapx2 = -M_PI/2.;
Standard_Real U1 = 0., V1 = 0., U2 = 0., V2 = 0.;
if(IsReversed) {
Result->Value(1).ParametersOnS2(U1,V1);
Result->Value(Result->NbPoints()).ParametersOnS2(U2,V2);
}
else {
Result->Value(1).ParametersOnS2(U1,V1);
Result->Value(Result->NbPoints()).ParametersOnS2(U2,V2);
}
if(fabs(V1-Vapx1) <= 1.e-3 || fabs(V1-Vapx2) <= 1.e-3) if(fabs(V1-Vapx1) <= 1.e-3 || fabs(V1-Vapx2) <= 1.e-3)
IndexLimF = 12; IndexLimF = 12;
if(fabs(V2-Vapx1) <= 1.e-3 || fabs(V2-Vapx2) <= 1.e-3) if(fabs(V2-Vapx1) <= 1.e-3 || fabs(V2-Vapx2) <= 1.e-3)