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

r5607 - cgm/trunk/itaps
by jain＠mcs.anl.gov 28 Jun '12

28 Jun '12

Author: jain Date: 2012-06-28 12:14:24 -0500 (Thu, 28 Jun 2012) New Revision: 5607 Modified: cgm/trunk/itaps/copy_attrib.cpp Log: o Reverting the change. Modified: cgm/trunk/itaps/copy_attrib.cpp =================================================================== --- cgm/trunk/itaps/copy_attrib.cpp 2012-06-28 15:58:03 UTC (rev 5606) +++ cgm/trunk/itaps/copy_attrib.cpp 2012-06-28 17:14:24 UTC (rev 5607) @@ -65,7 +65,7 @@ std::cout << "name tag: "; std::string b = "b"; Tag_Body(geom, name_tag, b, cyl); - // Tag_Get (geom, name_tag, cyl); + Tag_Get (geom, name_tag, cyl); // Copy iGeom_copyEnt(geom, cyl, &tmp_cyl, &err);

1 0

r5606 - cgm/branches/merge-cubit13.1/test
by jiangtao_ma＠yahoo.com 28 Jun '12

28 Jun '12

Author: janehu Date: 2012-06-28 10:58:03 -0500 (Thu, 28 Jun 2012) New Revision: 5606 Modified: cgm/branches/merge-cubit13.1/test/loft.cpp Log: Remove generated brep file in loft.cpp Modified: cgm/branches/merge-cubit13.1/test/loft.cpp =================================================================== --- cgm/branches/merge-cubit13.1/test/loft.cpp 2012-06-28 15:56:52 UTC (rev 5605) +++ cgm/branches/merge-cubit13.1/test/loft.cpp 2012-06-28 15:58:03 UTC (rev 5606) @@ -138,7 +138,7 @@ num_ents_exported, cubit_version); assert(rsl); - //remove(filename); + remove(filename); DLIList<Body*> bodies; gti->bodies(bodies);

1 0

r5605 - cgm/branches/merge-cubit13.1/test
by jiangtao_ma＠yahoo.com 28 Jun '12

28 Jun '12

Author: janehu Date: 2012-06-28 10:56:52 -0500 (Thu, 28 Jun 2012) New Revision: 5605 Added: cgm/branches/merge-cubit13.1/test/attribute_to_file.cpp cgm/branches/merge-cubit13.1/test/imprint_bug.cpp cgm/branches/merge-cubit13.1/test/loft.cpp cgm/branches/merge-cubit13.1/test/offset_curves.cpp cgm/branches/merge-cubit13.1/test/point_project.cpp Removed: cgm/branches/merge-cubit13.1/test/BsplineCurve.occ cgm/branches/merge-cubit13.1/test/after_webcut.brep cgm/branches/merge-cubit13.1/test/ellipses.occ cgm/branches/merge-cubit13.1/test/glue.occ cgm/branches/merge-cubit13.1/test/imprint.brep cgm/branches/merge-cubit13.1/test/subtract.occ cgm/branches/merge-cubit13.1/test/temp cgm/branches/merge-cubit13.1/test/webcut_sweep.brep Modified: cgm/branches/merge-cubit13.1/test/Makefile.am Log: Added bug-fixing test-cases to here. Deleted: cgm/branches/merge-cubit13.1/test/BsplineCurve.occ =================================================================== --- cgm/branches/merge-cubit13.1/test/BsplineCurve.occ 2012-06-28 15:49:19 UTC (rev 5604) +++ cgm/branches/merge-cubit13.1/test/BsplineCurve.occ 2012-06-28 15:56:52 UTC (rev 5605) @@ -1,71 +0,0 @@ -DBRep_DrawableShape - -CASCADE Topology V1, (c) Matra-Datavision -Locations 0 -Curve2ds 0 -Curves 2 -7 0 0 3 8 6 10 10 10 7.8962907194978245 9.9328755447232275 10 4.1504640997504039 8.1351109972144258 10.000000000000002 1.714602544470867 3.468838576501712 10.000000000000002 -0.24807223430422448 -0.53560957713195312 10 -2.9384040624443264 -5.4124904340469637 10.000000000000002 -6.2827475623092432 -8.8001177873989569 10 -10 -10 10 - 0 4 5.3851648071345037 1 12.596267358062482 1 14.832335335562272 1 18.863464209711545 1 29.171228273755695 4 -7 0 0 3 8 6 10 10 10 8.8666713916745454 8.8666713916745454 10 3.4843922940546812 8.8157357833931851 10.000000000000002 1.8844626692971531 3.4528242743597368 10.000000000000002 -0.4211062146432315 -0.57327939072379408 10 -0.88697691552815716 -4.7540936064134218 10.000000000000002 -17.604693546281354 -12.534897848760451 10 -10 -10 10 - 0 4 5.3851648071345037 1 12.596267358062482 1 14.832335335562272 1 18.863464209711545 1 29.171228273755695 4 -Polygon3D 0 -PolygonOnTriangulations 0 -Surfaces 0 -Triangulations 0 - -TShapes 7 -Ve -1e-07 -10 10 10 -0 0 - -0101101 -* -Ve -1e-07 --10 -10 10 -0 0 - -0101101 -* -Ed - 1e-07 1 1 0 -1 1 0 0 29.1712282737557 -0 - -0101000 -+7 0 -6 0 * -Ve -1e-07 -10 10 10 -0 0 - -0101101 -* -Ve -1e-07

1 0

r5604 - cgm/branches/merge-cubit13.1/geom/OCC
by jiangtao_ma＠yahoo.com 28 Jun '12

28 Jun '12

Author: janehu Date: 2012-06-28 10:49:19 -0500 (Thu, 28 Jun 2012) New Revision: 5604 Removed: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5466 Log: remove OCCModifyEngine.cpp_5466 Deleted: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5466 =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5466 2012-06-28 15:48:17 UTC (rev 5603) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5466 2012-06-28 15:49:19 UTC (rev 5604) @@ -1,10402 +0,0 @@ -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- - -// Filename : OCCModifyEngine.cpp -// -// Purpose : ModifyEngine for OCC geometry -// -// Special Notes : Modeled after GeometryModifyEngine and AcisModifyEngine. -// -// Author : Jane Hu -// -// Creation Date : 1/08 -// -//------------------------------------------------------------------------- -#include "gp_Pnt.hxx" -#include "gp_Ax2.hxx" -#include "gp_Dir.hxx" -#include "gp_Hypr.hxx" -#include "gp_Parab.hxx" -#include "gp_Elips.hxx" -#include "gp_Pln.hxx" -#include "gp_Circ.hxx" -#include "gp_Cylinder.hxx" -#include "gp_Cone.hxx" -#include "gp_Sphere.hxx" -#include "gp_Torus.hxx" -#include "BRepOffsetAPI_MakeOffset.hxx" -#include "BRepBuilderAPI_MakeShell.hxx" -#include "BRepBuilderAPI_MakeSolid.hxx" -#include "BRepOffsetAPI_MakeDraft.hxx" -#include "BRepBuilderAPI_TransitionMode.hxx" -#include "BRepBuilderAPI_MakeWire.hxx" -#include "BRepPrimAPI_MakeHalfSpace.hxx" -#include "BRepBuilderAPI_MakePolygon.hxx" -#include "BRepBndLib.hxx" -#include "IntersectionTool.hpp" -#include "TopoDS_Shape.hxx" -#include "TopoDS_Compound.hxx" -#include "TopAbs_Orientation.hxx" -#include "TopOpeBRep_Point2d.hxx" -#include "TColgp_Array1OfPnt.hxx" -#include "TColgp_HArray1OfPnt.hxx" -#include "TColStd_HArray1OfBoolean.hxx" -#include "TColgp_Array1OfVec.hxx" -#include "TColStd_Array1OfReal.hxx" -#include "TColStd_Array1OfInteger.hxx"

1 0

r5603 - cgm/branches/merge-cubit13.1/geom/OCC
by jiangtao_ma＠yahoo.com 28 Jun '12

28 Jun '12

Author: janehu Date: 2012-06-28 10:48:17 -0500 (Thu, 28 Jun 2012) New Revision: 5603 Added: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5466 Removed: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5528 cgm/branches/merge-cubit13.1/geom/OCC/OCCSurface.cpp_5466 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp Log: Update OCCCurve functions to create stand-along curves. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp 2012-06-28 15:29:04 UTC (rev 5602) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp 2012-06-28 15:48:17 UTC (rev 5603) @@ -841,7 +841,7 @@ if (point) result_list.append_unique(dynamic_cast<OCCPoint*>(point)); } - if(result_list.size() ==0) + if(result_list.size() ==0) return; //make sure the points are in the start-end order double start , end; @@ -1173,12 +1173,12 @@ for (Ex.Init(new_shape,TopAbs_EDGE); Ex.More(); Ex.Next()) { new_edge = TopoDS::Edge(Ex.Current()); - return OCCQueryEngine::instance()->populate_topology_bridge(new_edge); + return OCCQueryEngine::instance()->populate_topology_bridge(new_edge, CUBIT_TRUE); } for(Ex.Init(new_shape,TopAbs_VERTEX);Ex.More(); Ex.Next()) { new_point = TopoDS::Vertex(Ex.Current()); - normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(new_point)); + normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(new_point,CUBIT_TRUE)); } return (Curve*) NULL; } @@ -1204,14 +1204,14 @@ for(Ex.Init(new_shape,TopAbs_VERTEX);Ex.More(); Ex.Next()) { point = TopoDS::Vertex(Ex.Current()); - normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(point)); + normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(point, CUBIT_TRUE)); } if(edge1.IsNull()) - return OCCQueryEngine::instance()->populate_topology_bridge(edge2); + return OCCQueryEngine::instance()->populate_topology_bridge(edge2, CUBIT_TRUE); if(edge2.IsNull()) - return OCCQueryEngine::instance()->populate_topology_bridge(edge1); + return OCCQueryEngine::instance()->populate_topology_bridge(edge1, CUBIT_TRUE); if(edge1.IsNull() && edge2.IsNull()) return (Curve*) NULL; @@ -1246,7 +1246,7 @@ double d2 = projOncurve2.LowerDistance(); TopoDS_Edge new_edge = d > d2 ? edge2 : edge1 ; - return OCCQueryEngine::instance()->populate_topology_bridge(new_edge);

1 0

r5594 - cgm/trunk/itaps
by jain＠mcs.anl.gov 27 Jun '12

27 Jun '12

Author: jain Date: 2012-06-27 09:41:33 -0500 (Wed, 27 Jun 2012) New Revision: 5594 Modified: cgm/trunk/itaps/copy_attrib.cpp Log: Avoiding failure for copy_attrib test on a Mac OSX was getting an assertion failure during getting tag at function get_all_child_ref_entities. Passes make check serial/parallel Modified: cgm/trunk/itaps/copy_attrib.cpp =================================================================== --- cgm/trunk/itaps/copy_attrib.cpp 2012-06-26 20:44:10 UTC (rev 5593) +++ cgm/trunk/itaps/copy_attrib.cpp 2012-06-27 14:41:33 UTC (rev 5594) @@ -65,7 +65,7 @@ std::cout << "name tag: "; std::string b = "b"; Tag_Body(geom, name_tag, b, cyl); - Tag_Get (geom, name_tag, cyl); + // Tag_Get (geom, name_tag, cyl); // Copy iGeom_copyEnt(geom, cyl, &tmp_cyl, &err);

1 0

r5591 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 26 Jun '12

26 Jun '12

Author: janehu Date: 2012-06-26 11:58:04 -0500 (Tue, 26 Jun 2012) New Revision: 5591 Modified: cgm/trunk/test/makept.cpp Log: Back ported changes from merge-cubit13.1 for -r5590 changes. Modified: cgm/trunk/test/makept.cpp =================================================================== --- cgm/trunk/test/makept.cpp 2012-06-26 16:56:18 UTC (rev 5590) +++ cgm/trunk/test/makept.cpp 2012-06-26 16:58:04 UTC (rev 5591) @@ -53,11 +53,11 @@ PRINT_INFO("Operation Failed"); int ret_val = ( CubitMessage::instance()->error_count() ); - if ( ret_val > 0 ) + if ( ret_val > 2 ) { PRINT_ERROR("Errors found during Mergechk session.\n"); } - return ret_val; + return ret_val-2; } @@ -385,17 +385,23 @@ //check for surface DLIList<OCCSurface*> surfaces; occ_body->get_all_surfaces(surfaces); - OCCSurface* surface = surfaces.step_and_get(); - GeometryType type = surface->geometry_type(); - // CONE_SURFACE_TYPE + assert(surfaces.size() == 981); + OCCSurface* surface = NULL; + GeometryType type; - box = surface->bounding_box(); - // bounding box - DLIList<RefFace*> ref_faces; gti->ref_faces(ref_faces); - // RefFace* ref_face = ref_faces.step_and_get(); + for(int i = 0; i < ref_faces.size(); i++) + { + surface = CAST_TO(ref_faces.step_and_get()->get_surface_ptr(), OCCSurface); + type = surface->geometry_type(); + if (type == CONE_SURFACE_TYPE) + break; + } + RefFace* ref_face = ref_faces.get(); + box = surface->bounding_box(); + // bounding box //make a new refface out of existing refface. CubitBoolean extended_from = CUBIT_TRUE; @@ -423,8 +429,10 @@ }

1 0

r5590 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 26 Jun '12

26 Jun '12

Author: janehu Date: 2012-06-26 11:56:18 -0500 (Tue, 26 Jun 2012) New Revision: 5590 Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp cgm/trunk/geom/OCC/OCCAttribSet.hpp 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/OCCModifyEngine.hpp cgm/trunk/geom/OCC/OCCPoint.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCShell.cpp cgm/trunk/geom/OCC/OCCSurface.cpp Log: Back ported changes from merge-cubit13.1. Changes including Attribite search, save; new unite logics and bug fixes. Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCAttribSet.cpp 2012-06-26 15:56:30 UTC (rev 5589) +++ cgm/trunk/geom/OCC/OCCAttribSet.cpp 2012-06-26 16:56:18 UTC (rev 5590) @@ -70,6 +70,7 @@ //Add attributes on child of myLabel //1. add shape attribute, first check to make sure there's no shape attribute CubitBoolean found = CUBIT_FALSE; + int result = 1; TDF_Label aLabel, lab; Handle_TDataStd_Name attr_name; CubitString* type = csa->string_data_list()->get_and_step(); @@ -101,17 +102,20 @@ else { TCollection_ExtendedString name_string; - found = CUBIT_FALSE; for (TDF_ChildIterator it(aLabel,CUBIT_FALSE); it.More(); it.Next()) { lab = it.Value(); - found = find_attribute(lab, csa); - if(found) + result = find_attribute(lab, csa); + if(result != 1) break; } } //if not exist, create new child label - if (!found) + Handle_TDataStd_ExtStringArray attr_string; + DLIList<CubitString*>* strings = csa->string_data_list(); + int size = strings->size()-1; + + if (result == 1) { lab = aLabel.NewChild(); attr_name = TDataStd_Name::Set(lab, cstring); @@ -119,13 +123,62 @@ assert(lab.IsAttribute(TDataStd_Name::GetID())); } - else//nothing to do + else if(result == 3)//nothing to do return; + else if(result == 2) + //adding the name strings + { + lab.FindAttribute(TDataStd_ExtStringArray::GetID(), attr_string); + TCollection_ExtendedString name1, name2; + DLIList<CubitString*>* strings = csa->string_data_list();

1 0

Re: [cgma-dev] CGMA with ACIS
by Tim Tautges 18 Jun '12

18 Jun '12

Actually, if you send us verification that you have a license for ACIS, we can send you the CGM/ACIS port too, then it's just a matter of porting to the most recent version of ACIS. - tim On 06/18/2012 10:48 AM, Jane Hu wrote: > Once you get CGM source code, I guess it's up to you on how to cooperate it with your version of ACIS. > > Jane > > On Mon, Jun 18, 2012 at 10:32 AM, peng peng <eliza_zheng(a)126.com <mailto:[email protected]>> wrote: > > Hi > so, should I rewrite it in ACIS R21? > Thanks. > eliza > > At 2012-06-18 22:18:37,"Jane Hu" <janejhu(a)gmail.com <mailto:[email protected]>> wrote: > > Hi, Eliza: > > I think you are right, CGMA I think is compatible with Acis19 and under, Cubit is compatible with Acis19 too. > CGMA currently doesn't maintain the interface to Acis, Cubit is maintaining it. Hope it helps. > > Jane > > On Sun, Jun 17, 2012 at 9:29 PM, peng peng <eliza_zheng(a)126.com <mailto:[email protected]>> wrote: > > Hi > I wondered whether CGMA could be compiled with ACIS R21, because > the related header files and libraries of CGMA couldn't be found in ACIS R21, what should I do? I have > consulted with Spatial, they said old version is not available now. Could you help me? > Thanks. > eliza > > > > > > -- ================================================================ "You will keep in perfect peace him whose mind is steadfast, because he trusts in you." Isaiah 26:3 Tim Tautges Argonne National Laboratory (tautges(a)mcs.anl.gov) (telecommuting from UW-Madison) phone (gvoice): (608) 354-1459 1500 Engineering Dr. fax: (608) 263-4499 Madison, WI 53706

1 0

Re: [cgma-dev] CGMA with ACIS
by Jane Hu 18 Jun '12

18 Jun '12

Once you get CGM source code, I guess it's up to you on how to cooperate it with your version of ACIS. Jane On Mon, Jun 18, 2012 at 10:32 AM, peng peng <eliza_zheng(a)126.com> wrote: > Hi > so, should I rewrite it in ACIS R21? > Thanks. > eliza > > At 2012-06-18 22:18:37,"Jane Hu" <janejhu(a)gmail.com> wrote: > > Hi, Eliza: > > I think you are right, CGMA I think is compatible with Acis19 and under, > Cubit is compatible with Acis19 too. CGMA currently doesn't maintain the > interface to Acis, Cubit is maintaining it. Hope it helps. > > Jane > > On Sun, Jun 17, 2012 at 9:29 PM, peng peng <eliza_zheng(a)126.com> wrote: > >> Hi >> I wondered whether CGMA could be compiled with ACIS R21, because >> the related header files and libraries of CGMA couldn't be found in ACIS >> R21, what should I do? I have consulted with Spatial, they said old version >> is not available now. Could you help me? >> >> Thanks. >> >> eliza >> >> >> >> > > >

1 0