Author: janehu Date: 2011-03-25 14:32:00 -0500 (Fri, 25 Mar 2011) New Revision: 4652 Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp cgm/branches/merge-cubit12/test/makept.cpp cgm/branches/merge-cubit12/test/modify.cpp cgm/branches/merge-cubit12/test/operation.cpp Log: Updated cubit12 branch for prototypes of history track; made some minor changes. make check passed 10 testcases, failed makept, modify and test_occ. Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp 2011-03-25 18:16:55 UTC (rev 4651) +++ cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp 2011-03-25 19:32:00 UTC (rev 4652) @@ -295,6 +295,15 @@ bodies.append(myBodyPtr); } +BodySM* OCCLump::get_body() const +{ + if(mySheetSurface) + return mySheetSurface->my_body(); + if(myShell) + return myShell->my_body(); + return myBodyPtr; +} + void OCCLump::get_children_virt(DLIList<TopologyBridge*> &shellsms) { if (mySheetSurface) Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp 2011-03-25 18:16:55 UTC (rev 4651) +++ cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp 2011-03-25 19:32:00 UTC (rev 4652) @@ -140,7 +140,7 @@ virtual void get_parents_virt( DLIList<TopologyBridge*>& parents ); virtual void get_children_virt( DLIList<TopologyBridge*>& children ); - inline BodySM* get_body() const { return myBodyPtr; } + BodySM* get_body() const; inline void remove_body() {myBodyPtr = 0;} Modified: cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2011-03-25 18:16:55 UTC (rev 4651) +++ cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2011-03-25 19:32:00 UTC (rev 4652) @@ -131,6 +131,7 @@ #include "OCCCurve.hpp" #include "OCCPoint.hpp" #include "OCCAttribSet.hpp" +#include "OCCHistory.hpp" #include "CubitFileIOWrapper.hpp" #include "Body.hpp" #include "GfxDebug.hpp" @@ -1737,6 +1738,17 @@ //=============================================================================== BodySM* OCCModifyEngine::copy_body ( BodySM* bodyPtr ) const {