0023291: GccAna_Circ2d3Tan_8.cxx, suspicious if

one of the duplicate conditions has been removed
Code was changed to be more obvious.
Unite if blocks into one block
Small correction of coding style

diff --git a/src/GccAna/GccAna_Circ2d3Tan_8.cxx b/src/GccAna/GccAna_Circ2d3Tan_8.cxx
index 0cfe59d6c99259a2b640da370e8349239cd6d34f..3253a829d92b9757f45f3e811681e25f2e4317c6 100755 (executable)
--- a/src/GccAna/GccAna_Circ2d3Tan_8.cxx
+++ b/src/GccAna/GccAna_Circ2d3Tan_8.cxx
@@ -118,29 +118,17 @@ GccAna_Circ2d3Tan::
 //        Standard_Integer nbsol2 = 0;
           Standard_Integer nbsol3 = 0;
           Standard_Boolean ok = Standard_False;
-          if (Qualified1.IsEnclosed()) {
-            if ((((origin1.X()-Center.X())*(-dir1.Y()))+
-                 ((origin1.Y()-Center.Y())*(dir1.X())))<=0){
-              ok = Standard_True;
-              nbsol1 = 1;
-              Radius = dist1;
-            }
-          }
-          else if (Qualified1.IsOutside()) {
-            if ((((origin1.X()-Center.X())*(-dir1.Y()))+
-                 ((origin1.Y()-Center.Y())*(dir1.X())))>=0){
-              ok = Standard_True;
-              nbsol1 = 1;
-              Radius = dist1;
-            }
-          }
-          else if (Qualified1.IsUnqualified()) {
-            ok = Standard_True;
-            nbsol1 = 1;
-            Radius = dist1;
-          }
+     Standard_Real  difference = (((origin1.X()-Center.X())*(-dir1.Y())) + ((origin1.Y()-Center.Y())*(dir1.X())));
+     if ((Qualified1.IsEnclosed() && difference <= 0) ||
+         (Qualified1.IsOutside() && difference >= 0) ||
+         (Qualified1.IsUnqualified()))
+     {
+       ok = Standard_True;
+       nbsol1 = 1;
+       Radius = dist1;
+     }
           if (ok) {
-            if (Abs(dist2-Radius)<=Tol && Abs(dist2-Radius)<=Tol) { 
+            if (Abs(dist2-Radius)<=Tol) { 
               nbsol3 = 1;
             }
             else { ok = Standard_False; }