May 2013 - cgma-dev - mailman3.cels.anl.gov

r6049 - cgm/trunk/geom/OCC
by janehu＠mcs.anl.gov 28 May '13

28 May '13

Author: janehu Date: 2013-05-28 13:29:15 -0500 (Tue, 28 May 2013) New Revision: 6049 Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp Log: Change the function call to be more specific to get rid of 'attention etat fantomatique' message from opencascade. Passed make check in occ654 build. Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCAttribSet.cpp 2013-05-24 16:23:36 UTC (rev 6048) +++ cgm/trunk/geom/OCC/OCCAttribSet.cpp 2013-05-28 18:29:15 UTC (rev 6049) @@ -368,7 +368,7 @@ if(!found) return; - myLabel.ForgetAllAttributes(false); + myLabel.ForgetAttribute(TDataXtd_Shape::GetID()); /* if(OCCQueryEngine::instance()->OCCMap->IsBound(shape)) {

1 0

r6048 - in cgm/trunk: . geom/OCC test
by janehu＠mcs.anl.gov 24 May '13

24 May '13

Author: janehu Date: 2013-05-24 11:23:36 -0500 (Fri, 24 May 2013) New Revision: 6048 Added: cgm/trunk/geom/OCC/occ_patches_6.6.0 Modified: cgm/trunk/README.CONFIGURE cgm/trunk/geom/OCC/OCCAttribSet.cpp cgm/trunk/geom/OCC/OCCLump.cpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCPoint.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/test/modify.cpp cgm/trunk/test/operation.cpp cgm/trunk/test/r_w.cpp Log: Added patch for opencascade6.6.0 build; Code is compatible with occ6.5 and 6.6; Fixed several memory leak and initial value problems. Passed both builds with occ654 and occ660 before and after intallation, for 'make check' check. Modified: cgm/trunk/README.CONFIGURE =================================================================== --- cgm/trunk/README.CONFIGURE 2013-05-24 15:16:13 UTC (rev 6047) +++ cgm/trunk/README.CONFIGURE 2013-05-24 16:23:36 UTC (rev 6048) @@ -42,4 +42,6 @@ Execute the following commands in the top-most directory: autoreconf -fi ./configure - make dist + make + make check + make install Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCAttribSet.cpp 2013-05-24 15:16:13 UTC (rev 6047) +++ cgm/trunk/geom/OCC/OCCAttribSet.cpp 2013-05-24 16:23:36 UTC (rev 6048) @@ -74,7 +74,7 @@ TDF_Label aLabel, lab; Handle_TDataStd_Name attr_name; CubitString* type = csa->string_data_list()->get_and_step(); - TCollection_ExtendedString cstring( (Standard_CString)type->c_str() ); + TCollection_ExtendedString cstring( type->c_str(), CUBIT_TRUE ); FindShape(shape, aLabel, found); @@ -548,7 +548,7 @@ return CUBIT_FAILURE; Handle_TDataStd_Name attr_name; - TCollection_ExtendedString cstring( (Standard_CString)name.c_str() ); + TCollection_ExtendedString cstring( name.c_str(), CUBIT_TRUE ); TDF_Label lab; for (TDF_ChildIterator it(aLabel,CUBIT_FALSE); it.More(); it.Next()) { Modified: cgm/trunk/geom/OCC/OCCLump.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCLump.cpp 2013-05-24 15:16:13 UTC (rev 6047) +++ cgm/trunk/geom/OCC/OCCLump.cpp 2013-05-24 16:23:36 UTC (rev 6048) @@ -46,7 +46,8 @@ #include "BRepBndLib.hxx" #include "GProp_GProps.hxx" #include "BRepGProp.hxx" -#include "BOP_SolidClassifier.hxx" +#include "BRepClass3d_SolidExplorer.hxx" +#include "BRepClass3d_SClassifier.hxx" #include "TopExp_Explorer.hxx" #include "TopoDS.hxx" #include "BRep_Tool.hxx" @@ -335,9 +336,9 @@

1 0

r6047 - cgm/trunk/geom/Cholla
by iulian＠mcs.anl.gov 24 May '13

24 May '13

Author: iulian Date: 2013-05-24 10:16:13 -0500 (Fri, 24 May 2013) New Revision: 6047 Modified: cgm/trunk/geom/Cholla/Makefile.am Log: make distclean issues on occ based builds FacetorUtil files are needed, although we do not compile them separately, so put them in EXTRA_DIST Modified: cgm/trunk/geom/Cholla/Makefile.am =================================================================== --- cgm/trunk/geom/Cholla/Makefile.am 2013-05-24 14:44:35 UTC (rev 6046) +++ cgm/trunk/geom/Cholla/Makefile.am 2013-05-24 15:16:13 UTC (rev 6047) @@ -51,6 +51,9 @@ TDFacetBoundaryPoint.cpp \ TDGeomFacet.cpp +EXTRA_DIST = FacetorUtil.hpp \ + FacetorUtil.cpp + # Headers to be installed. If any file in this list should # not be installed, move it to the _SOURCES list above. libCholla_la_include_HEADERS = \

1 0

r6046 - cgm/trunk/geom/Cholla
by iulian＠mcs.anl.gov 24 May '13

24 May '13

Author: iulian Date: 2013-05-24 09:44:35 -0500 (Fri, 24 May 2013) New Revision: 6046 Modified: cgm/trunk/geom/Cholla/FacetorUtil.hpp cgm/trunk/geom/Cholla/Makefile.am Log: reverting some of the changes made yesterday because of make distcheck not working on occ builds it affected in a curious way the shared build only need more investigation. Modified: cgm/trunk/geom/Cholla/FacetorUtil.hpp =================================================================== --- cgm/trunk/geom/Cholla/FacetorUtil.hpp 2013-05-23 17:51:42 UTC (rev 6045) +++ cgm/trunk/geom/Cholla/FacetorUtil.hpp 2013-05-24 14:44:35 UTC (rev 6046) @@ -127,5 +127,5 @@ static double radius(TRI* tri_ptr); }; -//#include "FacetorUtil.cpp" +#include "FacetorUtil.cpp" #endif Modified: cgm/trunk/geom/Cholla/Makefile.am =================================================================== --- cgm/trunk/geom/Cholla/Makefile.am 2013-05-23 17:51:42 UTC (rev 6045) +++ cgm/trunk/geom/Cholla/Makefile.am 2013-05-24 14:44:35 UTC (rev 6046) @@ -77,7 +77,6 @@ FacetEntity.hpp \ FacetEvalTool.hpp \ FacetorTool.hpp \ - FacetorUtil.hpp \ GeoNode.hpp \ GeoTet.hpp \ LoopParamTool.hpp \

1 0

buildbot failure in cgm-occ-sertrunk: failed test
by cgma-dev＠mcs.anl.gov 24 May '13

24 May '13

1 0

r6045 - in cgm/trunk: geom/Cholla test util
by iulian＠mcs.anl.gov 23 May '13

23 May '13

Author: iulian Date: 2013-05-23 12:51:42 -0500 (Thu, 23 May 2013) New Revision: 6045 Modified: cgm/trunk/geom/Cholla/FacetorUtil.hpp cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/test/Makefile.am cgm/trunk/util/Makefile.am Log: make distcheck should work now on a occ653 based build Modified: cgm/trunk/geom/Cholla/FacetorUtil.hpp =================================================================== --- cgm/trunk/geom/Cholla/FacetorUtil.hpp 2013-05-23 05:25:48 UTC (rev 6044) +++ cgm/trunk/geom/Cholla/FacetorUtil.hpp 2013-05-23 17:51:42 UTC (rev 6045) @@ -127,5 +127,5 @@ static double radius(TRI* tri_ptr); }; -#include "FacetorUtil.cpp" +//#include "FacetorUtil.cpp" #endif Modified: cgm/trunk/geom/Cholla/Makefile.am =================================================================== --- cgm/trunk/geom/Cholla/Makefile.am 2013-05-23 05:25:48 UTC (rev 6044) +++ cgm/trunk/geom/Cholla/Makefile.am 2013-05-23 17:51:42 UTC (rev 6045) @@ -25,6 +25,7 @@ ChollaPoint.cpp \ ChollaSkinTool.cpp \ ChollaSurface.cpp \ + ChollaVolume.cpp \ ChordalAxis.cpp \ CubitFacet.cpp \ CubitFacetData.cpp \ @@ -61,6 +62,7 @@ ChollaPoint.hpp \ ChollaSkinTool.hpp \ ChollaSurface.hpp \ + ChollaVolume.hpp \ ChordalAxis.hpp \ CubitFacet.hpp \ CubitFacetData.hpp \ @@ -75,6 +77,7 @@ FacetEntity.hpp \ FacetEvalTool.hpp \ FacetorTool.hpp \ + FacetorUtil.hpp \ GeoNode.hpp \ GeoTet.hpp \ LoopParamTool.hpp \ Modified: cgm/trunk/test/Makefile.am =================================================================== --- cgm/trunk/test/Makefile.am 2013-05-23 05:25:48 UTC (rev 6044) +++ cgm/trunk/test/Makefile.am 2013-05-23 17:51:42 UTC (rev 6045) @@ -120,6 +120,7 @@ Line_2.brep \ stitch.name_occ \ box-w-hole.brep \ + Solid_2.brep \ Solid_6.brep \

1 0

Re: [cgma-dev] r6044 - cgm/trunk/util
by Iulian Grindeanu 23 May '13

23 May '13

1 0

Re: [cgma-dev] r6044 - cgm/trunk/util
by Tim Tautges 23 May '13

23 May '13

Thanks Iulian, I figured you'd be able to fix it that quickly! - tim On 05/23/2013 12:25 AM, iulian(a)mcs.anl.gov wrote: > Author: iulian > Date: 2013-05-23 00:25:48 -0500 (Thu, 23 May 2013) > New Revision: 6044 > > Modified: > cgm/trunk/util/Makefile.am > Log: > make distcheck should work on the trunk now > it was missing one file from distribution :( > > > Modified: cgm/trunk/util/Makefile.am > =================================================================== > --- cgm/trunk/util/Makefile.am 2013-05-23 05:00:15 UTC (rev 6043) > +++ cgm/trunk/util/Makefile.am 2013-05-23 05:25:48 UTC (rev 6044) > @@ -123,6 +123,7 @@ > DynamicDLIIterator.hpp \ > DynamicTreeIterator.hpp \ > ElementType.h \ > + FacetShapeDefs.hpp \ > GMem.hpp \ > GeometryDefines.h \ > GetLongOpt.hpp \ > > -- ================================================================ "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

r6044 - cgm/trunk/util
by iulian＠mcs.anl.gov 23 May '13

23 May '13

Author: iulian Date: 2013-05-23 00:25:48 -0500 (Thu, 23 May 2013) New Revision: 6044 Modified: cgm/trunk/util/Makefile.am Log: make distcheck should work on the trunk now it was missing one file from distribution :( Modified: cgm/trunk/util/Makefile.am =================================================================== --- cgm/trunk/util/Makefile.am 2013-05-23 05:00:15 UTC (rev 6043) +++ cgm/trunk/util/Makefile.am 2013-05-23 05:25:48 UTC (rev 6044) @@ -123,6 +123,7 @@ DynamicDLIIterator.hpp \ DynamicTreeIterator.hpp \ ElementType.h \ + FacetShapeDefs.hpp \ GMem.hpp \ GeometryDefines.h \ GetLongOpt.hpp \

1 0

r6043 - cgm/trunk/cgm_apps/examples/driverc++
by iulian＠mcs.anl.gov 23 May '13

23 May '13

Author: iulian Date: 2013-05-23 00:00:15 -0500 (Thu, 23 May 2013) New Revision: 6043 Added: cgm/trunk/cgm_apps/examples/driverc++/mergechk_huge cgm/trunk/cgm_apps/examples/driverc++/mergechk_merge Log: add some test files needed only when building with ACIS make dist should work now on the trunk Added: cgm/trunk/cgm_apps/examples/driverc++/mergechk_huge =================================================================== --- cgm/trunk/cgm_apps/examples/driverc++/mergechk_huge (rev 0) +++ cgm/trunk/cgm_apps/examples/driverc++/mergechk_huge 2013-05-23 05:00:15 UTC (rev 6043) @@ -0,0 +1,2 @@ +#!/bin/sh +./mergechk $srcdir/huge.sat Property changes on: cgm/trunk/cgm_apps/examples/driverc++/mergechk_huge ___________________________________________________________________ Added: svn:executable + * Added: cgm/trunk/cgm_apps/examples/driverc++/mergechk_merge =================================================================== --- cgm/trunk/cgm_apps/examples/driverc++/mergechk_merge (rev 0) +++ cgm/trunk/cgm_apps/examples/driverc++/mergechk_merge 2013-05-23 05:00:15 UTC (rev 6043) @@ -0,0 +1,2 @@ +#!/bin/sh +./mergechk $srcdir/merge.sat Property changes on: cgm/trunk/cgm_apps/examples/driverc++/mergechk_merge ___________________________________________________________________ Added: svn:executable + *

1 0