Author: janehu Date: 2011-04-29 11:20:04 -0500 (Fri, 29 Apr 2011) New Revision: 4786 Modified: cgm/trunk/geom/OCC/occ_patches Log: give the pathes to the patches. Added one from r4440 back. Modified: cgm/trunk/geom/OCC/occ_patches =================================================================== --- cgm/trunk/geom/OCC/occ_patches 2011-04-28 23:15:21 UTC (rev 4785) +++ cgm/trunk/geom/OCC/occ_patches 2011-04-29 16:20:04 UTC (rev 4786) @@ -1,38 +1,5 @@ ---- BRepClass_FaceClassifier.cxx_old 2011-04-28 10:16:13.000000000 -0500 -+++ BRepClass_FaceClassifier.cxx 2011-04-28 10:16:51.000000000 -0500 -@@ -55,6 +55,7 @@ - Extrema_ExtPS myExtrem; - //-- myExtrem.Initialize(HS, U1, U2, V1, V2, Tol, Tol); - myExtrem.Initialize(Surf, U1, U2, V1, V2, Tol, Tol); -+ myExtrem.Perform(P); - //---------------------------------------------------------- - //-- On cherche le point le plus proche , PUIS - //-- On le classifie. ---- Extrema_ExtPS.cxx_old 2011-04-28 10:13:52.000000000 -0500 -+++ Extrema_ExtPS.cxx 2011-04-28 10:15:46.000000000 -0500 -@@ -88,10 +88,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) { ---- Extrema_ExtPElS.cxx_old 2011-04-28 11:48:39.000000000 -0500 -+++ Extrema_ExtPElS.cxx 2011-04-28 10:13:38.000000000 -0500 +--- OpenCASCADE6.3.0/ros/src/Extrema/Extrema_ExtPElS.cxx 2011-04-28 11:48:39.000000000 -0500 ++++ Extrema_ExtPElS.cxx 2011-04-29 10:16:43.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 @@ -76,3 +43,52 @@ if (V1 < 0.) { V1 += 2. * PI; } if (V2 < 0.) { V2 += 2. * PI; } +--- OpenCASCADE6.3.0/ros/src/Extrema/Extrema_ExtPS.cxx 2011-04-28 10:13:52.000000000 -0500 ++++ Extrema_ExtPS.cxx 2011-04-29 10:16:43.000000000 -0500