Author: janehu Date: 2011-04-12 12:48:00 -0500 (Tue, 12 Apr 2011) New Revision: 4733 Modified: cgm/branches/merge-cubit12/configure.ac cgm/branches/merge-cubit12/geom/OCC/OCCAttribSet.cpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp cgm/branches/merge-cubit12/geom/OCC/occ_patches cgm/branches/merge-cubit12/test/modify.cpp cgm/branches/merge-cubit12/test/operation.cpp Log: fixed a bug in generating a line using 2 identical points, should error out. Fixed build error with some prototypes' changes provided by Jed Brown. Fixed some testcase failure agaist OCC6.5. Removed some patches from OCC6.3 which seem to get fixed in OCC6.5 Modified: cgm/branches/merge-cubit12/configure.ac =================================================================== --- cgm/branches/merge-cubit12/configure.ac 2011-04-12 17:42:43 UTC (rev 4732) +++ cgm/branches/merge-cubit12/configure.ac 2011-04-12 17:48:00 UTC (rev 4733) @@ -404,7 +404,7 @@ if test "x$occ_DIR" != "xno"; then OCC_CORE_LIBS="-lTKMesh -lTKTopAlgo -lTKGeomAlgo -lTKBRep -lTKGeomBase -lTKG3d -lTKG2d -lTKMath -lTKernel" OCC_GEOM_LIBS="-lTKHLR -lTKOffset -lTKShHealing -lTKFillet -lTKFeat -lTKBool -lTKBO -lTKPrim" - OCC_LCAF_LIBS="-lTKBinL -lTKLCAF -lTKCDF" + OCC_LCAF_LIBS="-lTKBinL -lTKLCAF -lTKCDF -lTKCAF" OCC_LIBS="$OCC_LCAF_LIBS $OCC_GEOM_LIBS $OCC_CORE_LIBS" CUBIT_OCC_LIB="-lcubit_OCC" OCC_STEP_LIBS="-lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKXSBase" Modified: cgm/branches/merge-cubit12/geom/OCC/OCCAttribSet.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCAttribSet.cpp 2011-04-12 17:42:43 UTC (rev 4732) +++ cgm/branches/merge-cubit12/geom/OCC/OCCAttribSet.cpp 2011-04-12 17:48:00 UTC (rev 4733) @@ -15,7 +15,7 @@ #include "OCCQueryEngine.hpp" #include "CubitSimpleAttrib.hpp" #include "CubitFileIOWrapper.hpp" -#include "Handle_TDataStd_Shape.hxx" +#include "TDataXtd_Shape.hxx" #include "TCollection_ExtendedString.hxx" #include "Handle_TDataStd_Name.hxx" #include "Handle_TDataStd_ExtStringArray.hxx" @@ -25,7 +25,6 @@ #include "TDataStd_ExtStringArray.hxx" #include "TDataStd_RealArray.hxx" #include "TDataStd_IntegerArray.hxx" -#include "TDataStd_Shape.hxx" #include "TopoDS_Shape.hxx" #include "TDF_ChildIterator.hxx" #include <vector> @@ -40,9 +39,9 @@ //find the same shape attribute first aLabel = it1.Value(); - Handle_TDataStd_Shape attr_shape; + Handle_TDataXtd_Shape attr_shape; TopoDS_Shape old_shape; - if(aLabel.FindAttribute(TDataStd_Shape::GetID(), attr_shape)) + if(aLabel.FindAttribute(TDataXtd_Shape::GetID(), attr_shape)) old_shape = attr_shape->Get(aLabel); if(old_shape.IsPartner(shape)) { @@ -64,10 +63,10 @@ if(!found) { aLabel = OCCQueryEngine::instance()->mainLabel.NewChild();