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

buildbot failure in cgm-occ: failed test
by cgma-dev＠mcs.anl.gov 24 Apr '11

24 Apr '11

1 0

buildbot failure in cgm-occ: failed test
by cgma-dev＠mcs.anl.gov 23 Apr '11

23 Apr '11

1 0

buildbot failure in cgm-occ: failed test
by cgma-dev＠mcs.anl.gov 22 Apr '11

22 Apr '11

1 0

r4770 - cgm/branches/merge-cubit12/itaps
by jvporter＠wisc.edu 21 Apr '11

21 Apr '11

Author: jvporter Date: 2011-04-21 15:22:53 -0500 (Thu, 21 Apr 2011) New Revision: 4770 Modified: cgm/branches/merge-cubit12/itaps/iBase_f.h cgm/branches/merge-cubit12/itaps/iGeomError.cc Log: Fix a few missing iBase changes Modified: cgm/branches/merge-cubit12/itaps/iBase_f.h =================================================================== --- cgm/branches/merge-cubit12/itaps/iBase_f.h 2011-04-21 20:22:37 UTC (rev 4769) +++ cgm/branches/merge-cubit12/itaps/iBase_f.h 2011-04-21 20:22:53 UTC (rev 4770) @@ -43,7 +43,6 @@ integer iBase_SUCCESS integer iBase_MESH_ALREADY_LOADED - integer iBase_NO_MESH_DATA integer iBase_FILE_NOT_FOUND integer iBase_FILE_WRITE_ERROR integer iBase_NIL_ARRAY @@ -68,28 +67,27 @@ parameter (iBase_SUCCESS = 0) parameter (iBase_MESH_ALREADY_LOADED = 1) - parameter (iBase_NO_MESH_DATA = 2) - parameter (iBase_FILE_NOT_FOUND = 3) - parameter (iBase_FILE_WRITE_ERROR = 4) - parameter (iBase_NIL_ARRAY = 5) - parameter (iBase_BAD_ARRAY_SIZE = 6) - parameter (iBase_BAD_ARRAY_DIMENSION = 7) - parameter (iBase_INVALID_ENTITY_HANDLE = 8) - parameter (iBase_INVALID_ENTITY_COUNT = 9) - parameter (iBase_INVALID_ENTITY_TYPE = 10) - parameter (iBase_INVALID_ENTITY_TOPOLOGY = 11) - parameter (iBase_BAD_TYPE_AND_TOPO = 12) - parameter (iBase_ENTITY_CREATION_ERROR = 13) - parameter (iBase_INVALID_TAG_HANDLE = 14) - parameter (iBase_TAG_NOT_FOUND = 15) - parameter (iBase_TAG_ALREADY_EXISTS = 16) - parameter (iBase_TAG_IN_USE = 17) - parameter (iBase_INVALID_ENTITYSET_HANDLE = 18) - parameter (iBase_INVALID_ITERATOR_HANDLE = 19) - parameter (iBase_INVALID_ARGUMENT = 20) - parameter (iBase_MEMORY_ALLOCATION_FAILED = 21) - parameter (iBase_NOT_SUPPORTED = 22) - parameter (iBase_FAILURE = 23) + parameter (iBase_FILE_NOT_FOUND = 2) + parameter (iBase_FILE_WRITE_ERROR = 3) + parameter (iBase_NIL_ARRAY = 4) + parameter (iBase_BAD_ARRAY_SIZE = 5) + parameter (iBase_BAD_ARRAY_DIMENSION = 6) + parameter (iBase_INVALID_ENTITY_HANDLE = 7) + parameter (iBase_INVALID_ENTITY_COUNT = 8) + parameter (iBase_INVALID_ENTITY_TYPE = 9) + parameter (iBase_INVALID_ENTITY_TOPOLOGY = 10) + parameter (iBase_BAD_TYPE_AND_TOPO = 11) + parameter (iBase_ENTITY_CREATION_ERROR = 12) + parameter (iBase_INVALID_TAG_HANDLE = 13) + parameter (iBase_TAG_NOT_FOUND = 14)

1 0

r4769 - cgm/trunk/itaps
by jvporter＠wisc.edu 21 Apr '11

21 Apr '11

Author: jvporter Date: 2011-04-21 15:22:37 -0500 (Thu, 21 Apr 2011) New Revision: 4769 Modified: cgm/trunk/itaps/iBase_f.h cgm/trunk/itaps/iGeomError.cc Log: Fix a few missing iBase changes Modified: cgm/trunk/itaps/iBase_f.h =================================================================== --- cgm/trunk/itaps/iBase_f.h 2011-04-21 20:12:22 UTC (rev 4768) +++ cgm/trunk/itaps/iBase_f.h 2011-04-21 20:22:37 UTC (rev 4769) @@ -43,7 +43,6 @@ integer iBase_SUCCESS integer iBase_MESH_ALREADY_LOADED - integer iBase_NO_MESH_DATA integer iBase_FILE_NOT_FOUND integer iBase_FILE_WRITE_ERROR integer iBase_NIL_ARRAY @@ -68,28 +67,27 @@ parameter (iBase_SUCCESS = 0) parameter (iBase_MESH_ALREADY_LOADED = 1) - parameter (iBase_NO_MESH_DATA = 2) - parameter (iBase_FILE_NOT_FOUND = 3) - parameter (iBase_FILE_WRITE_ERROR = 4) - parameter (iBase_NIL_ARRAY = 5) - parameter (iBase_BAD_ARRAY_SIZE = 6) - parameter (iBase_BAD_ARRAY_DIMENSION = 7) - parameter (iBase_INVALID_ENTITY_HANDLE = 8) - parameter (iBase_INVALID_ENTITY_COUNT = 9) - parameter (iBase_INVALID_ENTITY_TYPE = 10) - parameter (iBase_INVALID_ENTITY_TOPOLOGY = 11) - parameter (iBase_BAD_TYPE_AND_TOPO = 12) - parameter (iBase_ENTITY_CREATION_ERROR = 13) - parameter (iBase_INVALID_TAG_HANDLE = 14) - parameter (iBase_TAG_NOT_FOUND = 15) - parameter (iBase_TAG_ALREADY_EXISTS = 16) - parameter (iBase_TAG_IN_USE = 17) - parameter (iBase_INVALID_ENTITYSET_HANDLE = 18) - parameter (iBase_INVALID_ITERATOR_HANDLE = 19) - parameter (iBase_INVALID_ARGUMENT = 20) - parameter (iBase_MEMORY_ALLOCATION_FAILED = 21) - parameter (iBase_NOT_SUPPORTED = 22) - parameter (iBase_FAILURE = 23) + parameter (iBase_FILE_NOT_FOUND = 2) + parameter (iBase_FILE_WRITE_ERROR = 3) + parameter (iBase_NIL_ARRAY = 4) + parameter (iBase_BAD_ARRAY_SIZE = 5) + parameter (iBase_BAD_ARRAY_DIMENSION = 6) + parameter (iBase_INVALID_ENTITY_HANDLE = 7) + parameter (iBase_INVALID_ENTITY_COUNT = 8) + parameter (iBase_INVALID_ENTITY_TYPE = 9) + parameter (iBase_INVALID_ENTITY_TOPOLOGY = 10) + parameter (iBase_BAD_TYPE_AND_TOPO = 11) + parameter (iBase_ENTITY_CREATION_ERROR = 12) + parameter (iBase_INVALID_TAG_HANDLE = 13) + parameter (iBase_TAG_NOT_FOUND = 14)

1 0

r4767 - cgm/branches/merge-cubit12/itaps
by jvporter＠wisc.edu 21 Apr '11

21 Apr '11

Author: jvporter Date: 2011-04-21 15:06:14 -0500 (Thu, 21 Apr 2011) New Revision: 4767 Modified: cgm/branches/merge-cubit12/itaps/iBase.h Log: Update iBase.h Modified: cgm/branches/merge-cubit12/itaps/iBase.h =================================================================== --- cgm/branches/merge-cubit12/itaps/iBase.h 2011-04-21 20:06:07 UTC (rev 4766) +++ cgm/branches/merge-cubit12/itaps/iBase.h 2011-04-21 20:06:14 UTC (rev 4767) @@ -88,7 +88,6 @@ iBase_ErrorType_MIN = 0, iBase_SUCCESS = iBase_ErrorType_MIN, iBase_MESH_ALREADY_LOADED, - iBase_NO_MESH_DATA, iBase_FILE_NOT_FOUND, iBase_FILE_WRITE_ERROR, iBase_NIL_ARRAY,

1 0

r4766 - cgm/trunk/itaps
by jvporter＠wisc.edu 21 Apr '11

21 Apr '11

Author: jvporter Date: 2011-04-21 15:06:07 -0500 (Thu, 21 Apr 2011) New Revision: 4766 Modified: cgm/trunk/itaps/iBase.h Log: Update iBase.h Modified: cgm/trunk/itaps/iBase.h =================================================================== --- cgm/trunk/itaps/iBase.h 2011-04-21 20:05:23 UTC (rev 4765) +++ cgm/trunk/itaps/iBase.h 2011-04-21 20:06:07 UTC (rev 4766) @@ -88,7 +88,6 @@ iBase_ErrorType_MIN = 0, iBase_SUCCESS = iBase_ErrorType_MIN, iBase_MESH_ALREADY_LOADED, - iBase_NO_MESH_DATA, iBase_FILE_NOT_FOUND, iBase_FILE_WRITE_ERROR, iBase_NIL_ARRAY,

1 0

buildbot failure in cgm-occ: failed test
by cgma-dev＠mcs.anl.gov 21 Apr '11

21 Apr '11

1 0

r4756 - cgm/branches/merge-cubit12/itaps
by jiangtao_ma＠yahoo.com 20 Apr '11

20 Apr '11

Author: janehu Date: 2011-04-20 12:43:34 -0500 (Wed, 20 Apr 2011) New Revision: 4756 Modified: cgm/branches/merge-cubit12/itaps/testgeom.cc Log: Removed unnecessary part of testing which was comment out before. Per discussion with Tim. Modified: cgm/branches/merge-cubit12/itaps/testgeom.cc =================================================================== --- cgm/branches/merge-cubit12/itaps/testgeom.cc 2011-04-20 17:39:28 UTC (rev 4755) +++ cgm/branches/merge-cubit12/itaps/testgeom.cc 2011-04-20 17:43:34 UTC (rev 4756) @@ -812,43 +812,6 @@ //success = false; //} - // test add, remove and get all entitiy sets using super set - // check GetAllGentitysets works recursively and dosen't return - // multi sets -/* Since it commented the super set part, there's no sense to do following - tests. Hence commented out. - for (int k = 0; k < num_super; k++) { - // add gentity sets of super set to each gentity set of super set - // make multiple child super sets - iBase_EntitySetHandle ges_k = ges_array1[k]; - - for (int a = 0; a < ges_array1.size(); a++) { - iGeom_addEntSet( geom, ges_array1[a], ges_k, &err ); - CHECK( "Problem to add entity set." ); - } - - // add super set to each entity set - // sidl::array<GentitysetHandle> superset_array - //= sidl::array<GentitysetHandle>::create1d(1); - //superset_array.set(0, super_set); - //int num_superset_array; - - iGeom_addEntSet( geom, super_set, ges_k, &err ); - CHECK( "Problem to add super set to gentitysets." ); - - // add one gentity sets multiple times - // HJK: ??? how to deal this case? - //sidl::array<GentitysetHandle> temp_array1 - //= sidl::array<GentitysetHandle>::create1d(1); - //int num_temp_array1; - //temp_array1.set(0, temp_ges1); - - //for (int l = 0; l < 3; l++) { - iGeom_addEntSet( geom, temp_ges1, ges_k, &err ); - CHECK( "Problem to add temp set to gentitysets." ); - //} - } -*/ return true; }

1 0

r4755 - in cgm/branches/merge-cubit12: geom/ACIS_SRC geom/OCC geom/testing test
by jiangtao_ma＠yahoo.com 20 Apr '11

20 Apr '11

Author: janehu Date: 2011-04-20 12:39:28 -0500 (Wed, 20 Apr 2011) New Revision: 4755 Modified: cgm/branches/merge-cubit12/geom/ACIS_SRC/AcisModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp cgm/branches/merge-cubit12/geom/testing/main.cpp cgm/branches/merge-cubit12/test/modify.cpp Log: Check the TopoDS_Edge to see if its two vertices are identical for sliver edges, and not generate curve on such edge in CGM, there's a corespoinding change in testcase cgm/test/modify. Fixed the a bug in creating oriented brick, testcase is in cgm/geom/testing/CreateGeometry. Removed unnecessary error count manipulation in geom/testing/main.cpp Modified: cgm/branches/merge-cubit12/geom/ACIS_SRC/AcisModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/ACIS_SRC/AcisModifyEngine.cpp 2011-04-20 17:37:18 UTC (rev 4754) +++ cgm/branches/merge-cubit12/geom/ACIS_SRC/AcisModifyEngine.cpp 2011-04-20 17:39:28 UTC (rev 4755) @@ -3840,7 +3840,7 @@ // and size. // // Special Notes : Extension is equivalent to 1/2 width, depth, height. -// +// Center is the coordinates in global system. // Creator : Steve Storm // // Creation Date : 10/09/00 Modified: cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2011-04-20 17:37:18 UTC (rev 4754) +++ cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2011-04-20 17:39:28 UTC (rev 4755) @@ -1457,6 +1457,7 @@ // Member Type: PUBLIC // Description: create an OCC brick given center axes and extension // extension is equvlent to (wid/2, dep/2, hi/2) +// center should be given the coordinates in global system // Author : Jane Hu // Date : 03/08 //=============================================================================== @@ -1464,8 +1465,7 @@ const CubitVector axes[3], const CubitVector &extension) const { - CubitVector left_corner = center - extension; - gp_Pnt left_point(left_corner.x(), left_corner.y(), left_corner.z()); + gp_Pnt left_point(0,0,0); gp_Dir main_dir(axes[2].x(), axes[2].y(), axes[2].z()); gp_Dir x_dir(axes[0].x(), axes[0].y(), axes[0].z()); gp_Ax2 Axis(left_point, main_dir, x_dir); @@ -1477,7 +1477,17 @@ if (lump == NULL) return (BodySM*)NULL; - return CAST_TO(lump, OCCLump)->get_body(); + BodySM* body = CAST_TO(lump, OCCLump)->get_body(); + if(body) + { + CubitVector center_point; + double volume; + OCCBody* occ_body = CAST_TO(body,OCCBody); + occ_body->mass_properties(center_point, volume); + CubitVector move_vec = center - center_point; + occ_body->move(move_vec.x(), move_vec.y(), move_vec.z()); + return body;

1 0