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

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-05-31 13:14:55 -0500 (Tue, 31 May 2011)
New Revision: 4899

Modified:
   cgm/trunk/geom/OCC/occ_patches_6.3
   cgm/trunk/geom/OCC/occ_patches_6.5
Log:
Added fix for scale with vector, it got lost somehow, was in r4438. Testcase is in modify.cpp. Passed make check.

Modified: cgm/trunk/geom/OCC/occ_patches_6.3
===================================================================
--- cgm/trunk/geom/OCC/occ_patches_6.3	2011-05-31 18:03:55 UTC (rev 4898)
+++ cgm/trunk/geom/OCC/occ_patches_6.3	2011-05-31 18:14:55 UTC (rev 4899)
@@ -91,4 +91,28 @@
 
    // write end of pipe is unbuffered also
 
+--- /src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx      2011-05-27 13:14:09.000000000 -0500
++++ BRepBuilderAPI_Collect.cxx  2011-05-27 13:15:36.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) {
+

Modified: cgm/trunk/geom/OCC/occ_patches_6.5
===================================================================
--- cgm/trunk/geom/OCC/occ_patches_6.5	2011-05-31 18:03:55 UTC (rev 4898)
+++ cgm/trunk/geom/OCC/occ_patches_6.5	2011-05-31 18:14:55 UTC (rev 4899)
@@ -67,3 +67,28 @@
    if (V1 < 0.) { V1 += 2. * PI; }
    if (V2 < 0.) { V2 += 2. * PI; }
 
+--- /src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx      2011-05-27 13:14:09.000000000 -0500
++++ BRepBuilderAPI_Collect.cxx  2011-05-27 13:15:36.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);