[cgma-dev] r5169 - cgm/trunk/geom/OCC

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-09-19 11:49:08 -0500 (Mon, 19 Sep 2011)
New Revision: 5169

Modified:
   cgm/trunk/geom/OCC/occ_patches_6.3
Log:
patch rework for format.

Modified: cgm/trunk/geom/OCC/occ_patches_6.3
===================================================================
--- cgm/trunk/geom/OCC/occ_patches_6.3	2011-09-19 16:17:56 UTC (rev 5168)
+++ cgm/trunk/geom/OCC/occ_patches_6.3	2011-09-19 16:49:08 UTC (rev 5169)
@@ -1,12 +1,48 @@
---- src/Extrema/Extrema_ExtPElS.cxx	2011-04-28 11:48:39.000000000 -0500
-+++ Extrema_ExtPElS.cxx	2011-04-29 10:16:43.000000000 -0500
+--- src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx	2011-09-19 11:32:42.000000000 -0500
++++ src_new/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx	2011-09-19 11:21:35.000000000 -0500
+@@ -201,9 +201,18 @@
+   BuildBack (myGen, GenBack);   // Vraiment pas optimum a Revoir
+   BuildBack (myMod, ModBack);
+   
+-  Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_FACE);
+-  Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE);
+-  Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX);
++  TopAbs_ShapeEnum type = SI.ShapeType();
++  Update (myMod,myGen,ModBack,GenBack,SI,MKS,type);
++  if(type < TopAbs_SHELL)
++    Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_SHELL);
++  if(type < TopAbs_FACE)
++    Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_FACE);
++  if(type < TopAbs_WIRE)
++    Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_WIRE);
++  if(type < TopAbs_EDGE)
++    Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE);
++  if(type < TopAbs_VERTEX)
++    Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX);
+ 
+ #ifdef DEB
+   if (Affich) {
+
+--- src/BRepClass/BRepClass_FaceClassifier.cxx  2011-09-19 11:30:10.000000000 -0500
++++ src_new/BRepClass/BRepClass_FaceClassifier.cxx      2011-09-19 11:20:47.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.
+
+--- src/Extrema/Extrema_ExtPElS.cxx     2011-09-19 11:27:21.000000000 -0500
++++ src_new/Extrema/Extrema_ExtPElS.cxx 2011-09-19 11:20:04.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; }