February 2012 - cgma-dev - mailman3.cels.anl.gov

r5384 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 09 Feb '12

09 Feb '12

Author: janehu Date: 2012-02-09 10:24:13 -0600 (Thu, 09 Feb 2012) New Revision: 5384 Modified: cgm/trunk/test/loft.cpp Log: Testcase for r5383, passed cgm make check. Modified: cgm/trunk/test/loft.cpp =================================================================== --- cgm/trunk/test/loft.cpp 2012-02-09 16:23:10 UTC (rev 5383) +++ cgm/trunk/test/loft.cpp 2012-02-09 16:24:13 UTC (rev 5384) @@ -132,6 +132,34 @@ //delete all entities gti->delete_Body(bodies); + CubitVector p1(0, 0 ,0); + CubitVector p2(1, 0 ,0); + CubitVector p3(0, 1 ,0); + CubitVector p4(1, 1 ,0); + + gmti->make_RefVertex(p1,5); + gmti->make_RefVertex(p2,5); + gmti->make_RefVertex(p3,5); + gmti->make_RefVertex(p4,5); + DLIList<RefEntity*> free_entities; + gti->get_free_ref_entities(free_entities); + + 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); + RefVertex* vertex4 = CAST_TO(free_entities.step_and_get(),RefVertex); + RefEdge* new_edge1 = gmti->make_RefEdge(STRAIGHT_CURVE_TYPE, vertex1, vertex2); + RefEdge* new_edge2 = gmti->make_RefEdge(STRAIGHT_CURVE_TYPE, vertex3, vertex4); + DLIList<RefEdge*> edges; + edges.append(new_edge1); + edges.append(new_edge2); + DLIList<RefEdge*> guides; + gmti->create_skin_surface(edges, new_body, guides); + CubitVector center = new_body->center_point(); + CubitVector comp (0.5, 0.5, 0); + assert(center.distance_between(comp) < 0.00001); + CubitBoolean is_sheet = new_body->is_sheet_body(); + assert(is_sheet == CUBIT_TRUE); return CUBIT_SUCCESS; }

1 0

r5383 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 09 Feb '12

09 Feb '12

Author: janehu Date: 2012-02-09 10:23:10 -0600 (Thu, 09 Feb 2012) New Revision: 5383 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCModifyEngine.hpp Log: Fixed the problem of making skin surface gives wrong results reported by Boyd Tidwell. Testcase is in trunk/test/loft.cpp. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-02-08 19:34:10 UTC (rev 5382) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-02-09 16:23:10 UTC (rev 5383) @@ -842,9 +842,43 @@ } CubitStatus stat = sort_curves(curve_list, topo_edges_loops); - if( stat == CUBIT_FAILURE ) //case of one disconnected curve - return (Surface*) NULL; + if( stat == CUBIT_FAILURE ) //case of one disconnected curve , open wires + { + //loft curves. + BRepOffsetAPI_ThruSections loft(CUBIT_FALSE); + CubitStatus stat = do_loft(loft, topo_edges_loops); + if(!stat) + return (Surface*) NULL; + + TopoDS_Shape shape = loft.Shape(); + TopoDS_Shell shell = TopoDS::Shell(shape); + TopExp_Explorer Ex; + int num_surfaces = 0; + TopoDS_Face topo_face ; + for (Ex.Init(shell, TopAbs_FACE); Ex.More(); Ex.Next()) + { + topo_face = TopoDS::Face(Ex.Current()); + num_surfaces ++; + } + + if(num_surfaces != 1) + { + PRINT_ERROR("In OCCModifyEngine::skin_surface\n" + " Cannot create a skin surface for given curves.\n"); + return (Surface*) NULL; + } + + Surface* surf = OCCQueryEngine::instance()->populate_topology_bridge(topo_face, CUBIT_TRUE); + if (surf == NULL) + { + PRINT_ERROR("In OCCModifyEngine::skin_surfaces\n" + " Cannot create a skin surface for given curves.\n"); + return (Surface*) NULL; + } + return surf; + } + // Use the topo_edges to make a topo_face TopoDS_Face* topo_face; topo_face = make_TopoDS_Face(surface_type,topo_edges_loops, old_surface_ptr); @@ -888,6 +922,36 @@

1 0

r5382 - cgm/trunk/itaps
by sjackson＠cae.wisc.edu 08 Feb '12

08 Feb '12

Author: sjackson Date: 2012-02-08 13:34:10 -0600 (Wed, 08 Feb 2012) New Revision: 5382 Modified: cgm/trunk/itaps/iGeom.h cgm/trunk/itaps/iGeom_CGMA.cc Log: Make iGeom.h C-compatible again Remove c++ idioms (bools and references) introduced in r5379. Modified: cgm/trunk/itaps/iGeom.h =================================================================== --- cgm/trunk/itaps/iGeom.h 2012-02-07 20:53:47 UTC (rev 5381) +++ cgm/trunk/itaps/iGeom.h 2012-02-08 19:34:10 UTC (rev 5382) @@ -3977,7 +3977,7 @@ double x, double y, double z, - bool &isOn); + int *isOn); #ifdef __cplusplus } /* extern "C" */ #endif Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-07 20:53:47 UTC (rev 5381) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-08 19:34:10 UTC (rev 5382) @@ -6278,10 +6278,10 @@ double x, double y, double z, - bool &IsOn) + int* IsOn) { CubitVector position(x,y,z); - CubitPointContainment pc; + CubitPointContainment pc = CUBIT_PNT_UNKNOWN; RefFace *ref_face = dynamic_cast<RefFace*>(ENTITY_HANDLE(entity)); if(ref_face) pc = ref_face->point_containment(position); @@ -6295,10 +6295,10 @@ pc = body->point_containment(position); if (pc == CUBIT_PNT_INSIDE || pc == CUBIT_PNT_BOUNDARY) - IsOn = true; + *IsOn = 1; else - IsOn = false; + *IsOn = 0; return; }

1 0

Re: [cgma-dev] r5380 - cgm/trunk/itaps
by Steve Jackson 07 Feb '12

07 Feb '12

Hi Jane, iGeom.h is a C header and iGeom is expected to have a native C binding, so the use of 'bool' and of a reference type (bool&) are both out of place and will confuse any library clients implemented in a language other than C++. If this new function is to be added to iGeom, the output parameter should have type int*. ~S On Feb 7, 2012, at 12:26 , jiangtao_ma(a)yahoo.com wrote: > Author: janehu > Date: 2012-02-07 12:26:59 -0600 (Tue, 07 Feb 2012) > New Revision: 5380 > > Modified: > cgm/trunk/itaps/iGeom.h > cgm/trunk/itaps/iGeom_CGMA.cc > Log: > Passed the result out for last check-in. > > Modified: cgm/trunk/itaps/iGeom.h > =================================================================== > --- cgm/trunk/itaps/iGeom.h 2012-02-07 17:41:06 UTC (rev 5379) > +++ cgm/trunk/itaps/iGeom.h 2012-02-07 18:26:59 UTC (rev 5380) > @@ -3977,7 +3977,7 @@ > double x, > double y, > double z, > - bool isOn); > + bool &isOn); > #ifdef __cplusplus > } /* extern "C" */ > #endif > > Modified: cgm/trunk/itaps/iGeom_CGMA.cc > =================================================================== > --- cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-07 17:41:06 UTC (rev 5379) > +++ cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-07 18:26:59 UTC (rev 5380) > @@ -6278,7 +6278,7 @@ > double x, > double y, > double z, > - bool IsOn) > + bool &IsOn) > { > CubitVector position(x,y,z); > CubitPointContainment pc; >

1 0

r5380 - cgm/trunk/itaps
by jiangtao_ma＠yahoo.com 07 Feb '12

07 Feb '12

Author: janehu Date: 2012-02-07 12:26:59 -0600 (Tue, 07 Feb 2012) New Revision: 5380 Modified: cgm/trunk/itaps/iGeom.h cgm/trunk/itaps/iGeom_CGMA.cc Log: Passed the result out for last check-in. Modified: cgm/trunk/itaps/iGeom.h =================================================================== --- cgm/trunk/itaps/iGeom.h 2012-02-07 17:41:06 UTC (rev 5379) +++ cgm/trunk/itaps/iGeom.h 2012-02-07 18:26:59 UTC (rev 5380) @@ -3977,7 +3977,7 @@ double x, double y, double z, - bool isOn); + bool &isOn); #ifdef __cplusplus } /* extern "C" */ #endif Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-07 17:41:06 UTC (rev 5379) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-07 18:26:59 UTC (rev 5380) @@ -6278,7 +6278,7 @@ double x, double y, double z, - bool IsOn) + bool &IsOn) { CubitVector position(x,y,z); CubitPointContainment pc;

1 0

r5379 - cgm/trunk/itaps
by jiangtao_ma＠yahoo.com 07 Feb '12

07 Feb '12

Author: janehu Date: 2012-02-07 11:41:06 -0600 (Tue, 07 Feb 2012) New Revision: 5379 Modified: cgm/trunk/itaps/iGeom.h cgm/trunk/itaps/iGeom_CGMA.cc Log: Added a iGeom function to check if point is on the surface/curve/body. Per Shengyong's request. Modified: cgm/trunk/itaps/iGeom.h =================================================================== --- cgm/trunk/itaps/iGeom.h 2012-02-06 04:29:21 UTC (rev 5378) +++ cgm/trunk/itaps/iGeom.h 2012-02-07 17:41:06 UTC (rev 5379) @@ -3971,6 +3971,13 @@ int **facets, int *facets_allocated, int *facets_size, int *err); + /* checks if a point is on a surface or a curve or a body*/ + void iGeom_isPositionOn(iGeom_Instance instance, + iBase_EntityHandle entity, + double x, + double y, + double z, + bool isOn); #ifdef __cplusplus } /* extern "C" */ #endif Modified: cgm/trunk/itaps/iGeom_CGMA.cc =================================================================== --- cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-06 04:29:21 UTC (rev 5378) +++ cgm/trunk/itaps/iGeom_CGMA.cc 2012-02-07 17:41:06 UTC (rev 5379) @@ -310,7 +310,6 @@ return status; } - extern "C" { void iGeom_newGeom( const char* options, @@ -6274,6 +6273,35 @@ } } +void iGeom_isPositionOn(iGeom_Instance instance, + iBase_EntityHandle entity, + double x, + double y, + double z, + bool IsOn) +{ + CubitVector position(x,y,z); + CubitPointContainment pc; + RefFace *ref_face = dynamic_cast<RefFace*>(ENTITY_HANDLE(entity)); + if(ref_face) + pc = ref_face->point_containment(position); + + RefEdge *ref_edge = dynamic_cast<RefEdge*>(ENTITY_HANDLE(entity)); + if(ref_edge) + pc = ref_edge->point_containment(position);

1 0

Re: [cgma-dev] create body loft bug
by Jane Hu 03 Feb '12

03 Feb '12

Hi, Boyd: Here's another one that I just fixed. The testcase is in trunk test/loft.cpp. Thank you for reporting the bug. Jane On Wed, Dec 28, 2011 at 11:24 AM, Boyd Tidwell <boyd(a)csimsoft.com> wrote: > The commands: > > brick x 10 > move body 1 loc 22 13 11 > brick x 10 > create body loft surf 8 1 > > > gives the results: > > ERROR: Surface1 must have only one loop. > > Yet, a "list surface 8" shows: > > Surface Entity (Id = 8) > Visible: Yes > Meshed: No > Mesh Scheme: map (default) > Smooth Scheme: winslow fixed > > Periodic Intervals: N/A > Interval Count: Not Set > Interval Size: Not Set > An odd loop: No (Surface 8) > Block Id: 0 > > 4 curves in 1 loop. > Visible: Yes > Mesh Scheme Arc Interval: Edge Vertex > Type > ______Name_____ Id +is meshed Length Count Size Length Start_T > End_T > Curve 17 17 equal- 10 1 1 10 > 13 14 > Curve 18 18 equal- 10 1 1 10 > 13 15 > Curve 19 19 equal- 10 1 1 10 > 15 16 > Curve 20 20 equal- 10 1 1 10 > 14 16 > > In Volume 2. > > > > It appears that surface 8 has exactly one loop so the ERROR message is > wrong. > > > > Thanks very much, > > - Boyd > > >

1 0

r5377 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 03 Feb '12

03 Feb '12

Author: janehu Date: 2012-02-03 11:30:54 -0600 (Fri, 03 Feb 2012) New Revision: 5377 Added: cgm/trunk/test/loft.cpp Modified: cgm/trunk/test/Makefile.am Log: Testcase for bug #257 fix. code check in is at r5376. Modified: cgm/trunk/test/Makefile.am =================================================================== --- cgm/trunk/test/Makefile.am 2012-02-03 17:22:24 UTC (rev 5376) +++ cgm/trunk/test/Makefile.am 2012-02-03 17:30:54 UTC (rev 5377) @@ -22,7 +22,7 @@ endif endif if build_OCC - TESTS += attribute_to_file attribute_to_buffer modify subtract makept offset_curves r_w test_occ operation brick_occ merge_occ point_project imprint_bug + TESTS += attribute_to_file attribute_to_buffer modify subtract makept loft offset_curves r_w test_occ operation brick_occ merge_occ point_project imprint_bug endif check_PROGRAMS = $(TESTS) @@ -37,6 +37,7 @@ makept_SOURCES = makept.cpp offset_curves_SOURCES = offset_curves.cpp +loft_SOURCES = loft.cpp modify_SOURCES = modify.cpp imprint_bug_SOURCES = imprint_bug.cpp subtract_SOURCES = subtract.cpp @@ -139,6 +140,7 @@ imprint.brep \ BsplineCurve.occ \ curves.brep \ + loft.brep \ bug.brep \ subtract.occ \ glue.occ \ Added: cgm/trunk/test/loft.cpp =================================================================== --- cgm/trunk/test/loft.cpp (rev 0) +++ cgm/trunk/test/loft.cpp 2012-02-03 17:30:54 UTC (rev 5377) @@ -0,0 +1,137 @@ +/** + * \file makept.cpp + * + * \brief makept, another simple C++ driver for CGM + * + * This program acts as a simple driver for CGM. It reads in a geometry, + * and performs varies checks for bodies, surfaces, curves and vertices. + */ + +#undef NDEBUG +#include <cassert> + +#include "GeometryModifyEngine.hpp" +#include "GeometryModifyTool.hpp" +#include "GeometryQueryTool.hpp" +#include "CubitMessage.hpp"

1 0

r5376 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 03 Feb '12

03 Feb '12

Author: janehu Date: 2012-02-03 11:22:24 -0600 (Fri, 03 Feb 2012) New Revision: 5376 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Fixed the loft problem reported by Boyd Tidwell. Created and passed test in cgm/test. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-02-02 23:44:10 UTC (rev 5375) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2012-02-03 17:22:24 UTC (rev 5376) @@ -9279,7 +9279,7 @@ TopoDS_Shape shape = loft.Shape(); TopoDS_Solid solid = TopoDS::Solid(shape); - Lump* lump = OCCQueryEngine::instance()->populate_topology_bridge(solid); + Lump* lump = OCCQueryEngine::instance()->populate_topology_bridge(solid, CUBIT_TRUE); if (lump == NULL) { PRINT_ERROR("In OCCModifyEngine::loft_surfaces_to_body\n" @@ -9301,18 +9301,31 @@ PRINT_ERROR("Surfaces are not OCC type.\n"); return CUBIT_FAILURE; } + TopoDS_Face* topo_face1 = surf1->get_TopoDS_Face(); TopoDS_Face* topo_face2 = surf2->get_TopoDS_Face(); + + TopoDS_Face new_face1, new_face2; + BRepBuilderAPI_Copy api_copy(*topo_face1); + TopoDS_Shape newShape = api_copy.ModifiedShape(*topo_face1); + new_face1 = TopoDS::Face(newShape); + + BRepBuilderAPI_Copy api_copy2(*topo_face2); + newShape = api_copy2.ModifiedShape(*topo_face2); + new_face2 = TopoDS::Face(newShape); + TopExp_Explorer Ex; - Ex.Init(*topo_face1, TopAbs_WIRE); + Ex.Init(new_face1, TopAbs_WIRE); TopoDS_Wire wire1 = TopoDS::Wire(Ex.Current()); + Ex.Next(); if(Ex.More()) { PRINT_ERROR("Surface1 must have only one loop.\n"); return CUBIT_FAILURE; } - Ex.Init(*topo_face2, TopAbs_WIRE); + Ex.Init(new_face2, TopAbs_WIRE); TopoDS_Wire wire2 = TopoDS::Wire(Ex.Current()); + Ex.Next(); if(Ex.More()) { PRINT_ERROR("Surface2 must have only one loop.\n");

1 0

r5371 - cgm/trunk/geom/ACIS_SRC
by tautges＠mcs.anl.gov 02 Feb '12

02 Feb '12

Author: tautges Date: 2012-02-02 13:39:35 -0600 (Thu, 02 Feb 2012) New Revision: 5371 Modified: cgm/trunk/geom/ACIS_SRC/Makefile.am Log: Adding ACIS_HEALER definition to am_cppflags. Modified: cgm/trunk/geom/ACIS_SRC/Makefile.am =================================================================== --- cgm/trunk/geom/ACIS_SRC/Makefile.am 2012-02-02 16:11:55 UTC (rev 5370) +++ cgm/trunk/geom/ACIS_SRC/Makefile.am 2012-02-02 19:39:35 UTC (rev 5371) @@ -1,5 +1,6 @@ AM_CPPFLAGS += $(ACIS_STEP_TRANSLATOR) \ $(ACIS_IGES_TRANSLATOR) \ + $(ACIS_HEALER) \ -DCUBIT_ACIS_VERSION=$(ACIS_VERSION) \ -DACIS_VERSION=$(ACIS_VERSION) \ -DACIS_VER=$(ACIS_VERSION) \

1 0