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

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-01-14 09:12:08 -0600 (Fri, 14 Jan 2011)
New Revision: 4438

Modified:
   cgm/trunk/geom/OCC/OCCBody.cpp
   cgm/trunk/geom/OCC/OCCBody.hpp
   cgm/trunk/geom/OCC/OCCCurve.cpp
   cgm/trunk/geom/OCC/OCCCurve.hpp
   cgm/trunk/geom/OCC/OCCLoop.cpp
   cgm/trunk/geom/OCC/OCCLoop.hpp
   cgm/trunk/geom/OCC/OCCLump.cpp
   cgm/trunk/geom/OCC/OCCLump.hpp
   cgm/trunk/geom/OCC/OCCModifyEngine.cpp
   cgm/trunk/geom/OCC/OCCPoint.cpp
   cgm/trunk/geom/OCC/OCCPoint.hpp
   cgm/trunk/geom/OCC/OCCQueryEngine.cpp
   cgm/trunk/geom/OCC/OCCQueryEngine.hpp
   cgm/trunk/geom/OCC/OCCShell.cpp
   cgm/trunk/geom/OCC/OCCShell.hpp
   cgm/trunk/geom/OCC/OCCSurface.cpp
   cgm/trunk/geom/OCC/OCCSurface.hpp
   cgm/trunk/geom/OCC/occ_patches
Log:
Added scale with vector function in OCC system, scale part passed mcnp2cad/tests for INP-torus, imprinting still failed in this test.

Modified: cgm/trunk/geom/OCC/OCCBody.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCBody.cpp	2011-01-13 18:44:54 UTC (rev 4437)
+++ cgm/trunk/geom/OCC/OCCBody.cpp	2011-01-14 15:12:08 UTC (rev 4438)
@@ -39,7 +39,9 @@
 
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
+#include "BRepBuilderAPI_ModifyShape.hxx"
 #include "BRepBuilderAPI_Transform.hxx"
+#include "BRepBuilderAPI_GTransform.hxx"
 #include "TopTools_DataMapOfShapeInteger.hxx"
 #include "TopTools_ListIteratorOfListOfShape.hxx"
 #include "gp_Ax1.hxx"
@@ -327,20 +329,18 @@
     OCCSurface* surface = mySheetSurfaces.get_and_step();
     TopoDS_Face * face = surface->get_TopoDS_Face();
     aBRepTrsf.Perform(*face);
-    OCCQueryEngine::instance()->update_entity_shape(surface, &aBRepTrsf);
   }
+
   for(int i = 0; i <myShells.size() ; i++)
   {
     OCCShell* occ_shell = myShells.get_and_step();
     TopoDS_Shell* shell = occ_shell->get_TopoDS_Shell();
     aBRepTrsf.Perform(*shell);
-    update_OCC_entity(&aBRepTrsf);
   }
 
   if(myTopoDSShape != NULL)
   {
     aBRepTrsf.Perform(*myTopoDSShape);
-    update_OCC_entity(&aBRepTrsf);
   }
 
   else
@@ -350,9 +350,10 @@
       OCCLump* occ_lump = CAST_TO(myLumps.get_and_step(), OCCLump);
       TopoDS_Solid* solid = occ_lump->get_TopoDS_Solid();
       aBRepTrsf.Perform(*solid);
-      update_OCC_entity(&aBRepTrsf); 
     }
   } 
+
+  update_OCC_entity(&aBRepTrsf);
   // calculate for bounding box
   update_bounding_box();
   
@@ -372,26 +373,57 @@
   aTrsf.SetScaleFactor(scale_factor);