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

r4439 - cgm/trunk
by jiangtao_ma＠yahoo.com 14 Jan '11

14 Jan '11

Author: janehu Date: 2011-01-14 09:20:50 -0600 (Fri, 14 Jan 2011) New Revision: 4439 Modified: cgm/trunk/KNOWN_ISSUES Log: closed issue 177 for scaling with different factors in x-y-z directions; Opened a new one for imprinting on Spline surfaces crash issue. Modified: cgm/trunk/KNOWN_ISSUES =================================================================== --- cgm/trunk/KNOWN_ISSUES 2011-01-14 15:12:08 UTC (rev 4438) +++ cgm/trunk/KNOWN_ISSUES 2011-01-14 15:20:50 UTC (rev 4439) @@ -10,8 +10,6 @@ 176 minor CGM memory leak -177 minor 3-D scale with different scale factors doesn't work. - 178 major Unite function doesn't unite smoothly connected surfaces. 179 major mcnp2cad test suite lat1-7 not working, needs debugging. @@ -25,3 +23,5 @@ 183 minor Don't have proper tool to visualize the TopoDS_Shapes, debugging process is long preparing for graphics to understand the issue +185 major mcnp2cad/tests/INP-torus test case fails on imprinting 2 spline + surfaces.

1 0

r4438 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 14 Jan '11

14 Jan '11

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);

1 0

r4413 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 03 Jan '11

03 Jan '11

Author: janehu Date: 2011-01-03 11:07:45 -0600 (Mon, 03 Jan 2011) New Revision: 4413 Modified: cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.hpp Log: Added or Changed function signatures to for all new capabilities with cubit12. Modified: cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp 2010-12-22 23:06:49 UTC (rev 4412) +++ cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp 2011-01-03 17:07:45 UTC (rev 4413) @@ -140,17 +140,15 @@ OCCQueryEngine *OQE = OCCQueryEngine::instance(); if( tessellate ) { - int num_tris, num_pnts, num_facets; GMem g_mem ; - OQE->get_graphics( surface, num_tris, num_pnts, num_facets, - &g_mem ); + OQE->get_graphics( surface, &g_mem); // Draw the triangles GPoint p[3]; GPoint* plist = g_mem.point_list(); int* facet_list = g_mem.facet_list(); int i, c = 0; - for( i=0; i<num_tris; i++ ) + for( i=0; i<g_mem.facet_list_size(); i++ ) { p[0] = plist[facet_list[++c]]; p[2] = plist[facet_list[++c]]; @@ -179,16 +177,15 @@ OCCDrawTool::draw_curve( Curve *curve, int color , CubitBoolean flush ) { GMem g_mem; - int num_points; OCCQueryEngine *OQE = OCCQueryEngine::instance(); double tol = OQE->get_sme_resabs_tolerance(); if (curve->get_arc_length() < tol) return CUBIT_SUCCESS; // get the graphics CubitStatus stat; - stat = OQE->get_graphics( curve, num_points, &g_mem ); + stat = OQE->get_graphics( curve, &g_mem ); - if (stat==CUBIT_FAILURE || num_points == 0) + if (stat==CUBIT_FAILURE ) { PRINT_ERROR("Unable to tessellate a curve for display\n" ); return CUBIT_FAILURE; Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp 2010-12-22 23:06:49 UTC (rev 4412) +++ cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp 2011-01-03 17:07:45 UTC (rev 4413) @@ -50,6 +50,8 @@ inline TopoDS_Wire* get_TopoDS_Wire() {return myTopoDSWire;} void set_TopoDS_Wire(TopoDS_Wire loop);

1 0