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

r1768 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 15 Apr '08

15 Apr '08

Author: janehu Date: 2008-04-15 14:15:02 -0500 (Tue, 15 Apr 2008) New Revision: 1768 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCBody.hpp cgm/trunk/geom/OCC/OCCLoop.cpp cgm/trunk/geom/OCC/OCCLump.hpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCShell.cpp cgm/trunk/geom/OCC/OCCShell.hpp cgm/trunk/geom/OCC/OCCSurface.cpp Log: Still working on the entity update for boolean operation, it's a little confusion that when a TopoDS_Face get a map to newly generated TopoDS_Face, the Wire under it can't find the corresponding new Wire. Investigating why. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -69,6 +69,14 @@ update_bounding_box(); } +void OCCBody::set_sheet_surface(OCCSurface* surface) +{ + IsSheetBody = CUBIT_TRUE; + mySheetSurface = surface; + if(surface == NULL) + IsSheetBody = CUBIT_FALSE; +} + void OCCBody::lumps(DLIList<Lump*>& my_lumps) { myLumps.clean_out(); Modified: cgm/trunk/geom/OCC/OCCBody.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.hpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCBody.hpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -180,6 +180,8 @@ OCCSurface* my_sheet_surface(){if(IsSheetBody) return mySheetSurface; return (OCCSurface*) NULL;} + void set_sheet_surface(OCCSurface* surface); + protected: private: Modified: cgm/trunk/geom/OCC/OCCLoop.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCLoop.cpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCLoop.cpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -227,6 +227,7 @@ assert(aBRepTrsf != NULL || op != NULL); TopoDS_Shape shape; + CubitBoolean need_update = CUBIT_TRUE; if (aBRepTrsf) shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Wire()); else @@ -236,18 +237,21 @@ if(shapes.Extent()) shape = shapes.First(); else - return CUBIT_SUCCESS; + need_update = CUBIT_FALSE; } - TopoDS_Wire loop = TopoDS::Wire(shape); - - OCCQueryEngine::instance()->update_OCC_map(*myTopoDSWire, loop); - + TopoDS_Wire loop; + if (need_update) + { + loop = TopoDS::Wire(shape); + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSWire, loop); + } //set the curves for (int i = 1; i <= myCoEdgeList.size(); i++) { OCCCurve *curve = CAST_TO(myCoEdgeList.get_and_step()->curve(), OCCCurve); curve->update_OCC_entity(aBRepTrsf, op); } - set_TopoDS_Wire(loop); + if (need_update) + set_TopoDS_Wire(loop); } Modified: cgm/trunk/geom/OCC/OCCLump.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCLump.hpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCLump.hpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -47,6 +47,11 @@ OCCLump(TopoDS_Solid *theSolid, OCCSurface* surface = NULL, OCCShell* shell = NULL); + OCCSurface* my_sheet_surface() {return mySheetSurface;} + OCCShell * my_shell() {return myShell;} + void set_surface(OCCSurface* surface) {mySheetSurface = surface;} + void set_shell(OCCShell* shell) {myShell = shell;} + virtual ~OCCLump(); //- The destructor Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -1532,7 +1532,6 @@ faces_to_stitch.reset(); surf_bodies.reset(); TopoDS_Shape* first_face = faces_to_stitch.pop(); - surf_bodies.pop(); //make consistance with faces_to_stitch. TopoDS_Face* second_face = NULL; TopoDS_Shape fuse; @@ -1542,7 +1541,8 @@ BRepAlgoAPI_Fuse fuser(*second_face, *first_face); fuse = fuser.Shape(); first_face = &fuse; - CAST_TO(surf_bodies[i], OCCBody)->my_sheet_surface()->my_shell()->update_OCC_entity(NULL, &fuser); + OCCBody* occ_body = CAST_TO(surf_bodies[i], OCCBody); + occ_body->my_sheet_surface()->update_OCC_entity(NULL, &fuser); } TopExp_Explorer Ex; Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -1242,6 +1242,8 @@ surface->set_body(body); surface->set_lump(lump); surface->set_shell(shell); + shell->set_body(body); + shell->set_lump(lump); //Doesn't need to save sheet bodies. } TopExp_Explorer Ex; Modified: cgm/trunk/geom/OCC/OCCShell.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCShell.cpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCShell.cpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -32,6 +32,7 @@ #include <TopExp.hxx> #include <TopTools_IndexedMapOfShape.hxx> +#include "TopExp_Explorer.hxx" #include "TopTools_IndexedDataMapOfShapeListOfShape.hxx" #include "TopoDS.hxx" #include "TopTools_ListIteratorOfListOfShape.hxx" @@ -71,6 +72,13 @@ { } +void OCCShell::set_TopoDS_Shell(TopoDS_Shell shell) +{ + if (!myTopoDSShell) + myTopoDSShell = new TopoDS_Shell(); + *myTopoDSShell = shell; +} + //------------------------------------------------------------------------- // Purpose : Get geometry modeling engine: OCCQueryEngine // @@ -169,15 +177,34 @@ CubitStatus OCCShell::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, BRepAlgoAPI_BooleanOperation *op) { - if(mySheetSurface) + if(mySheetSurface && op == NULL) return CUBIT_FAILURE; + else if(mySheetSurface && op)//stitch surface body into shell body + { + mySheetSurface->update_OCC_entity(aBRepTrsf, op); + TopoDS_Shape shape = op->Shape(); + TopExp_Explorer Ex; + TopoDS_Shell shell; + for (Ex.Init(shape, TopAbs_SHELL, TopAbs_SOLID); Ex.More(); Ex.Next()) + { + shell = TopoDS::Shell(Ex.Current()); + this->set_TopoDS_Shell(shell); + this->my_lump()->set_surface(NULL); + this->my_lump()->set_shell(this); + this->my_body()->shell(this); + this->my_body()->set_sheet_surface(NULL); + this->set_sheet_surface(NULL); + break; + } + return CUBIT_SUCCESS; + } assert (aBRepTrsf != NULL || op != NULL); TopoDS_Shape shape; if (aBRepTrsf) shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Shell()); - else + else if(!mySheetSurface) { TopTools_ListOfShape shapes; shapes.Assign(op->Modified(*get_TopoDS_Shell())); Modified: cgm/trunk/geom/OCC/OCCShell.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCShell.hpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCShell.hpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -49,10 +49,13 @@ //- Destructor. TopoDS_Shell* get_TopoDS_Shell() {return myTopoDSShell;} - void set_TopoDS_Shell(TopoDS_Shell shell){*myTopoDSShell = shell;} + void set_TopoDS_Shell(TopoDS_Shell shell); OCCLump* my_lump() {return myLump;} OCCBody* my_body() {return myBody;} + OCCSurface* my_surface() {return mySheetSurface;} + void set_sheet_surface (OCCSurface* surface) {mySheetSurface = surface;} + void set_lump(OCCLump* lump) {myLump = lump;} void set_body(OCCBody* body) {myBody = body;} Modified: cgm/trunk/geom/OCC/OCCSurface.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCSurface.cpp 2008-04-15 14:48:02 UTC (rev 1767) +++ cgm/trunk/geom/OCC/OCCSurface.cpp 2008-04-15 19:15:02 UTC (rev 1768) @@ -773,7 +773,6 @@ assert(aBRepTrsf != NULL || op != NULL); TopoDS_Shape shape; - CubitBoolean need_update = CUBIT_TRUE; if (aBRepTrsf) shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Face()); else

1 0

r1762 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 14 Apr '08

14 Apr '08

Author: janehu Date: 2008-04-14 13:18:46 -0500 (Mon, 14 Apr 2008) New Revision: 1762 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCCurve.cpp cgm/trunk/geom/OCC/OCCLoop.cpp cgm/trunk/geom/OCC/OCCLump.cpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCPoint.cpp cgm/trunk/geom/OCC/OCCShell.cpp cgm/trunk/geom/OCC/OCCSurface.cpp Log: Added for update_OCC_entity for boolean operation, now stitch_surfs makes simple sheet-face bodies into a shell body, so update needs to walk one level higher, working on it. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -348,7 +348,7 @@ lump->update_OCC_entity(aBRepTrsf, op); } - if (aBRepTrsf) + if (aBRepTrsf && !compsolid.IsNull()) set_TopoDS_Shape(compsolid); update_bounding_box(); Modified: cgm/trunk/geom/OCC/OCCCurve.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCCurve.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCCurve.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -915,7 +915,10 @@ { TopTools_ListOfShape shapes; shapes.Assign(op->Modified(*get_TopoDS_Edge())); - shape = shapes.First(); + if(shapes.Extent()) + shape = shapes.First(); + else + return ; } TopoDS_Edge curve = TopoDS::Edge(shape); Modified: cgm/trunk/geom/OCC/OCCLoop.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCLoop.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCLoop.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -233,7 +233,10 @@ { TopTools_ListOfShape shapes; shapes.Assign(op->Modified(*get_TopoDS_Wire())); - shape = shapes.First(); + if(shapes.Extent()) + shape = shapes.First(); + else + return CUBIT_SUCCESS; } TopoDS_Wire loop = TopoDS::Wire(shape); Modified: cgm/trunk/geom/OCC/OCCLump.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCLump.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCLump.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -310,7 +310,10 @@ { TopTools_ListOfShape shapes; shapes.Assign(op->Modified(*get_TopoDS_Solid())); - shape = shapes.First(); + if(shapes.Extent() > 0) + shape = shapes.First(); + else + return CUBIT_SUCCESS; } TopoDS_Solid solid = TopoDS::Solid(shape); Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -1542,7 +1542,7 @@ BRepAlgoAPI_Fuse fuser(*second_face, *first_face); fuse = fuser.Shape(); first_face = &fuse; - CAST_TO(surf_bodies[i], OCCBody)->my_sheet_surface()->update_OCC_entity(NULL, &fuser); + CAST_TO(surf_bodies[i], OCCBody)->my_sheet_surface()->my_shell()->update_OCC_entity(NULL, &fuser); } TopExp_Explorer Ex; Modified: cgm/trunk/geom/OCC/OCCPoint.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCPoint.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCPoint.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -274,7 +274,10 @@ { TopTools_ListOfShape shapes; shapes.Assign(op->Modified(*get_TopoDS_Vertex())); - shape = shapes.First(); + if(shapes.Extent()) + shape = shapes.First(); + else + return ; } TopoDS_Vertex vertex = TopoDS::Vertex(shape); Modified: cgm/trunk/geom/OCC/OCCShell.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCShell.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCShell.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -181,7 +181,10 @@ { TopTools_ListOfShape shapes; shapes.Assign(op->Modified(*get_TopoDS_Shell())); - shape = shapes.First(); + if (shapes.Extent()) + shape = shapes.First(); + else + return CUBIT_SUCCESS; } TopoDS_Shell shell = TopoDS::Shell(shape); Modified: cgm/trunk/geom/OCC/OCCSurface.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCSurface.cpp 2008-04-11 19:47:30 UTC (rev 1761) +++ cgm/trunk/geom/OCC/OCCSurface.cpp 2008-04-14 18:18:46 UTC (rev 1762) @@ -783,16 +783,14 @@ if (shapes.Extent() > 0) shape = shapes.First(); else - need_update = CUBIT_FALSE; + return CUBIT_SUCCESS; } TopoDS_Face surface; - if(need_update) - { - surface = TopoDS::Face(shape); + surface = TopoDS::Face(shape); - OCCQueryEngine::instance()->update_OCC_map(*myTopoDSFace, surface); - } + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSFace, surface); + //set the loops DLIList<OCCLoop *> loops; this->get_loops(loops); @@ -801,8 +799,7 @@ OCCLoop *loop = loops.get_and_step(); loop->update_OCC_entity(aBRepTrsf, op); } - if (need_update) - set_TopoDS_Face(surface); + set_TopoDS_Face(surface); return CUBIT_SUCCESS; }

1 0

r1760 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 11 Apr '08

11 Apr '08

Author: janehu Date: 2008-04-11 14:44:08 -0500 (Fri, 11 Apr 2008) New Revision: 1760 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 Log: Added the mapping part for old and new entities after boolean operation. Fuse operation in OCC seems to have a bug that doesn't return the map of modified entities, posted a question in opencascade forum. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -163,12 +163,12 @@ { TopoDS_Shell* shell = myShell->get_TopoDS_Shell(); aBRepTrsf.Perform(*shell); - myShell->update_OCC_entity(aBRepTrsf); + myShell->update_OCC_entity(&aBRepTrsf); } else { aBRepTrsf.Perform(*myTopoDSShape); - update_OCC_entity(aBRepTrsf); + update_OCC_entity(&aBRepTrsf); } // calculate for bounding box @@ -206,12 +206,12 @@ { TopoDS_Shell* shell = myShell->get_TopoDS_Shell(); aBRepTrsf.Perform(*shell); - myShell->update_OCC_entity(aBRepTrsf); + myShell->update_OCC_entity(&aBRepTrsf); } else { aBRepTrsf.Perform(*myTopoDSShape); - update_OCC_entity(aBRepTrsf); + update_OCC_entity(&aBRepTrsf); } // calculate for bounding box @@ -243,12 +243,12 @@ { TopoDS_Shell* shell = myShell->get_TopoDS_Shell(); aBRepTrsf.Perform(*shell); - myShell->update_OCC_entity(aBRepTrsf); + myShell->update_OCC_entity(&aBRepTrsf); } else { aBRepTrsf.Perform(*myTopoDSShape); - update_OCC_entity(aBRepTrsf); + update_OCC_entity(&aBRepTrsf); } // calculate for bounding box @@ -300,12 +300,12 @@ { TopoDS_Shell* shell = myShell->get_TopoDS_Shell(); aBRepTrsf.Perform(*shell); - myShell->update_OCC_entity(aBRepTrsf); + myShell->update_OCC_entity(&aBRepTrsf); } else { aBRepTrsf.Perform(*myTopoDSShape); - update_OCC_entity(aBRepTrsf); + update_OCC_entity(&aBRepTrsf); } // update underlining OCC entities @@ -320,32 +320,37 @@ // as the body's lumps number. // Author: Jane Hu //---------------------------------------------------------------- -CubitStatus OCCBody::update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf) +CubitStatus OCCBody::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op) { if(IsSheetBody || myShell) return CUBIT_FAILURE; - TopoDS_Shape shape = aBRepTrsf.Shape(); - TopoDS_CompSolid compsolid = TopoDS::CompSolid(shape); + assert(aBRepTrsf != NULL || op != NULL); - if(OCCQueryEngine::instance()->OCCMap->IsBound(*myTopoDSShape) ) + TopoDS_CompSolid compsolid; + if(aBRepTrsf) { - int k = OCCQueryEngine::instance()->OCCMap->Find(*myTopoDSShape); - assert (k > 0 && k <= OCCQueryEngine::instance()->iTotalTBCreated); - OCCQueryEngine::instance()->OCCMap->UnBind(*myTopoDSShape); - OCCQueryEngine::instance()->OCCMap->Bind(shape, k); + TopoDS_Shape shape = aBRepTrsf->Shape(); + TopoDS_CompSolid compsolid = TopoDS::CompSolid(shape); + + if(OCCQueryEngine::instance()->OCCMap->IsBound(*myTopoDSShape) ) + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSShape, shape); } + //Boolean operation works only on one lump body //set the lumps DLIList<Lump *> lumps; lumps = this->lumps(); for (int i = 1; i <= lumps.size(); i++) { OCCLump *lump = CAST_TO(lumps.get_and_step(), OCCLump); - lump->update_OCC_entity(aBRepTrsf); + lump->update_OCC_entity(aBRepTrsf, op); } - set_TopoDS_Shape(compsolid); + if (aBRepTrsf) + set_TopoDS_Shape(compsolid); + update_bounding_box(); //unset marks. Modified: cgm/trunk/geom/OCC/OCCBody.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCBody.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -39,7 +39,7 @@ class OCCCurve; class OCCPoint; class BRepBuilderAPI_Transform; - +class BRepAlgoAPI_BooleanOperation; // ********** END FORWARD DECLARATIONS ********** class OCCBody : public BodySM @@ -175,7 +175,8 @@ virtual CubitPointContainment point_containment( const CubitVector& pos ); //update the underlining CompSolid - CubitStatus update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf); + CubitStatus update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op = NULL); OCCSurface* my_sheet_surface(){if(IsSheetBody) return mySheetSurface; return (OCCSurface*) NULL;} Modified: cgm/trunk/geom/OCC/OCCCurve.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCCurve.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCCurve.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -56,6 +56,7 @@ #include "TColgp_Array1OfPnt.hxx" #include "GeomAdaptor_Curve.hxx" #include "GCPnts_QuasiUniformAbscissa.hxx" +#include "BRepAlgoAPI_BooleanOperation.hxx" #include "TopTools_ListOfShape.hxx" #include "BRepAlgo_NormalProjection.hxx" #include "TopExp_Explorer.hxx" @@ -899,18 +900,26 @@ // for any movement of the body/surface/curve. // Author: Jane Hu //---------------------------------------------------------------- -void OCCCurve::update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf) +void OCCCurve::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op) { if (myMarked == 1) return; - TopoDS_Shape shape = aBRepTrsf.ModifiedShape(*get_TopoDS_Edge()); + assert(aBRepTrsf != NULL || op != NULL); + + TopoDS_Shape shape; + if (aBRepTrsf) + shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Edge()); + else + { + TopTools_ListOfShape shapes; + shapes.Assign(op->Modified(*get_TopoDS_Edge())); + shape = shapes.First(); + } TopoDS_Edge curve = TopoDS::Edge(shape); - int k = OCCQueryEngine::instance()->OCCMap->Find(*myTopoDSEdge); - assert (k > 0 && k <= OCCQueryEngine::instance()->iTotalTBCreated); - OCCQueryEngine::instance()->OCCMap->UnBind(*myTopoDSEdge); - OCCQueryEngine::instance()->OCCMap->Bind(curve, k); + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSEdge, curve); //set the vertices DLIList<TopologyBridge*> vertices; @@ -920,7 +929,7 @@ TopologyBridge* tb = vertices.get_and_step(); OCCPoint *point = CAST_TO(tb, OCCPoint); if (point) - point->update_OCC_entity(aBRepTrsf); + point->update_OCC_entity(aBRepTrsf, op); } myMarked = 1; set_TopoDS_Edge(curve); Modified: cgm/trunk/geom/OCC/OCCCurve.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCCurve.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCCurve.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -38,7 +38,7 @@ class OCCCoEdge; class OCCPoint; class BRepBuilderAPI_Transform; - +class BRepAlgoAPI_BooleanOperation; // ********** END FORWARD DECLARATIONS ********** class OCCCurve : public Curve @@ -324,7 +324,8 @@ { return myTopoDSEdge; } void set_TopoDS_Edge(TopoDS_Edge edge){*myTopoDSEdge = edge;} - void update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf); + void update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op = NULL ); Curve* project_curve(Surface* face_ptr, CubitBoolean closed, Modified: cgm/trunk/geom/OCC/OCCLoop.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCLoop.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCLoop.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -34,7 +34,7 @@ #include "TopTools_DataMapOfShapeInteger.hxx" #include "TopTools_IndexedDataMapOfShapeListOfShape.hxx" #include "BRepBuilderAPI_Transform.hxx" - +#include "BRepAlgoAPI_BooleanOperation.hxx" // ********** END CUBIT INCLUDES ********** // ********** BEGIN STATIC DECLARATIONS ********** @@ -221,21 +221,29 @@ // for any movement of the body/surface. // Author: Jane Hu //---------------------------------------------------------------- -CubitStatus OCCLoop::update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf) +CubitStatus OCCLoop::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op) { - TopoDS_Shape shape = aBRepTrsf.ModifiedShape(*get_TopoDS_Wire()); + assert(aBRepTrsf != NULL || op != NULL); + + TopoDS_Shape shape; + if (aBRepTrsf) + shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Wire()); + else + { + TopTools_ListOfShape shapes; + shapes.Assign(op->Modified(*get_TopoDS_Wire())); + shape = shapes.First(); + } TopoDS_Wire loop = TopoDS::Wire(shape); - int k = OCCQueryEngine::instance()->OCCMap->Find(*myTopoDSWire); - assert (k > 0 && k <= OCCQueryEngine::instance()->iTotalTBCreated); - OCCQueryEngine::instance()->OCCMap->UnBind(*myTopoDSWire); - OCCQueryEngine::instance()->OCCMap->Bind(loop, k); + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSWire, loop); //set the curves for (int i = 1; i <= myCoEdgeList.size(); i++) { OCCCurve *curve = CAST_TO(myCoEdgeList.get_and_step()->curve(), OCCCurve); - curve->update_OCC_entity(aBRepTrsf); + curve->update_OCC_entity(aBRepTrsf, op); } set_TopoDS_Wire(loop); } Modified: cgm/trunk/geom/OCC/OCCLoop.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCLoop.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCLoop.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -32,7 +32,7 @@ class OCCCurve; class OCCPoint; class BRepBuilderAPI_Transform; - +class BRepAlgoAPI_BooleanOperation; class OCCLoop : public LoopSM { public : @@ -107,7 +107,8 @@ virtual void get_parents_virt(DLIList<TopologyBridge*>&); virtual void get_children_virt(DLIList<TopologyBridge*>&); - CubitStatus update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf); + CubitStatus update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op =NULL); protected: private: Modified: cgm/trunk/geom/OCC/OCCLump.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCLump.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCLump.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -39,6 +39,7 @@ #include <TopTools_IndexedMapOfShape.hxx> #include "BRepBuilderAPI_Transform.hxx" #include "TopTools_DataMapOfShapeInteger.hxx" +#include "BRepAlgoAPI_BooleanOperation.hxx" #include "Bnd_Box.hxx" #include "BRepBndLib.hxx" #include "GProp_GProps.hxx" @@ -294,18 +295,26 @@ // for any movement of the lump. // Author: Jane Hu //---------------------------------------------------------------- -CubitStatus OCCLump::update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf) +CubitStatus OCCLump::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op) { if(mySheetSurface || myShell) return CUBIT_FAILURE; - TopoDS_Shape shape = aBRepTrsf.ModifiedShape(*get_TopoDS_Solid()); + assert(aBRepTrsf != NULL || op != NULL); + + TopoDS_Shape shape; + if (aBRepTrsf) + shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Solid()); + else + { + TopTools_ListOfShape shapes; + shapes.Assign(op->Modified(*get_TopoDS_Solid())); + shape = shapes.First(); + } TopoDS_Solid solid = TopoDS::Solid(shape); - int k = OCCQueryEngine::instance()->OCCMap->Find(*myTopoDSSolid); - assert (k > 0 && k <= OCCQueryEngine::instance()->iTotalTBCreated); - OCCQueryEngine::instance()->OCCMap->UnBind(*myTopoDSSolid); - OCCQueryEngine::instance()->OCCMap->Bind(solid, k); + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSSolid, solid); //set the lumps DLIList<TopologyBridge *> shells; @@ -313,7 +322,7 @@ for (int i = 1; i <= shells.size(); i++) { OCCShell *shell = CAST_TO(shells.get_and_step(), OCCShell); - shell->update_OCC_entity(aBRepTrsf); + shell->update_OCC_entity(aBRepTrsf, op); } set_TopoDS_Solid(solid); } Modified: cgm/trunk/geom/OCC/OCCLump.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCLump.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCLump.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -37,7 +37,7 @@ class OCCCurve; class OCCPoint; class BRepBuilderAPI_Transform; - +class BRepAlgoAPI_BooleanOperation; // ********** END FORWARD DECLARATIONS ********** class OCCLump : public Lump @@ -147,7 +147,8 @@ CubitPointContainment point_containment( const CubitVector &point ); - CubitStatus update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf); + CubitStatus update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op = NULL); protected: Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -1529,14 +1529,20 @@ faces_to_stitch.append(topods_face); } - TopoDS_Shape* first_face = faces_to_stitch.get(); + faces_to_stitch.reset(); + surf_bodies.reset(); + TopoDS_Shape* first_face = faces_to_stitch.pop(); + surf_bodies.pop(); //make consistance with faces_to_stitch. + TopoDS_Face* second_face = NULL; TopoDS_Shape fuse; - for(int i = 1; i < faces_to_stitch.size(); i++) + for( int i = faces_to_stitch.size()-1; i >= 0; i --) { second_face = faces_to_stitch[i]; - fuse = BRepAlgoAPI_Fuse(*first_face, *second_face); + BRepAlgoAPI_Fuse fuser(*second_face, *first_face); + fuse = fuser.Shape(); first_face = &fuse; + CAST_TO(surf_bodies[i], OCCBody)->my_sheet_surface()->update_OCC_entity(NULL, &fuser); } TopExp_Explorer Ex; @@ -1694,9 +1700,11 @@ continue; } TopoDS_Shape* tool_shape = tool_bodies_copy.get_and_step(); + //bodies overlap, proceed with the subtract - TopoDS_Shape cut_shape = BRepAlgoAPI_Cut(*from_shape, *tool_shape); - + BRepAlgoAPI_Cut cutter(*from_shape, *tool_shape); + TopoDS_Shape cut_shape = cutter.Shape(); + //compare to see if the from_shape has gotten cut. CubitStatus stat; if(is_volume[i]) Modified: cgm/trunk/geom/OCC/OCCPoint.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCPoint.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCPoint.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -32,6 +32,7 @@ #include "TopTools_DataMapOfShapeInteger.hxx" #include "TopTools_IndexedDataMapOfShapeListOfShape.hxx" #include "BRepBuilderAPI_Transform.hxx" +#include "BRepAlgoAPI_BooleanOperation.hxx" // ********** END CUBIT INCLUDES ********** // ********** BEGIN STATIC DECLARATIONS ********** @@ -258,18 +259,26 @@ // for any movement of the body/surface/curve/vertex. // Author: Jane Hu //---------------------------------------------------------------- -void OCCPoint::update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf) +void OCCPoint::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op) { if (this->myMarked == CUBIT_TRUE) return; - TopoDS_Shape shape = aBRepTrsf.ModifiedShape(*get_TopoDS_Vertex()); + assert(aBRepTrsf != NULL || op != NULL); + + TopoDS_Shape shape; + if(aBRepTrsf) + shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Vertex()); + else + { + TopTools_ListOfShape shapes; + shapes.Assign(op->Modified(*get_TopoDS_Vertex())); + shape = shapes.First(); + } TopoDS_Vertex vertex = TopoDS::Vertex(shape); - int k = OCCQueryEngine::instance()->OCCMap->Find(*myTopoDSVertex); - assert (k > 0 && k <= OCCQueryEngine::instance()->iTotalTBCreated); - OCCQueryEngine::instance()->OCCMap->UnBind(*myTopoDSVertex); - OCCQueryEngine::instance()->OCCMap->Bind(vertex, k); + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSVertex, vertex); set_myMarked(CUBIT_TRUE); set_TopoDS_Vertex(vertex); Modified: cgm/trunk/geom/OCC/OCCPoint.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCPoint.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCPoint.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -30,6 +30,7 @@ // ********** BEGIN FORWARD DECLARATIONS ********** class CubitSimpleAttrib; class BRepBuilderAPI_Transform; +class BRepAlgoAPI_BooleanOperation; // ********** END FORWARD DECLARATIONS ********** class OCCPoint : public Point @@ -136,7 +137,8 @@ CubitStatus restore_attribs( FILE *file_ptr, unsigned int endian ); - void update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf); + void update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op = NULL); }; Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -2154,25 +2154,25 @@ { if (OCCBody *body_ptr = CAST_TO( entity_ptr, OCCBody)) { - body_ptr->update_OCC_entity(aBRepTrsf); + body_ptr->update_OCC_entity(&aBRepTrsf); return CUBIT_SUCCESS; } else if( OCCSurface *surface_ptr = CAST_TO( entity_ptr, OCCSurface)) { - surface_ptr->update_OCC_entity(aBRepTrsf); + surface_ptr->update_OCC_entity(&aBRepTrsf); return CUBIT_SUCCESS; } else if( OCCCurve *curve_ptr = CAST_TO( entity_ptr, OCCCurve)) { - curve_ptr->update_OCC_entity(aBRepTrsf); + curve_ptr->update_OCC_entity(&aBRepTrsf); return CUBIT_SUCCESS; } else if( OCCPoint *point_ptr = CAST_TO( entity_ptr, OCCPoint)) { - point_ptr->update_OCC_entity(aBRepTrsf); + point_ptr->update_OCC_entity(&aBRepTrsf); return CUBIT_SUCCESS; } @@ -2343,4 +2343,12 @@ return CUBIT_FALSE; } +void OCCQueryEngine::update_OCC_map(TopoDS_Shape old_shape, + TopoDS_Shape new_shape) +{ + int k = OCCMap->Find(old_shape); + assert (k > 0 && k <= iTotalTBCreated); + OCCMap->UnBind(old_shape); + OCCMap->Bind(new_shape, k); +} //EOF Modified: cgm/trunk/geom/OCC/OCCQueryEngine.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCQueryEngine.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -109,6 +109,8 @@ //- Singleton pattern //- Controlled access and creation of the sole instance of this class. + void update_OCC_map(TopoDS_Shape old_shape, TopoDS_Shape new_shape); + virtual ~OCCQueryEngine(); const char* modeler_type() Modified: cgm/trunk/geom/OCC/OCCShell.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCShell.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCShell.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -40,6 +40,7 @@ #include "TopTools_DataMapOfShapeInteger.hxx" #include "TopTools_ListOfShape.hxx" #include "BRepBuilderAPI_Transform.hxx" +#include "BRepAlgoAPI_BooleanOperation.hxx" // ********** END CUBIT INCLUDES ********** // ********** BEGIN STATIC DECLARATIONS ********** @@ -165,26 +166,34 @@ // for any movement of the body. // Author: Jane Hu //---------------------------------------------------------------- -CubitStatus OCCShell::update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf) +CubitStatus OCCShell::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op) { if(mySheetSurface) return CUBIT_FAILURE; - TopoDS_Shape shape = aBRepTrsf.ModifiedShape(*get_TopoDS_Shell()); + assert (aBRepTrsf != NULL || op != NULL); + + TopoDS_Shape shape; + if (aBRepTrsf) + shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Shell()); + else + { + TopTools_ListOfShape shapes; + shapes.Assign(op->Modified(*get_TopoDS_Shell())); + shape = shapes.First(); + } TopoDS_Shell shell = TopoDS::Shell(shape); - int k = OCCQueryEngine::instance()->OCCMap->Find(*myTopoDSShell); - assert (k > 0 && k <= OCCQueryEngine::instance()->iTotalTBCreated); - OCCQueryEngine::instance()->OCCMap->UnBind(*myTopoDSShell); - OCCQueryEngine::instance()->OCCMap->Bind(shell, k); + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSShell, shell); - //set the lumps + //set the surfaces DLIList<TopologyBridge *> surfaces; this->get_children_virt(surfaces); for (int i = 1; i <= surfaces.size(); i++) { OCCSurface *surface = CAST_TO(surfaces.get_and_step(), OCCSurface); - surface->update_OCC_entity(aBRepTrsf); + surface->update_OCC_entity(aBRepTrsf, op); } set_TopoDS_Shell(shell); return CUBIT_SUCCESS; Modified: cgm/trunk/geom/OCC/OCCShell.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCShell.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCShell.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -35,6 +35,7 @@ class OCCCurve; class OCCPoint; class BRepBuilderAPI_Transform; +class BRepAlgoAPI_BooleanOperation; // ********** END CUBIT INCLUDES ********** @@ -106,7 +107,8 @@ virtual void get_parents_virt( DLIList<TopologyBridge*>& parents ); virtual void get_children_virt( DLIList<TopologyBridge*>& children ); - CubitStatus update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf); + CubitStatus update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op = NULL); double measure(); //area of the shell protected: Modified: cgm/trunk/geom/OCC/OCCSurface.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCSurface.cpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCSurface.cpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -43,6 +43,7 @@ #include "Lump.hpp" #include "LoopSM.hpp" #include "CubitPointData.hpp" +#include "BRepAlgoAPI_BooleanOperation.hxx" // ********** END CUBIT INCLUDES ********** @@ -766,25 +767,43 @@ // for any movement of the body. // Author: Jane Hu //---------------------------------------------------------------- -CubitStatus OCCSurface::update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf) +CubitStatus OCCSurface::update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op) { - TopoDS_Shape shape = aBRepTrsf.ModifiedShape(*get_TopoDS_Face()); - TopoDS_Face surface = TopoDS::Face(shape); + assert(aBRepTrsf != NULL || op != NULL); - int k = OCCQueryEngine::instance()->OCCMap->Find(*myTopoDSFace); - assert (k > 0 && k <= OCCQueryEngine::instance()->iTotalTBCreated); - OCCQueryEngine::instance()->OCCMap->UnBind(*myTopoDSFace); - OCCQueryEngine::instance()->OCCMap->Bind(surface, k); + TopoDS_Shape shape; + CubitBoolean need_update = CUBIT_TRUE; + if (aBRepTrsf) + shape = aBRepTrsf->ModifiedShape(*get_TopoDS_Face()); + else + { + TopTools_ListOfShape shapes; + shapes.Assign(op->Modified(*get_TopoDS_Face())); + if (shapes.Extent() > 0) + shape = shapes.First(); + else + need_update = CUBIT_FALSE; + } + + TopoDS_Face surface; + if(need_update) + { + surface = TopoDS::Face(shape); + OCCQueryEngine::instance()->update_OCC_map(*myTopoDSFace, surface); + } //set the loops DLIList<OCCLoop *> loops; this->get_loops(loops); for (int i = 1; i <= loops.size(); i++) { OCCLoop *loop = loops.get_and_step(); - loop->update_OCC_entity(aBRepTrsf); + loop->update_OCC_entity(aBRepTrsf, op); } - set_TopoDS_Face(surface); + if (need_update) + set_TopoDS_Face(surface); + return CUBIT_SUCCESS; } Modified: cgm/trunk/geom/OCC/OCCSurface.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCSurface.hpp 2008-04-11 19:41:37 UTC (rev 1759) +++ cgm/trunk/geom/OCC/OCCSurface.hpp 2008-04-11 19:44:08 UTC (rev 1760) @@ -48,7 +48,7 @@ class OCCCurve; class OCCPoint; class BRepBuilderAPI_Transform; - +class BRepAlgoAPI_BooleanOperation; //// class CubitTransformMatrix; class OCCSurface : public Surface @@ -396,7 +396,8 @@ CubitBoolean is_spherical(); //// Not in SurfaceACIS CubitBoolean is_conical(); //// Not in SurfaceACIS - CubitStatus update_OCC_entity( BRepBuilderAPI_Transform &aBRepTrsf); + CubitStatus update_OCC_entity( BRepBuilderAPI_Transform *aBRepTrsf, + BRepAlgoAPI_BooleanOperation *op = NULL); protected: private:

1 0

Cubit 11 and CGM
by Jason Kraftcheck 10 Apr '08

10 Apr '08

Building CGM with the --with-cubit option does not work with version 11 of Cubit. It does work for Cubit 10.2. When trying to run cgm2moab using libcubiti19.so from version 11 of Cubit, I see the following errors: ERROR: Unable to set ACIS string option '°ϐ#-+' to '' Internal error copying geometry The first error message comes from AcisQueryEngine::set_str_option. Setting a breakpoint there, I see this call stack: #0 in AcisQueryEngine::set_str_option () from libcubiti19.so #1 in cgm2moab at cgm2moab.cc:289 #2 in main at main.cc:182 cgm2moab does not call AcisQueryEngine::set_str_option(..) anywhere in the source. Line 289 is a call to GeometryQueryTool::get_graphics(..). This looks to me like an ABI incompatibility between the headers in CGM and the compiled version of CGM in Cubit 11. - jason

1 0

r1757 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 10 Apr '08

10 Apr '08

Author: janehu Date: 2008-04-10 15:45:58 -0500 (Thu, 10 Apr 2008) New Revision: 1757 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Added imprint for a list of BodySM's, need to add map mechanism to determine if the 'owner' has been changed for id consistance. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-10 17:26:24 UTC (rev 1756) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-10 20:45:58 UTC (rev 1757) @@ -60,6 +60,7 @@ #include "BRepGProp.hxx" #include "TopoDS.hxx" #include "TopologyBridge.hpp" +#include "ProgressTool.hpp" #include "BRepAlgoAPI_Fuse.hxx" #include "BRepAlgoAPI_Cut.hxx" #include "BRepAlgoAPI_Section.hxx" @@ -2174,6 +2175,8 @@ bool keep_old) const { OCCBody* occ_body = NULL; + newBody1 = NULL; + newBody2 = NULL; DLIList<TopoDS_Shape*> shape_list; for(int i = 0; i <2; i++) { @@ -2234,24 +2237,135 @@ tbs += OCCQueryEngine::instance()->populate_topology_bridge(*shape2); newBody2 = CAST_TO(tbs.get(),BodySM); } - return CUBIT_FAILURE; + + if (!keep_old) + { + if (newBody1) + OCCQueryEngine::instance()->delete_solid_model_entities(BodyPtr1); + if (newBody2) + OCCQueryEngine::instance()->delete_solid_model_entities( BodyPtr2); + } + + if (!newBody1) + { + delete shape1; + newBody1 = BodyPtr1; + } + + if(!newBody2) + { + delete shape2; + newBody2 = BodyPtr2; + } + return CUBIT_SUCCESS; } //=============================================================================== -// Function : imprint +// Function : imprint multiple bodies at once // Member Type: PUBLIC -// Description: imprint boolean operation on facet-based bodies -// Author : John Fowler -// Date : 10/02 +// Description: imprint boolean operation on OCC-based bodies +// Author : Jane HU +// Date : 04/08 //=============================================================================== -CubitStatus OCCModifyEngine::imprint(DLIList<BodySM*> &from_body_list , - DLIList<BodySM*> &new_from_body_list, - bool keep_old, - DLIList<TopologyBridge*>* , - DLIList<TopologyBridge*>*) const +CubitStatus OCCModifyEngine::imprint(DLIList<BodySM*> &from_body_list , + DLIList<BodySM*> &new_from_body_list, + bool keep_old, + DLIList<TopologyBridge*>* new_tbs, + DLIList<TopologyBridge*>* att_tbs) const { CubitStatus success = CUBIT_SUCCESS; + OCCBody* occ_body = NULL; + DLIList<TopoDS_Shape*> shape_list; + // pass in keep_old to the delete_owner_attrib flag; if we're not keeping + // old bodies, we want to keep the owner attrib, so we can pick up entities + // that didn't change + bool delete_attribs = + (GeometryModifyTool::instance()->get_new_ids() || keep_old); + for(int i = 0; i <from_body_list.size(); i++) + { + occ_body = CAST_TO(from_body_list.get_and_step(), OCCBody); + OCCSurface* surface = occ_body->my_sheet_surface(); + OCCShell* shell = occ_body->shell(); + if(surface) + { + TopoDS_Face* topo_face = surface->get_TopoDS_Face(); + BRepBuilderAPI_Copy api_copy(*topo_face); + TopoDS_Shape newShape = api_copy.ModifiedShape(*topo_face); + TopoDS_Shape* Shape1 = new TopoDS_Shape(newShape); + shape_list.append(Shape1); + } + else if(shell) + { + TopoDS_Shell* topo_shell = shell->get_TopoDS_Shell(); + BRepBuilderAPI_Copy api_copy(*topo_shell); + TopoDS_Shape newShape = api_copy.ModifiedShape(*topo_shell); + TopoDS_Shape* Shape1 = new TopoDS_Shape(newShape); + shape_list.append(Shape1); + } + + else + { + DLIList<Lump*> lumps = occ_body->lumps(); + if (lumps.size() > 1) + { + PRINT_ERROR("Can't do boolean operation on CompSolid types. \n"); + return CUBIT_FAILURE; + } + + TopoDS_Solid* solid = CAST_TO(lumps.get(), OCCLump)->get_TopoDS_Solid(); + BRepBuilderAPI_Copy api_copy(*solid); + TopoDS_Shape newShape = api_copy.ModifiedShape(*solid); + TopoDS_Shape* Shape1 = new TopoDS_Shape(newShape); + shape_list.append(Shape1); + } + } + + int size = shape_list.size(); + // total number of imprints to be done + int total_imprints = (size * (size -1))/2; + + if( size > 2 ) + { + char message[128]; + sprintf(message, "Imprinting %d ACIS Bodies", from_body_list.size() ); AppUtil::instance()->progress_tool()->start(0, total_imprints, message); + } + + for(int i = 0; i < size; i++) + { + TopoDS_Shape* shape1 = shape_list[i]; + shape_list.append(shape1); + CubitBoolean modified = CUBIT_FALSE; + for(int j = i+1; j < size+i; j ++) + { + if (CubitMessage::instance()->Interrupt()) + { + success = CUBIT_FAILURE; + break; + } + + TopoDS_Shape* shape2 = shape_list[j]; + DLIList<TopologyBridge*> tbs; + CubitStatus stat = imprint_toposhapes(shape1, shape2); + if(stat) + modified = CUBIT_TRUE; + } + if(modified) + { + DLIList<TopologyBridge*> tbs; + tbs += OCCQueryEngine::instance()->populate_topology_bridge(*shape1); + new_from_body_list.append(CAST_TO(tbs.get(),BodySM)); + } + if( size > 2 ) + AppUtil::instance()->progress_tool()->step(); + } + + if( size > 2 ) + AppUtil::instance()->progress_tool()->end(); + + if( CubitMessage::instance()->Interrupt() ) + PRINT_INFO("Imprint aborted.\n"); + return success; }

1 0

r1756 - cgm/trunk
by kraftche＠mcs.anl.gov 10 Apr '08

10 Apr '08

Author: kraftche Date: 2008-04-10 12:26:24 -0500 (Thu, 10 Apr 2008) New Revision: 1756 Modified: cgm/trunk/cgm.make.in cgm/trunk/configure.in Log: remove bogus link flag when configured w/out ACIS Modified: cgm/trunk/cgm.make.in =================================================================== --- cgm/trunk/cgm.make.in 2008-04-10 17:12:24 UTC (rev 1755) +++ cgm/trunk/cgm.make.in 2008-04-10 17:26:24 UTC (rev 1756) @@ -18,6 +18,7 @@ ACIS_DEFS = @ACIS_DEFS@ ACIS_DIR = @ACIS_DIR@ ACIS_LIB_DIR = @ACIS_LIB_DIR@ +ACIS_LINK_FLAGS = @ACIS_LINK_FLAGS@ ACIS_VERSION = @ACIS_VERSION@ ACIS_HEALER = @ACIS_HEALER@ ACIS_PLATFORM = @ACIS_PLATFORM@ @@ -66,7 +67,7 @@ # will be overriden upon install CGM_INCLUDES = $(CGM_INC_CPPFLAGS_UNINSTALLED) -CGM_LIBS_LDFLAGS_COMMON = -L$(ACIS_LIB_DIR) $(OCC_LIB_FLAG) +CGM_LIBS_LDFLAGS_COMMON = $(ACIS_LINK_FLAGS) $(OCC_LIB_FLAG) CGM_LIBS_LDFLAGS_UNINSTALLED = \ -L@abs_builddir@/geom/virtual/.libs \ @@ -105,7 +106,7 @@ CGM_LIBS_LINK_INTERNAL = $(LDFLAGS) $(CGM_LIBS_LDFLAGS) $(CGM_LIBS_LIBRARIES) -CGMA_INIT_LDFLAGS_UNINSTALLED = -L$(CGM_LIBDIR)/init -L$(CGM_LIBDIR)/init/.libs +CGMA_INIT_LDFLAGS_UNINSTALLED = -L@abs_builddir@/init -L@abs_builddir@/init/.libs CGMA_INIT_LDFLAGS_INSTALLED = -L$(CGM_LIBDIR) # Will be overridden upon install Modified: cgm/trunk/configure.in =================================================================== --- cgm/trunk/configure.in 2008-04-10 17:12:24 UTC (rev 1755) +++ cgm/trunk/configure.in 2008-04-10 17:26:24 UTC (rev 1756) @@ -164,10 +164,11 @@ ACIS_VERSION=$withval], [ACIS_VERSION=0]) if test "x$ACIS_DIR" == "x"; then - ACIS_DIR=no; + ACIS_DIR=no fi if test "x$ACIS_DIR" == "xno"; then - ACIS_LIB_DIR="."; + ACIS_LIB_DIR= + ACIS_LINK_FLAGS= fi if test "x$ACIS_DIR" != "xno"; then if test "x$CUBIT_DIR" != "xno"; then @@ -191,6 +192,7 @@ fi CGM_ACIS_LIBS='-lcubit_ACIS' ACIS_LIBS="$ACIS_LIBS $ACIS_XLIBS $ACIS_BASE_LIBS" + ACIS_LINK_FLAGS='-L$(ACIS_LIB_DIR)' ACIS_HEALER="-DACIS_HEALER" ACIS_INCLUDES="-I$ACIS_DIR/include" ACIS_DEFS='$(ACIS_STEP_TRANSLATOR) $(ACIS_IGES_TRANSLATOR) -DCUBIT_ACIS_VERSION=$(ACIS_VERSION) -DACIS_VERSION=$(ACIS_VERSION) -D$(ACIS_PLATFORM) -DACIS_LOCAL_OPS' @@ -199,6 +201,7 @@ fi AC_SUBST(ACIS_DEFS) AC_SUBST(ACIS_DIR) +AC_SUBST(ACIS_LINK_FLAGS) AC_SUBST(ACIS_LIB_DIR) AC_SUBST(ACIS_INCLUDES) AC_SUBST(ACIS_LIBS)

1 0

r1755 - cgm/trunk
by kraftche＠mcs.anl.gov 10 Apr '08

10 Apr '08

Author: kraftche Date: 2008-04-10 12:12:24 -0500 (Thu, 10 Apr 2008) New Revision: 1755 Modified: cgm/trunk/Makefile.am cgm/trunk/cgm.make.in Log: o Back out previous change: linking of cgma_init needs to remain separate from other CGM libraries because all others are overriden if using an existing libcubit. o Fix missing library search path for libcubit o Fix self-recursive variable for OpenCascade link o Separate uninstalled include and link paths from installed paths so as to retain the ability to use an installed CGM while greatly reducing the noise when referencing an installed one. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2008-04-10 16:17:17 UTC (rev 1754) +++ cgm/trunk/Makefile.am 2008-04-10 17:12:24 UTC (rev 1755) @@ -33,5 +33,8 @@ # 'make prefix=/foo install', we don't know the correct install # directory until we're doing the install. install-data-hook: + echo 'CGM_LIBS_LDFLAGS=$$(CGM_LIBS_LDFLAGS_INSTALLED)' >> $(DESTDIR)$(cfgdir)/cgm.make + echo 'CGMA_INIT_LDFLAGS=$$(CGMA_INIT_LDFLAGS_INSTALLED)' >> $(DESTDIR)$(cfgdir)/cgm.make + echo 'CGM_INCLUDES=$$(CGM_INC_CPPFLAGS_INSTALLED)' >> $(DESTDIR)$(cfgdir)/cgm.make echo "CGM_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/cgm.make echo "CGM_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/cgm.make Modified: cgm/trunk/cgm.make.in =================================================================== --- cgm/trunk/cgm.make.in 2008-04-10 16:17:17 UTC (rev 1754) +++ cgm/trunk/cgm.make.in 2008-04-10 17:12:24 UTC (rev 1755) @@ -2,7 +2,7 @@ # # To build CGM applications, do the following: # -# 0. include this file in your makefile (using 'include config.make') +# 0. include this file in your makefile (using 'include cgm.make') # 1. Insert '${CGM_INCLUDES}' (w/o quotes) in your compile command, e.g. # ${CXX} ${CGM_INCLUDES} -c mysource.cpp # 2. Insert '${CGM_LIBS_LINK}' (w/o quotes) on your link line @@ -27,7 +27,8 @@ ACIS_INCLUDES = @ACIS_INCLUDES@ OCC_INCLUDES = @OCC_INC_FLAG@ -OCC_LIB_DIR = @OCC_LIB_FLAG@ +OCC_LIB_DIR = @OCC_LIB_DIR@ +OCC_LIB_FLAG = @OCC_LIB_FLAG@ OCC_LIBS = @CUBIT_OCC_LIB@ @OCC_LIBS@ CGM_PARALLEL_INCLUDE = @CGM_PARALLEL_INCLUDE@ @@ -45,38 +46,50 @@ CGM_CFLAGS = @CFLAGS@ CGM_LDFLAGS = @LDFLAGS@ -CGM_INCLUDES = -I$(CGM_INCLUDEDIR)/util \ - -I$(CGM_INCLUDEDIR)/init \ - -I$(CGM_INCLUDEDIR)/geom \ - -I$(CGM_INCLUDEDIR)/geom/ACIS \ - -I$(CGM_INCLUDEDIR)/geom/OCC \ +CGM_INC_CPPFLAGS_COMMON = ${ACIS_INCLUDES} ${OCC_INCLUDES} +CGM_INC_CPPFLAGS_UNINSTALLED = \ + -I@abs_srcdir@/util \ + -I@abs_builddir@/util \ + -I@abs_srcdir@/init \ + -I@abs_srcdir@/geom \ + -I@abs_builddir@/geom \ + -I@abs_srcdir@/itaps \ + -I@abs_builddir@/itaps \ + -I@abs_srcdir@/geom/ACIS \ + -I@abs_srcdir@/geom/OCC \ $(CGM_PARALLEL_INCLUDE) \ + $(CGM_INC_CPPFLAGS_COMMON) +CGM_INC_CPPFLAGS_INSTALLED = \ -I$(CGM_INCLUDEDIR) \ - ${ACIS_INCLUDES} \ - ${OCC_INCLUDES} + $(CGM_INC_CPPFLAGS_COMMON) -CGM_LIBS_LINK_INTERNAL = ${LDFLAGS} \ - -L$(CGM_LIBDIR) \ - -L$(CGM_LIBDIR)/init/.libs \ - -L$(CGM_LIBDIR)/geom/virtual/.libs \ - -L$(CGM_LIBDIR)/geom/facetbool/.libs \ - -L$(CGM_LIBDIR)/geom/facet/.libs \ - -L$(CGM_LIBDIR)/geom/Cholla/.libs \ - -L$(CGM_LIBDIR)/geom/ACIS/.libs \ - -L$(CGM_LIBDIR)/geom/OCC/.libs \ - -L$(CGM_LIBDIR)/geom/.libs \ - -L$(CGM_LIBDIR)/util/.libs \ - -L$(CGM_LIBDIR)/geom/virtual \ - -L$(CGM_LIBDIR)/geom/facetbool \ - -L$(CGM_LIBDIR)/geom/facet \ - -L$(CGM_LIBDIR)/geom/Cholla \ - -L$(CGM_LIBDIR)/geom/ACIS \ - -L$(CGM_LIBDIR)/geom \ - -L$(CGM_LIBDIR)/util \ - -L${ACIS_LIB_DIR} \ - ${OCC_LIB_DIR} \ - -lcgma_init \ - ${ACIS_LIBS} \ +# will be overriden upon install +CGM_INCLUDES = $(CGM_INC_CPPFLAGS_UNINSTALLED) + +CGM_LIBS_LDFLAGS_COMMON = -L$(ACIS_LIB_DIR) $(OCC_LIB_FLAG) + +CGM_LIBS_LDFLAGS_UNINSTALLED = \ + -L@abs_builddir@/geom/virtual/.libs \ + -L@abs_builddir@/geom/facetbool/.libs \ + -L@abs_builddir@/geom/facet/.libs \ + -L@abs_builddir@/geom/Cholla/.libs \ + -L@abs_builddir@/geom/ACIS/.libs \ + -L@abs_builddir@/geom/OCC/.libs \ + -L@abs_builddir@/geom/.libs \ + -L@abs_builddir@/util/.libs \ + -L@abs_builddir@/geom/virtual \ + -L@abs_builddir@/geom/facetbool \ + -L@abs_builddir@/geom/facet \ + -L@abs_builddir@/geom/Cholla \ + -L@abs_builddir@/geom/ACIS \ + -L@abs_builddir@/geom \ + -L@abs_builddir@/util \ + $(CGM_LIBS_LDFLAGS_COMMON) + +CGM_LIBS_LDFLAGS_INSTALLED = -L$(CGM_LIBDIR) $(CGM_LIBS_LDFLAGS_COMMON) + +CGM_LIBS_LIBRARIES = \ + ${ACIS_LIBS} \ -lcubit_virtual \ -lcubit_facet \ -lcubit_facetbool \ @@ -87,6 +100,17 @@ ${CGM_PARALLEL_LIB} \ ${OCC_LIBS} +# Will be overridden upon install +CGM_LIBS_LDFLAGS = $(CGM_LIBS_LDFLAGS_UNINSTALLED) + +CGM_LIBS_LINK_INTERNAL = $(LDFLAGS) $(CGM_LIBS_LDFLAGS) $(CGM_LIBS_LIBRARIES) + +CGMA_INIT_LDFLAGS_UNINSTALLED = -L$(CGM_LIBDIR)/init -L$(CGM_LIBDIR)/init/.libs +CGMA_INIT_LDFLAGS_INSTALLED = -L$(CGM_LIBDIR) + +# Will be overridden upon install +CGMA_INIT_LDFLAGS = $(CGMA_INIT_LDFLAGS_UNINSTALLED) + CGM_LIBS_FILES_INTERNAL = \ $(CGM_LIBDIR)/libcgma_init.la \ $(CGM_LIBDIR)/libcubit_virtual.la \ @@ -97,12 +121,13 @@ $(CGM_LIBDIR)/libcubit_util.la \ ${CGM_PARALLEL_LIB_FILE} -CUBIT_LDFwAGS = @CUBIT_LDFLAGS@ - CUBIT_LTFLAGS = @CUBIT_LTFLAGS@ +CUBIT_LDFLAGS = @CUBIT_LDFLAGS@ CUBIT_LIBS = @CUBIT_LIBS@ CUBIT_FILE = @CUBIT_FILE@ -CGM_LIBS_LINK = @CGM_LIBS_LINK@ +# CGM_LIBS_LINK is set by configure script to be either +# "$(CUBIT_LDFLAGS) $(CUBIT_LIBS)" or "$(CGM_LIBS_LINK_INTERNAL)" +CGM_LIBS_LINK = $(CGMA_INIT_LDFLAGS) -lcgma_init @CGM_LIBS_LINK@ CGM_LIBS_FILES = @CGM_LIBS_FILES@ CGM_LIBS_LTFLAGS = @CGM_LIBS_LTFLAGS@

1 0

r1754 - cgm/trunk
by kraftche＠mcs.anl.gov 10 Apr '08

10 Apr '08

Author: kraftche Date: 2008-04-10 11:17:17 -0500 (Thu, 10 Apr 2008) New Revision: 1754 Modified: cgm/trunk/cgm.make.in cgm/trunk/configure.in Log: o Handle libcgma_init like all other CGM libraries o Remove bogus linker search paths for libcgma_init o Reference .la files rather than .a files in CGM_LIBS_FILES because a) the .a files won't exist if shared libraries are built, b) the .la will get a new timestamp whenever either the .a or the .so is updated and c) this variable is presumably only used in dependency lists so any file with an appropriate timestamp should suffice. Modified: cgm/trunk/cgm.make.in =================================================================== --- cgm/trunk/cgm.make.in 2008-04-09 18:02:53 UTC (rev 1753) +++ cgm/trunk/cgm.make.in 2008-04-10 16:17:17 UTC (rev 1754) @@ -56,6 +56,8 @@ ${OCC_INCLUDES} CGM_LIBS_LINK_INTERNAL = ${LDFLAGS} \ + -L$(CGM_LIBDIR) \ + -L$(CGM_LIBDIR)/init/.libs \ -L$(CGM_LIBDIR)/geom/virtual/.libs \ -L$(CGM_LIBDIR)/geom/facetbool/.libs \ -L$(CGM_LIBDIR)/geom/facet/.libs \ @@ -72,8 +74,8 @@ -L$(CGM_LIBDIR)/geom \ -L$(CGM_LIBDIR)/util \ -L${ACIS_LIB_DIR} \ - -L$(CGM_LIBDIR) \ ${OCC_LIB_DIR} \ + -lcgma_init \ ${ACIS_LIBS} \ -lcubit_virtual \ -lcubit_facet \ @@ -86,20 +88,21 @@ ${OCC_LIBS} CGM_LIBS_FILES_INTERNAL = \ - $(CGM_LIBDIR)/libcubit_virtual.a \ - $(CGM_LIBDIR)/libcubit_facetbool.a \ - $(CGM_LIBDIR)/libcubit_facet.a \ - $(CGM_LIBDIR)/libcholla.a \ - $(CGM_LIBDIR)/libcubit_geom.a \ - $(CGM_LIBDIR)/libcubit_util.a \ + $(CGM_LIBDIR)/libcgma_init.la \ + $(CGM_LIBDIR)/libcubit_virtual.la \ + $(CGM_LIBDIR)/libcubit_facetbool.la \ + $(CGM_LIBDIR)/libcubit_facet.la \ + $(CGM_LIBDIR)/libcholla.la \ + $(CGM_LIBDIR)/libcubit_geom.la \ + $(CGM_LIBDIR)/libcubit_util.la \ ${CGM_PARALLEL_LIB_FILE} - + CUBIT_LDFwAGS = @CUBIT_LDFLAGS@ CUBIT_LTFLAGS = @CUBIT_LTFLAGS@ CUBIT_LIBS = @CUBIT_LIBS@ CUBIT_FILE = @CUBIT_FILE@ -CGM_LIBS_LINK = -L$(CGM_LIBDIR)/init -L$(CGM_LIBDIR)/init/.libs -lcgma_init @CGM_LIBS_LINK@ -CGM_LIBS_FILES = @CGM_LIBS_FILES@ $(CGM_LIBDIR)/libcgma_init.a +CGM_LIBS_LINK = @CGM_LIBS_LINK@ +CGM_LIBS_FILES = @CGM_LIBS_FILES@ CGM_LIBS_LTFLAGS = @CGM_LIBS_LTFLAGS@ Modified: cgm/trunk/configure.in =================================================================== --- cgm/trunk/configure.in 2008-04-09 18:02:53 UTC (rev 1753) +++ cgm/trunk/configure.in 2008-04-10 16:17:17 UTC (rev 1754) @@ -32,7 +32,7 @@ CXXFLAGS="$CXXFLAGS -DUSE_MPI" CGM_PARALLEL_INCLUDE='-I${CGM_DIR}/geom/parallel' CGM_PARALLEL_LIB='-L${CGM_DIR}/geom/parallel -lcubit_parallel' - CGM_PARALLEL_LIB_FILE='${CGM_LIBDIR}/libcubit_parallel.a' + CGM_PARALLEL_LIB_FILE='${CGM_LIBDIR}/libcubit_parallel.la' fi AM_CONDITIONAL(USE_MPI, [test "xno" != "x$WITH_MPI"]) AC_SUBST(CGM_PARALLEL_INCLUDE)

1 0

r1753 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 09 Apr '08

09 Apr '08

Author: janehu Date: 2008-04-09 13:02:53 -0500 (Wed, 09 Apr 2008) New Revision: 1753 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Modified for check_intersection call for single edge imprint situation; Added for imprint BodySM and BodySM. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-09 15:50:36 UTC (rev 1752) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2008-04-09 18:02:53 UTC (rev 1753) @@ -2074,6 +2074,13 @@ TopoDS_Face from_face)const { int count_intersection = 0; + //Consider if edge_list has only one edge, and it intersects the from_face + //at two different places. + CubitBoolean double_check = CUBIT_FALSE; + if (edge_list->size() == 1) + double_check = CUBIT_TRUE; + + gp_Pnt intsec_pnt[2]; for(int j = 0; j < edge_list->size(); j++) { TopoDS_Edge* edge = edge_list->get_and_step(); @@ -2081,7 +2088,7 @@ double lower_bound = acurve.FirstParameter(); double upper_bound = acurve.LastParameter(); TopExp_Explorer Ex; - gp_Pnt newP(0.0, 0.0, 0.0); + gp_Pnt newP[2]; double tol = OCCQueryEngine::instance()->get_sme_resabs_tolerance(); for (Ex.Init(from_face, TopAbs_EDGE); Ex.More(); Ex.Next()) { @@ -2090,51 +2097,65 @@ double lower_bound2 = acurve2.FirstParameter(); double upper_bound2 = acurve2.LastParameter(); BRepExtrema_DistShapeShape distShapeShape(*edge, from_edge); - CubitBoolean qualified = CUBIT_FALSE; + CubitBoolean qualified[2] = {CUBIT_FALSE, CUBIT_FALSE}; if (distShapeShape.IsDone() && distShapeShape.Value() < tol) - { - newP = distShapeShape.PointOnShape1(1); - Extrema_ExtPC ext(newP, acurve, Precision::Approximation()); - double newVal; - if (ext.IsDone() && (ext.NbExt() > 0)) { - for ( int i = 1 ; i <= ext.NbExt() ; i++ ) { - if ( ext.IsMin(i) ) { - newVal = ext.Point(i).Parameter(); - if ((newVal-lower_bound) >= -tol && - (upper_bound - newVal) >= -tol) - { - qualified = CUBIT_TRUE; - break; - } + { + newP[0] = distShapeShape.PointOnShape1(1); + if (double_check && distShapeShape.NbSolution() == 2) + newP[1] = distShapeShape.PointOnShape1(2); + double newVal[2]; + for(int j =0; j < distShapeShape.NbSolution(); j++) + { + Extrema_ExtPC ext(newP[j], acurve, Precision::Approximation()); + if (ext.IsDone() && (ext.NbExt() > 0)) { + for ( int i = 1 ; i <= ext.NbExt() ; i++ ) { + if ( ext.IsMin(i) ) { + newVal[j] = ext.Point(i).Parameter(); + if ((newVal[j]-lower_bound) >= -tol && + (upper_bound - newVal[j]) >= -tol) + { + qualified[j] = CUBIT_TRUE; + break; + } } } } - if (qualified) - { - qualified = CUBIT_FALSE; - Extrema_ExtPC ext(newP, acurve2, Precision::Approximation()); - double newVal; - if (ext.IsDone() && (ext.NbExt() > 0)) { - for ( int i = 1 ; i <= ext.NbExt() ; i++ ) { - if ( ext.IsMin(i) ) { - newVal = ext.Point(i).Parameter(); - if ((newVal-lower_bound2) >= -tol && - (upper_bound2 - newVal) >= -tol) - { - qualified = CUBIT_TRUE; - break; - } + } + for(int j = 0; j < distShapeShape.NbSolution(); j++) + { + if (qualified[j]) + { + qualified[j] = CUBIT_FALSE; + Extrema_ExtPC ext(newP[j], acurve2, Precision::Approximation()); + double newVal; + if (ext.IsDone() && (ext.NbExt() > 0)) { + for ( int i = 1 ; i <= ext.NbExt() ; i++ ) { + if ( ext.IsMin(i) ) { + newVal = ext.Point(i).Parameter(); + if ((newVal-lower_bound2) >= -tol && + (upper_bound2 - newVal) >= -tol) + { + qualified[j] = CUBIT_TRUE; + break; } } - } + } } - - if(qualified) - { - count_intersection++; - break; - } - } + } + } + for(int k = 0; k < distShapeShape.NbSolution(); k++) + { + if (qualified[k]) + count_intersection++; + intsec_pnt[count_intersection-1] = newP[k]; + if (count_intersection == 2) + { + //make sure the two intersect point are not the same one + if (intsec_pnt[0].IsEqual(intsec_pnt[1], tol)) + count_intersection--; + } + } + } if (count_intersection == 2) break; } //for loop @@ -2144,15 +2165,75 @@ //=============================================================================== // Function : imprint // Member Type: PUBLIC -// Description: imprint boolean operation on facet-based bodies -// Author : John Fowler -// Date : 10/02 +// Description: imprint boolean operation on OCC-based bodies +// Author : Jane Hu +// Date : 04/08 //=============================================================================== -CubitStatus OCCModifyEngine::imprint(BodySM* /*BodyPtr1*/, BodySM* /*BodyPtr2*/, - BodySM*& /*newBody1*/, BodySM*& /*newBody2*/, - bool /*keep_old*/) const +CubitStatus OCCModifyEngine::imprint(BodySM* BodyPtr1, BodySM* BodyPtr2, + BodySM*& newBody1, BodySM*& newBody2, + bool keep_old) const { - PRINT_ERROR("Option not supported for mesh based geometry.\n"); + OCCBody* occ_body = NULL; + DLIList<TopoDS_Shape*> shape_list; + for(int i = 0; i <2; i++) + { + if (i == 0) + occ_body = CAST_TO(BodyPtr1, OCCBody); + else + occ_body = CAST_TO(BodyPtr2, OCCBody); + OCCSurface* surface = occ_body->my_sheet_surface(); + OCCShell* shell = occ_body->shell(); + if(surface) + { + TopoDS_Face* topo_face = surface->get_TopoDS_Face(); + BRepBuilderAPI_Copy api_copy(*topo_face); + TopoDS_Shape newShape = api_copy.ModifiedShape(*topo_face); + TopoDS_Shape* Shape1 = new TopoDS_Shape(newShape); + shape_list.append(Shape1); + } + else if(shell) + { + TopoDS_Shell* topo_shell = shell->get_TopoDS_Shell(); + BRepBuilderAPI_Copy api_copy(*topo_shell); + TopoDS_Shape newShape = api_copy.ModifiedShape(*topo_shell); + TopoDS_Shape* Shape1 = new TopoDS_Shape(newShape); + shape_list.append(Shape1); + } + + else + { + DLIList<Lump*> lumps = occ_body->lumps(); + if (lumps.size() > 1) + { + PRINT_ERROR("Can't do boolean operation on CompSolid types. \n"); + return CUBIT_FAILURE; + } + + TopoDS_Solid* solid = CAST_TO(lumps.get(), OCCLump)->get_TopoDS_Solid(); + BRepBuilderAPI_Copy api_copy(*solid); + TopoDS_Shape newShape = api_copy.ModifiedShape(*solid); + TopoDS_Shape* Shape1 = new TopoDS_Shape(newShape); + shape_list.append(Shape1); + } + } + + TopoDS_Shape* shape1 = shape_list.get(); + TopoDS_Shape* shape2 = shape_list.step_and_get(); + DLIList<TopologyBridge*> tbs; + CubitStatus stat = imprint_toposhapes(shape1, shape2); + if(stat) + { + tbs += OCCQueryEngine::instance()->populate_topology_bridge(*shape1); + newBody1 = CAST_TO(tbs.get(),BodySM); + } + + tbs.clean_out(); + stat = imprint_toposhapes(shape2, shape1); + if(stat) + { + tbs += OCCQueryEngine::instance()->populate_topology_bridge(*shape2); + newBody2 = CAST_TO(tbs.get(),BodySM); + } return CUBIT_FAILURE; }

1 0

r1752 - in cgm/trunk: . test
by kraftche＠mcs.anl.gov 09 Apr '08

09 Apr '08

Author: kraftche Date: 2008-04-09 10:50:36 -0500 (Wed, 09 Apr 2008) New Revision: 1752 Modified: cgm/trunk/configure.in cgm/trunk/test/Makefile.am Log: fix automake warning Modified: cgm/trunk/configure.in =================================================================== --- cgm/trunk/configure.in 2008-04-08 19:11:39 UTC (rev 1751) +++ cgm/trunk/configure.in 2008-04-09 15:50:36 UTC (rev 1752) @@ -318,6 +318,7 @@ ################################################################################ # Output Files ################################################################################ +AC_SUBST(AM_CPPFLAGS) AC_MSG_RESULT([CXXFLAGS = $CXXFLAGS]) AC_OUTPUT_COMMANDS( [if test -f util/CubitUtilConfigure.h; then true; else echo "#define CUBIT_UTIL_EXPORT" > util/CubitUtilConfigure.h; fi], [if test -f geom/CubitGeomConfigure.h; then true; else echo "#define CUBIT_GEOM_EXPORT" > geom/CubitGeomConfigure.h; fi] ) Modified: cgm/trunk/test/Makefile.am =================================================================== --- cgm/trunk/test/Makefile.am 2008-04-08 19:11:39 UTC (rev 1751) +++ cgm/trunk/test/Makefile.am 2008-04-09 15:50:36 UTC (rev 1752) @@ -19,7 +19,7 @@ TESTS += modify makept endif -CPPFLAGS += -DSRCDIR=@srcdir@ +AM_CPPFLAGS += -DSRCDIR=@srcdir@ check_PROGRAMS = $(TESTS) webcut_SOURCES = webcut.cpp

1 0