[cgma-dev] r5469 - cgm/branches/merge-cubit13.1/geom/OCC

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-04-09 14:43:09 -0500 (Mon, 09 Apr 2012)
New Revision: 5469

Added:
   cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.3
   cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5
   cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.1
   cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.2
Removed:
   cgm/branches/merge-cubit13.1/geom/OCC/occ_patches
Log:
Added patch file in different version.

Deleted: cgm/branches/merge-cubit13.1/geom/OCC/occ_patches
===================================================================
--- cgm/branches/merge-cubit13.1/geom/OCC/occ_patches	2012-04-09 19:38:40 UTC (rev 5468)
+++ cgm/branches/merge-cubit13.1/geom/OCC/occ_patches	2012-04-09 19:43:09 UTC (rev 5469)
@@ -1,69 +0,0 @@
---- ros/src/Extrema/Extrema_ExtPS.cxx	2011-04-11 13:06:46.000000000 -0500
-+++ /home/jhu/OpenCASCADE6.5.0/ros/src/Extrema/Extrema_ExtPS.cxx	2011-04-09 14:13:13.000000000 -0500
-@@ -94,10 +94,18 @@
-   Standard_Real U, V;
-   PS.Parameter(U, V);
-   if (myS->IsUPeriodic()) {
--    U = ElCLib::InPeriod(U, myuinf, myuinf+myS->UPeriod());
-+    Standard_Real Uupper = myuinf+myS->UPeriod();
-+    if(U>(myuinf-mytolu) && U < myuinf) U = myuinf;
-+    else if(U < (Uupper+mytolu) && U > Uupper) U = Uupper;
-+    else
-+      U = ElCLib::InPeriod(U, myuinf, myuinf+myS->UPeriod());
-   }
-   if (myS->IsVPeriodic()) {
--    V = ElCLib::InPeriod(V, myvinf, myvinf+myS->VPeriod());
-+    Standard_Real Vupper = myvinf+myS->VPeriod();
-+    if(V>(myvinf-mytolv) && V < myvinf) V = myvinf;
-+    else if(V < (Vupper+mytolv) && V > Vupper) V = Vupper;
-+    else
-+      V = ElCLib::InPeriod(V, myvinf, myvinf+myS->VPeriod());
-   }
-   if ((myuinf-U) <= mytolu && (U-myusup) <= mytolu &&
-       (myvinf-V) <= mytolv && (V-myvsup) <= mytolv) {
-
---- /src/Extrema/Extrema_ExtPElS.cxx     2011-04-11 12:00:57.000000000 -0500
-+++ /home/jhu/OpenCASCADE6.5.0/ros/src/Extrema/Extrema_ExtPElS.cxx 2011-04-11 12:03:19.000000000 -0500
-@@ -56,6 +56,7 @@
-   gp_Vec myZ = Pos.XDirection()^Pos.YDirection();
-   Standard_Real U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ); //-PI<U1<PI
-   Standard_Real U2 = U1 + PI;
-+  if(U1 > -Tol && U1 < 0.) {U1 = 0.;}
-   if (U1 < 0.) { U1 += 2. * PI; }
-
-   gp_Pnt Ps;
-@@ -157,7 +158,9 @@
-   B = MP.Angle(DirZ);
-   if (!Same) { U1 += PI; }
-   U2 = U1 + PI;
-+  if(U1 > -Tol && U1 < 0.) {U1 = 0.;}
-   if (U1 < 0.) { U1 += 2. * PI; }
-+  if (U2 - 2.*PI < Tol && U2 > 2.*PI) {U2 = 2. * PI; }
-   if (U2 > 2.*PI) { U2 -= 2. * PI; }
-   B = MP.Angle(DirZ);
-   A = Abs(A);
-@@ -248,6 +251,7 @@
-     gp_Vec myZ = Pos.XDirection()^Pos.YDirection();