Author: janehu Date: 2010-08-18 09:11:47 -0500 (Wed, 18 Aug 2010) New Revision: 4094 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCBody.hpp cgm/trunk/geom/OCC/OCCDrawTool.cpp cgm/trunk/geom/OCC/OCCLump.cpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.hpp cgm/trunk/geom/OCC/OCCShell.cpp cgm/trunk/geom/OCC/OCCSurface.cpp Log: Fix a special case for imprint operation for INP-box3 case in mcnp2cad. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2010-08-17 20:39:08 UTC (rev 4093) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2010-08-18 14:11:47 UTC (rev 4094) @@ -52,13 +52,14 @@ #include "BRepGProp.hxx" #include "Standard_Boolean.hxx" #include "LocOpe_SplitShape.hxx" +#include "TopoDS_Compound.hxx" //------------------------------------------------------------------------- // Purpose : A constructor with a list of lumps that are attached. // // Special Notes : // //------------------------------------------------------------------------- -OCCBody::OCCBody(TopoDS_CompSolid *theShape, CubitBoolean isSheetBody, +OCCBody::OCCBody(TopoDS_Compound *theShape, CubitBoolean isSheetBody, OCCSurface* surface, OCCShell* shell) { myTopoDSShape = theShape; @@ -82,45 +83,45 @@ myLumps += my_lumps; } -void OCCBody::set_TopoDS_Shape( TopoDS_CompSolid theshape) +void OCCBody::set_TopoDS_Shape( TopoDS_Compound theshape) { if(theshape.IsEqual(*myTopoDSShape)) return; - TopoDS_CompSolid * the_comp = new TopoDS_CompSolid(theshape); + TopoDS_Compound * the_comp = new TopoDS_Compound(theshape); if(myTopoDSShape) - delete (TopoDS_CompSolid*)myTopoDSShape; + delete (TopoDS_Compound*)myTopoDSShape; myTopoDSShape = the_comp; } OCCBody::OCCBody(DLIList<Lump*>& my_lumps) { myLumps += my_lumps; - TopoDS_CompSolid* new_top = make_CompSolid(my_lumps); + TopoDS_Compound* new_top = make_Compound(my_lumps); myTopoDSShape = new_top; IsSheetBody = CUBIT_FALSE; myShell = NULL; update_bounding_box(); } -TopoDS_CompSolid* OCCBody::make_CompSolid(DLIList<Lump*>& my_lumps) +TopoDS_Compound* OCCBody::make_Compound(DLIList<Lump*>& my_lumps)