March 2011 - cgma-dev - mailman3.cels.anl.gov

r4699 - cgm/branches/merge-cubit12/test
by jiangtao_ma＠yahoo.com 31 Mar '11

31 Mar '11

Author: janehu Date: 2011-03-31 13:37:02 -0500 (Thu, 31 Mar 2011) New Revision: 4699 Modified: cgm/branches/merge-cubit12/test/makept.cpp Log: Made calling adjustment for cubit12 updates; commented out curve creation from points and tangents test. This new added function in cubit 12 is not quite working yet, and there's a ticket 242 against it right now. Modified: cgm/branches/merge-cubit12/test/makept.cpp =================================================================== --- cgm/branches/merge-cubit12/test/makept.cpp 2011-03-31 18:08:27 UTC (rev 4698) +++ cgm/branches/merge-cubit12/test/makept.cpp 2011-03-31 18:37:02 UTC (rev 4699) @@ -300,9 +300,9 @@ //without checking for duplicates, so clean_out first. gti->get_free_ref_entities(free_entities); - RefVertex* vertex1 = CAST_TO(free_entities.get_and_step(),RefVertex); - RefVertex* vertex2 = CAST_TO(free_entities.get_and_step(),RefVertex); - RefVertex* vertex3 = CAST_TO(free_entities.get(),RefVertex); + RefVertex* vertex1 = CAST_TO(free_entities.step_and_get(),RefVertex); + RefVertex* vertex2 = CAST_TO(free_entities.step_and_get(),RefVertex); + RefVertex* vertex3 = CAST_TO(free_entities.step_and_get(),RefVertex); CubitBoolean is_equal = gti-> about_spatially_equal(vertex1,vertex2); assert(is_equal == CUBIT_FAILURE); @@ -319,12 +319,12 @@ vi = bodies.get()->center_point(); //first body's bounding box's center point. - min.set(16.67, 0, 14.58); + min.set(6.67, 0, 14.58); assert(vi.distance_between(min) < 0.01 ); CubitBox box = bodies.get()->bounding_box(); - min.set(-1.5894,-11.58944, 7.79849); - max.set(34.9303,11.58944,21.3615); + min.set(-11.5894,-11.58944, 7.79849); + max.set(24.9303,11.58944,21.3615); test_box.reset(min,max); assert(box >= test_box); test_box *= 1.01; @@ -333,7 +333,7 @@ gti->entity_entity_distance(gti->get_first_ref_volume(), vertex2,vi, vii,d); //first body and vertex2 's minimum distance(d) and locations for the minimum. - assert(d <11.8607 && d > 11.8606); + assert(d <3.64214 && d > 3.64213); // test create a Compound body. test_bodies.clean_out(); @@ -364,7 +364,7 @@ vi = CompBody->center_point(); gti->translate(CompBody,axis); vii =CompBody->center_point(); - assert(vii - vi == axis); + assert(axis.about_equal(vii - vi) ); // After parellel move, center point moved by x (10) vi = CompBody->center_point();

1 0

r4689 - cgm/branches/merge-cubit12/test
by jiangtao_ma＠yahoo.com 30 Mar '11

30 Mar '11

Author: janehu Date: 2011-03-30 11:40:13 -0500 (Wed, 30 Mar 2011) New Revision: 4689 Modified: cgm/branches/merge-cubit12/test/modify.cpp Log: In cubit 12 version, sweep functions don't return created body and change the test case to find it gobally. Modified: cgm/branches/merge-cubit12/test/modify.cpp =================================================================== --- cgm/branches/merge-cubit12/test/modify.cpp 2011-03-30 14:20:30 UTC (rev 4688) +++ cgm/branches/merge-cubit12/test/modify.cpp 2011-03-30 16:40:13 UTC (rev 4689) @@ -1013,7 +1013,10 @@ RefFace* rotate_face = gmti->make_RefFace(sweep_face); gmti->sweep_translational(refentities, v_move8, 0, 1, CUBIT_FALSE, CUBIT_FALSE); - body = CAST_TO(refentities.get(), Body); + bodies.clean_out(); + gti->bodies(bodies); + bodies.last(); + body = bodies.get(); d = body->measure(); assert(d - 39.2699 < 0.0001 && d >39.2699); @@ -1021,7 +1024,10 @@ refentities.append(draft_face); CubitVector v_move8ii(0,0,10); gmti->sweep_translational(refentities, v_move8ii, 0.087, 1, CUBIT_FALSE, CUBIT_FALSE); - body = CAST_TO(refentities.get(), Body); + bodies.clean_out(); + gti->bodies(bodies); + bodies.last(); + body = bodies.get(); d = body->measure(); //d = 66.3676 theoretical calculation is 66.7833, error 0.62% assert(d - 66.3676 < 0.0001 && d > 66.3676); @@ -1030,7 +1036,10 @@ refentities.clean_out(); refentities.append(draft_face2); gmti->sweep_translational(refentities, v_move8ii, 0.087, 1, CUBIT_FALSE, CUBIT_FALSE); - body = CAST_TO(refentities.get(), Body); + bodies.clean_out(); + gti->bodies(bodies); + bodies.last(); + body = bodies.get(); d = body->measure(); //d = 66.3676 theoretical calculation is 66.7833, error 0.62% assert(d - 66.3676 < 0.0001 && d > 66.3676); @@ -1041,7 +1050,10 @@ refentities.clean_out(); refentities.append(edges.get()); gmti->sweep_translational(refentities, v_move8ii, 0.087, 1, CUBIT_FALSE, CUBIT_FALSE); - body = CAST_TO(refentities.get(), Body); + bodies.clean_out(); + gti->bodies(bodies); + bodies.last(); + body = bodies.get(); d = body->measure(); //d = area = 90.1292 theoretica calculation is 90.5754, error 0.49%

1 0

r4681 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 29 Mar '11

29 Mar '11

Author: janehu Date: 2011-03-29 13:42:13 -0500 (Tue, 29 Mar 2011) New Revision: 4681 Added: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo cgm/branches/merge-cubit12/geom/OCC/OCCHistory.o Modified: cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp cgm/branches/merge-cubit12/geom/OCC/OCCLoop.cpp cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp cgm/branches/merge-cubit12/geom/OCC/OCCPoint.cpp cgm/branches/merge-cubit12/geom/OCC/OCCShell.cpp cgm/branches/merge-cubit12/geom/OCC/OCCSurface.cpp Log: Restore to previous version in fear of breaking other code. Will change test case for it. Modified: cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp 2011-03-29 17:54:57 UTC (rev 4680) +++ cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp 2011-03-29 18:42:13 UTC (rev 4681) @@ -182,7 +182,10 @@ OCCBody::~OCCBody() { if (myTopoDSShape) + { delete (TopoDS_Compound*)myTopoDSShape; + myTopoDSShape = NULL; + } } GeometryQueryEngine* OCCBody::get_geometry_query_engine() const Modified: cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp 2011-03-29 17:54:57 UTC (rev 4680) +++ cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp 2011-03-29 18:42:13 UTC (rev 4681) @@ -114,7 +114,10 @@ OCCCurve::~OCCCurve() { if (myTopoDSEdge) + { delete (TopoDS_Edge *)myTopoDSEdge; + myTopoDSEdge = NULL; + } } void OCCCurve::set_TopoDS_Edge(TopoDS_Edge edge) Added: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo (rev 0) +++ cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo 2011-03-29 18:42:13 UTC (rev 4681) @@ -0,0 +1,12 @@ +# OCCHistory.lo - a libtool object file +# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object=none + +# Name of the non-PIC object +non_pic_object='OCCHistory.o' + Added: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.o

1 0

r4680 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 29 Mar '11

29 Mar '11

Author: janehu Date: 2011-03-29 12:54:57 -0500 (Tue, 29 Mar 2011) New Revision: 4680 Modified: cgm/branches/merge-cubit12/geom/OCC/occ_patches Log: make more general check for boundary parameters handling for all kinds, fixed test_occ failure in cubit12. Modified: cgm/branches/merge-cubit12/geom/OCC/occ_patches =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/occ_patches 2011-03-29 17:53:53 UTC (rev 4679) +++ cgm/branches/merge-cubit12/geom/OCC/occ_patches 2011-03-29 17:54:57 UTC (rev 4680) @@ -1,19 +1,45 @@ ---- ros/src/Extrema/Extrema_ExtPElS.cxx 2002-04-23 11:10:21.000000000 -0500 -+++ /home/jhu/occ6.3/OpenCASCADE6.3.0/ros/src/Extrema/Extrema_ExtPElS.cxx 2008-10-08 12:56:22.000000000 -0500 -@@ -311,6 +311,7 @@ +--- ros/src/Extrema/Extrema_ExtPElS.cxx 2011-03-29 11:35:08.000000000 -0500 ++++ /mnt/disk2b/jhu/tempdir/OpenCASCADE6.3.0/ros/src/Extrema/Extrema_ExtPElS.cxx 2002-04-23 11:10:21.000000000 -0500 +@@ -56,7 +56,6 @@ 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; } + + gp_Pnt Ps; +@@ -158,9 +157,7 @@ + B = MP.Angle(DirZ); + if (!Same) { U1 += PI; } + U2 = U1 + PI; +- if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * PI; } +- if (U2 - 2.*PI < Tol && U2 > 2.*PI) {U2 = 2. * PI; } + if (U2 > 2.*PI) { U2 -= 2. * PI; } + B = MP.Angle(DirZ); + A = Abs(A); +@@ -250,7 +247,6 @@ + gp_Vec myZ = Pos.XDirection()^Pos.YDirection(); + U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ); + U2 = U1 + PI; +- if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * PI; } + V = OP.Angle(OPp); + if (Zp < 0.) { V = -V; } +@@ -315,7 +311,6 @@ + gp_Vec myZ = Pos.XDirection()^Pos.YDirection(); Standard_Real U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ); Standard_Real U2 = U1 + PI; -+ if(U1 > -Tol && U1 < 0.) {U1 = 0.;} +- if(U1 > -Tol && U1 < 0.) {U1 = 0.;} if (U1 < 0.) { U1 += 2. * PI; } gp_Vec OO1 = OPp.Divided(R).Multiplied(S.MajorRadius()); gp_Vec OO2 = OO1.Multiplied(-1.); -@@ -322,6 +323,8 @@ - +@@ -327,8 +322,6 @@ + Standard_Real V1 = OO1.AngleWithRef(gp_Vec(O1,P),OO1.Crossed(OZ)); Standard_Real V2 = OO2.AngleWithRef(gp_Vec(P,O2),OO2.Crossed(OZ));

1 0

r4679 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 29 Mar '11

29 Mar '11

Author: janehu Date: 2011-03-29 12:53:53 -0500 (Tue, 29 Mar 2011) New Revision: 4679 Modified: cgm/trunk/geom/OCC/occ_patches Log: make more general check for boundary parameters handling for all kinds, fixed test_occ failure in cubit12. Modified: cgm/trunk/geom/OCC/occ_patches =================================================================== --- cgm/trunk/geom/OCC/occ_patches 2011-03-29 15:50:32 UTC (rev 4678) +++ cgm/trunk/geom/OCC/occ_patches 2011-03-29 17:53:53 UTC (rev 4679) @@ -1,19 +1,45 @@ ---- ros/src/Extrema/Extrema_ExtPElS.cxx 2002-04-23 11:10:21.000000000 -0500 -+++ /home/jhu/occ6.3/OpenCASCADE6.3.0/ros/src/Extrema/Extrema_ExtPElS.cxx 2008-10-08 12:56:22.000000000 -0500 -@@ -311,6 +311,7 @@ +--- ros/src/Extrema/Extrema_ExtPElS.cxx 2011-03-29 11:35:08.000000000 -0500 ++++ /mnt/disk2b/jhu/tempdir/OpenCASCADE6.3.0/ros/src/Extrema/Extrema_ExtPElS.cxx 2002-04-23 11:10:21.000000000 -0500 +@@ -56,7 +56,6 @@ 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; } + + gp_Pnt Ps; +@@ -158,9 +157,7 @@ + B = MP.Angle(DirZ); + if (!Same) { U1 += PI; } + U2 = U1 + PI; +- if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * PI; } +- if (U2 - 2.*PI < Tol && U2 > 2.*PI) {U2 = 2. * PI; } + if (U2 > 2.*PI) { U2 -= 2. * PI; } + B = MP.Angle(DirZ); + A = Abs(A); +@@ -250,7 +247,6 @@ + gp_Vec myZ = Pos.XDirection()^Pos.YDirection(); + U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ); + U2 = U1 + PI; +- if(U1 > -Tol && U1 < 0.) {U1 = 0.;} + if (U1 < 0.) { U1 += 2. * PI; } + V = OP.Angle(OPp); + if (Zp < 0.) { V = -V; } +@@ -315,7 +311,6 @@ + gp_Vec myZ = Pos.XDirection()^Pos.YDirection(); Standard_Real U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ); Standard_Real U2 = U1 + PI; -+ if(U1 > -Tol && U1 < 0.) {U1 = 0.;} +- if(U1 > -Tol && U1 < 0.) {U1 = 0.;} if (U1 < 0.) { U1 += 2. * PI; } gp_Vec OO1 = OPp.Divided(R).Multiplied(S.MajorRadius()); gp_Vec OO2 = OO1.Multiplied(-1.); -@@ -322,6 +323,8 @@ - +@@ -327,8 +322,6 @@ + Standard_Real V1 = OO1.AngleWithRef(gp_Vec(O1,P),OO1.Crossed(OZ)); Standard_Real V2 = OO2.AngleWithRef(gp_Vec(P,O2),OO2.Crossed(OZ));

1 0

r4678 - cgm/branches/merge-cubit12/geom
by jiangtao_ma＠yahoo.com 29 Mar '11

29 Mar '11

Author: janehu Date: 2011-03-29 10:50:32 -0500 (Tue, 29 Mar 2011) New Revision: 4678 Modified: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp Log: several sweep functions are not returning the created entity in the cubit12 version, just added this part and fixed modify test case. Modified: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-29 15:21:46 UTC (rev 4677) +++ cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-29 15:50:32 UTC (rev 4678) @@ -3851,6 +3851,15 @@ CubitUndo::note_result_bodies( output_body_list ); } + body_list.clean_out(); + for(int i = 0; i < result_list.size(); i++) + { + Body* body = CAST_TO(result_list.get_and_step()->topology_entity(),Body ); + if(body) + body_list.append(body); + } + CAST_LIST( body_list, ref_ent_list, RefEntity); + return status; } @@ -3908,6 +3917,14 @@ CubitUndo::note_result_bodies( output_body_list ); } + body_list.clean_out(); + for(int i = 0; i < result_list.size(); i++) + { + Body* body = CAST_TO(result_list.get_and_step()->topology_entity(),Body ); + if(body) + body_list.append(body); + } + CAST_LIST( body_list, ref_ent_list, RefEntity); return status; } @@ -4793,6 +4810,14 @@ CubitUndo::note_result_bodies( output_body_list ); } + body_list.clean_out(); + for(int i = 0; i < result_list.size(); i++) + { + Body* body = CAST_TO(result_list.get_and_step()->topology_entity(),Body ); + if(body) + body_list.append(body); + } + CAST_LIST( body_list, ref_ent_list, RefEntity); return status; } CubitStatus GeometryModifyTool::sweep_along_curve(DLIList<RefEntity*>& ref_ent_list, @@ -4854,6 +4879,14 @@

1 0

r4677 - cgm/branches/merge-cubit12/geom
by jiangtao_ma＠yahoo.com 29 Mar '11

29 Mar '11

Author: janehu Date: 2011-03-29 10:21:46 -0500 (Tue, 29 Mar 2011) New Revision: 4677 Modified: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp Log: Separate finish_sm_op status and operation status for correct status report. Modified: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-29 13:58:28 UTC (rev 4676) +++ cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-29 15:21:46 UTC (rev 4677) @@ -6556,7 +6556,7 @@ DLIList<BodySM*> new_sms; CubitStatus result = engine->intersect(tool_sm, from_sm_list, new_sms, keep_old ); - result = finish_sm_op(tem_bodies, new_sms, new_bodies); + CubitStatus result2 = finish_sm_op(tem_bodies, new_sms, new_bodies); if( CubitUndo::get_undo_enabled() ) { @@ -6566,7 +6566,7 @@ CubitUndo::remove_last_undo(); } - if ( result == CUBIT_FAILURE ) + if ( result == CUBIT_FAILURE || result2 == CUBIT_FAILURE) { PRINT_ERROR("Intersect FAILED\n" ); return CUBIT_FAILURE; @@ -7219,7 +7219,7 @@ while(temporary_bridges.size()) delete temporary_bridges.pop(); - status = finish_sm_op(body_list, new_sm_list, new_body_list); + CubitStatus status2 = finish_sm_op(body_list, new_sm_list, new_body_list); if(process_composites) do_attribute_cleanup(); @@ -7231,8 +7231,13 @@ else CubitUndo::remove_last_undo(); } + + if( status == CUBIT_SUCCESS && status2 == CUBIT_SUCCESS) + return status; + + else + return CUBIT_FAILURE; - return status; } CubitStatus GeometryModifyTool::imprint( DLIList<Surface*> &surface_list, @@ -7400,7 +7405,7 @@ remove_pushed_attributes(body_sm_list, old_body_list); } - status = finish_sm_op(old_body_list, new_sm_list, new_body_list);

1 0

r4668 - cgm/branches/merge-cubit12/geom
by jiangtao_ma＠yahoo.com 28 Mar '11

28 Mar '11

Author: janehu Date: 2011-03-28 13:33:59 -0500 (Mon, 28 Mar 2011) New Revision: 4668 Modified: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp Log: in subtract function, subtract and finish_sm_op can independently return success or failure, so set them differently. Modified: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-28 18:31:31 UTC (rev 4667) +++ cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-28 18:33:59 UTC (rev 4668) @@ -6370,7 +6370,7 @@ if( CubitUndo::get_undo_enabled() && result == CUBIT_FAILURE ) CubitUndo::remove_last_undo(); - result = finish_sm_op(tem_bodies, new_sms, new_bodies); + CubitStatus result2 = finish_sm_op(tem_bodies, new_sms, new_bodies); if( CubitUndo::get_undo_enabled() ) { @@ -6380,7 +6380,7 @@ CubitUndo::remove_last_undo(); } - if ( result == CUBIT_FAILURE ) + if ( result == CUBIT_FAILURE || result2 == CUBIT_FAILURE) { PRINT_ERROR("Subtract FAILED\n" ); return CUBIT_FAILURE;

1 0

[PATCH] API and linking changes for OpenCascade-6.5.0
by Jed Brown 26 Mar '11

26 Mar '11

Perhaps these should not be applied directly, but I don't know how you want to handle checking versions and backward compatibility. --- configure.ac | 2 +- geom/OCC/OCCAttribSet.cpp | 11 +++++------ geom/OCC/OCCQueryEngine.cpp | 1 - geom/OCC/OCCShapeAttributeSet.cpp | 7 +++---- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 8994977..1e8a6a4 100644 --- a/configure.ac +++ b/configure.ac @@ -354,7 +354,7 @@ HAVE_OCC_DEF= if test "x$occ_DIR" != "xno"; then OCC_CORE_LIBS="-lTKMesh -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d -lTKG2d -lTKMath -lTKernel" OCC_GEOM_LIBS="-lTKHLR -lTKOffset -lTKShHealing -lTKFillet -lTKFeat -lTKBool -lTKBO -lTKPrim" - OCC_LCAF_LIBS="-lTKBinL -lTKLCAF -lTKCDF" + OCC_LCAF_LIBS="-lTKBinL -lTKLCAF -lTKCDF -lTKCAF" OCC_LIBS="$OCC_LCAF_LIBS $OCC_GEOM_LIBS $OCC_CORE_LIBS" CUBIT_OCC_LIB="-lcubit_OCC" OCC_STEP_LIBS="-lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKXSBase" diff --git a/geom/OCC/OCCAttribSet.cpp b/geom/OCC/OCCAttribSet.cpp index 36c5c84..b39b8cd 100644 --- a/geom/OCC/OCCAttribSet.cpp +++ b/geom/OCC/OCCAttribSet.cpp @@ -15,17 +15,16 @@ #include "OCCQueryEngine.hpp" #include "CubitSimpleAttrib.hpp" #include "CubitFileIOWrapper.hpp" -#include "Handle_TDataStd_Shape.hxx" #include "TCollection_ExtendedString.hxx" #include "Handle_TDataStd_Name.hxx" #include "Handle_TDataStd_ExtStringArray.hxx" #include "Handle_TDataStd_RealArray.hxx" #include "Handle_TDataStd_IntegerArray.hxx" +#include "TDataXtd_Shape.hxx" #include "TDataStd_Name.hxx" #include "TDataStd_ExtStringArray.hxx" #include "TDataStd_RealArray.hxx" #include "TDataStd_IntegerArray.hxx" -#include "TDataStd_Shape.hxx" #include "TopoDS_Shape.hxx" #include "TDF_ChildIterator.hxx" #include <vector> @@ -40,9 +39,9 @@ void OCCAttribSet::FindShape(TopoDS_Shape& shape, //find the same shape attribute first aLabel = it1.Value(); - Handle_TDataStd_Shape attr_shape; + Handle_TDataXtd_Shape attr_shape; TopoDS_Shape old_shape; - if(aLabel.FindAttribute(TDataStd_Shape::GetID(), attr_shape)) + if(aLabel.FindAttribute(TDataXtd_Shape::GetID(), attr_shape)) old_shape = attr_shape->Get(aLabel); if(old_shape.IsPartner(shape)) { @@ -64,10 +63,10 @@ void OCCAttribSet::append_attribute( CubitSimpleAttrib* csa, TopoDS_Shape& shape if(!found) { aLabel = OCCQueryEngine::instance()->mainLabel.NewChild(); - Handle_TDataStd_Shape attr_shape = TDataStd_Shape::Set(aLabel, shape); + Handle_TDataXtd_Shape attr_shape = TDataXtd_Shape::Set(aLabel, shape); //myLabel.AddAttribute(attr_shape); //test if the attribute has been attached - assert(aLabel.IsAttribute(TDataStd_Shape::GetID())); + assert(aLabel.IsAttribute(TDataXtd_Shape::GetID())); } //2. add type attribute , below attributes are added on child lable of myLabel diff --git a/geom/OCC/OCCQueryEngine.cpp b/geom/OCC/OCCQueryEngine.cpp index 6be36a3..ed5c6fc 100644 --- a/geom/OCC/OCCQueryEngine.cpp +++ b/geom/OCC/OCCQueryEngine.cpp @@ -107,7 +107,6 @@ #include <BndLib_AddSurface.hxx> #include <Precision.hxx> #include <BRepAdaptor_Surface.hxx> -#include <TDataStd_Shape.hxx> #include <TDF_ChildIterator.hxx> #include <BinTools_ShapeSet.hxx> #include "Standard_Boolean.hxx" diff --git a/geom/OCC/OCCShapeAttributeSet.cpp b/geom/OCC/OCCShapeAttributeSet.cpp index ee87c61..95e3e05 100644 --- a/geom/OCC/OCCShapeAttributeSet.cpp +++ b/geom/OCC/OCCShapeAttributeSet.cpp @@ -22,7 +22,6 @@ #include <Handle_BRep_GCurve.hxx> #include <BRep_Tool.hxx> #include <TDF_ChildIterator.hxx> -#include <Handle_TDataStd_Shape.hxx> #include <TopTools_LocationSet.hxx> #include <TopTools_IndexedMapOfShape.hxx> #include <TopoDS_Iterator.hxx> @@ -42,7 +41,7 @@ #include <BRep_PointOnSurface.hxx> //#include <BRep_ListIteratorOfListOfPointRepresentation.hxx> #include <TDF_Label.hxx> -#include <TDataStd_Shape.hxx> +#include <TDataXtd_Shape.hxx> #include <Handle_TDataStd_Name.hxx> #include <TDataStd_Name.hxx> #include <Handle_TDataStd_ExtStringArray.hxx> @@ -507,9 +506,9 @@ void OCCShapeAttributeSet::WriteAttribute(const TopoDS_Shape& S, //find the same shape attribute first myLabel = it1.Value(); - Handle_TDataStd_Shape attr_shape; + Handle_TDataXtd_Shape attr_shape; TopoDS_Shape exsiting_shape; - if(TDataStd_Shape::Find(myLabel, attr_shape)) + if(TDataXtd_Shape::Find(myLabel, attr_shape)) exsiting_shape = attr_shape->Get(myLabel); if(!exsiting_shape.IsNull()) -- 1.7.4.1

1 0

r4655 - in cgm/branches/merge-cubit12: . geom/OCC
by tautges＠mcs.anl.gov 25 Mar '11

25 Mar '11

Author: tautges Date: 2011-03-25 15:26:31 -0500 (Fri, 25 Mar 2011) New Revision: 4655 Modified: cgm/branches/merge-cubit12/configure.ac cgm/branches/merge-cubit12/geom/OCC/Makefile.am Log: Adding OCCHistory to list of files; adding a few libraries to the list, same as was done in trunk last week or so. Modified: cgm/branches/merge-cubit12/configure.ac =================================================================== --- cgm/branches/merge-cubit12/configure.ac 2011-03-25 19:46:13 UTC (rev 4654) +++ cgm/branches/merge-cubit12/configure.ac 2011-03-25 20:26:31 UTC (rev 4655) @@ -404,7 +404,7 @@ if test "x$occ_DIR" != "xno"; then OCC_CORE_LIBS="-lTKMesh -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d -lTKG2d -lTKMath -lTKernel" OCC_GEOM_LIBS="-lTKHLR -lTKOffset -lTKShHealing -lTKFillet -lTKFeat -lTKBool -lTKBO -lTKPrim" - OCC_LCAF_LIBS="-lTKLCAF -lTKBinL" + OCC_LCAF_LIBS="-lTKBinL -lTKLCAF -lTKCDF" OCC_LIBS="$OCC_LCAF_LIBS $OCC_GEOM_LIBS $OCC_CORE_LIBS" CUBIT_OCC_LIB="-lcubit_OCC" OCC_STEP_LIBS="-lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKXSBase" Modified: cgm/branches/merge-cubit12/geom/OCC/Makefile.am =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/Makefile.am 2011-03-25 19:46:13 UTC (rev 4654) +++ cgm/branches/merge-cubit12/geom/OCC/Makefile.am 2011-03-25 20:26:31 UTC (rev 4655) @@ -19,6 +19,7 @@ OCCCoEdge.cpp \ OCCCoFace.cpp \ OCCCurve.cpp \ + OCCHistory.cpp \ OCCLoop.cpp \ OCCLump.cpp \ OCCModifyEngine.cpp \ @@ -38,6 +39,7 @@ OCCCoFace.hpp \ OCCCurve.hpp \ OCCGeometryCreator.hpp \ + OCCHistory.hpp \ OCCLoop.hpp \ OCCLump.hpp \ OCCModifyEngine.hpp \

1 0