[cgma-dev] r3494 - in cgm/branches/merge-cubit12: . geom geom/ACIS geom/Cholla geom/OCC geom/SolidWorks geom/facet geom/facetbool geom/parallel geom/testing geom/virtual init test
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Tue Jan 26 18:51:03 CST 2010
Author: kraftche
Date: 2010-01-26 18:51:03 -0600 (Tue, 26 Jan 2010)
New Revision: 3494
Modified:
cgm/branches/merge-cubit12/
cgm/branches/merge-cubit12/geom/
cgm/branches/merge-cubit12/geom/ACIS/
cgm/branches/merge-cubit12/geom/AllocMemManagersGeom.cpp
cgm/branches/merge-cubit12/geom/AnalyticGeometryTool.cpp
cgm/branches/merge-cubit12/geom/AnalyticGeometryTool.hpp
cgm/branches/merge-cubit12/geom/AutoMidsurfaceTool.cpp
cgm/branches/merge-cubit12/geom/AutoMidsurfaceTool.hpp
cgm/branches/merge-cubit12/geom/BasicTopologyEntity.cpp
cgm/branches/merge-cubit12/geom/BasicTopologyEntity.hpp
cgm/branches/merge-cubit12/geom/Body.cpp
cgm/branches/merge-cubit12/geom/Body.hpp
cgm/branches/merge-cubit12/geom/BodySM.cpp
cgm/branches/merge-cubit12/geom/BodySM.hpp
cgm/branches/merge-cubit12/geom/BoundingBoxTool.cpp
cgm/branches/merge-cubit12/geom/BoundingBoxTool.hpp
cgm/branches/merge-cubit12/geom/BridgeManager.cpp
cgm/branches/merge-cubit12/geom/BridgeManager.hpp
cgm/branches/merge-cubit12/geom/CAActuateSet.cpp
cgm/branches/merge-cubit12/geom/CAActuateSet.hpp
cgm/branches/merge-cubit12/geom/CADeferredAttrib.cpp
cgm/branches/merge-cubit12/geom/CADeferredAttrib.hpp
cgm/branches/merge-cubit12/geom/CADefines.hpp
cgm/branches/merge-cubit12/geom/CAEntityColor.cpp
cgm/branches/merge-cubit12/geom/CAEntityColor.hpp
cgm/branches/merge-cubit12/geom/CAEntityId.cpp
cgm/branches/merge-cubit12/geom/CAEntityId.hpp
cgm/branches/merge-cubit12/geom/CAEntityName.cpp
cgm/branches/merge-cubit12/geom/CAEntityName.hpp
cgm/branches/merge-cubit12/geom/CAGroup.cpp
cgm/branches/merge-cubit12/geom/CAGroup.hpp
cgm/branches/merge-cubit12/geom/CAMergePartner.cpp
cgm/branches/merge-cubit12/geom/CAMergePartner.hpp
cgm/branches/merge-cubit12/geom/CAMergeStatus.cpp
cgm/branches/merge-cubit12/geom/CAMergeStatus.hpp
cgm/branches/merge-cubit12/geom/CASourceFeature.cpp
cgm/branches/merge-cubit12/geom/CASourceFeature.hpp
cgm/branches/merge-cubit12/geom/CAUniqueId.cpp
cgm/branches/merge-cubit12/geom/CAUniqueId.hpp
cgm/branches/merge-cubit12/geom/CGMApp.cpp
cgm/branches/merge-cubit12/geom/CGMApp.hpp
cgm/branches/merge-cubit12/geom/CGMEngineDynamicLoader.cpp
cgm/branches/merge-cubit12/geom/CGMEngineDynamicLoader.hpp
cgm/branches/merge-cubit12/geom/CGMHistory.cpp
cgm/branches/merge-cubit12/geom/CGMHistory.hpp
cgm/branches/merge-cubit12/geom/CMakeLists.txt
cgm/branches/merge-cubit12/geom/Chain.cpp
cgm/branches/merge-cubit12/geom/Chain.hpp
cgm/branches/merge-cubit12/geom/Cholla/
cgm/branches/merge-cubit12/geom/CoEdge.cpp
cgm/branches/merge-cubit12/geom/CoEdge.hpp
cgm/branches/merge-cubit12/geom/CoEdgeSM.cpp
cgm/branches/merge-cubit12/geom/CoEdgeSM.hpp
cgm/branches/merge-cubit12/geom/CoFace.cpp
cgm/branches/merge-cubit12/geom/CoFace.hpp
cgm/branches/merge-cubit12/geom/CoVertex.cpp
cgm/branches/merge-cubit12/geom/CoVertex.hpp
cgm/branches/merge-cubit12/geom/CoVolume.cpp
cgm/branches/merge-cubit12/geom/CoVolume.hpp
cgm/branches/merge-cubit12/geom/CollectionEntity.cpp
cgm/branches/merge-cubit12/geom/CollectionEntity.hpp
cgm/branches/merge-cubit12/geom/CompositeCombineEvent.hpp
cgm/branches/merge-cubit12/geom/CubitAttrib.cpp
cgm/branches/merge-cubit12/geom/CubitAttrib.hpp
cgm/branches/merge-cubit12/geom/CubitAttribManager.cpp
cgm/branches/merge-cubit12/geom/CubitAttribManager.hpp
cgm/branches/merge-cubit12/geom/CubitAttribUser.cpp
cgm/branches/merge-cubit12/geom/CubitAttribUser.hpp
cgm/branches/merge-cubit12/geom/CubitEvaluator.hpp
cgm/branches/merge-cubit12/geom/CubitGeomConfigure.h
cgm/branches/merge-cubit12/geom/CubitGeomConfigure.h.in
cgm/branches/merge-cubit12/geom/CubitPolygon.cpp
cgm/branches/merge-cubit12/geom/CubitPolygon.hpp
cgm/branches/merge-cubit12/geom/CubitSimpleAttrib.cpp
cgm/branches/merge-cubit12/geom/CubitSimpleAttrib.hpp
cgm/branches/merge-cubit12/geom/Curve.cpp
cgm/branches/merge-cubit12/geom/Curve.hpp
cgm/branches/merge-cubit12/geom/CurveOverlapFacet.cpp
cgm/branches/merge-cubit12/geom/CurveOverlapFacet.hpp
cgm/branches/merge-cubit12/geom/CurveSM.cpp
cgm/branches/merge-cubit12/geom/CurveSM.hpp
cgm/branches/merge-cubit12/geom/CylinderEvaluator.cpp
cgm/branches/merge-cubit12/geom/CylinderEvaluator.hpp
cgm/branches/merge-cubit12/geom/DAG.cpp
cgm/branches/merge-cubit12/geom/DAG.hpp
cgm/branches/merge-cubit12/geom/DagDrawingTool.cpp
cgm/branches/merge-cubit12/geom/DagDrawingTool.hpp
cgm/branches/merge-cubit12/geom/DagType.hpp
cgm/branches/merge-cubit12/geom/GSaveOpen.cpp
cgm/branches/merge-cubit12/geom/GSaveOpen.hpp
cgm/branches/merge-cubit12/geom/GeomDataObserver.cpp
cgm/branches/merge-cubit12/geom/GeomDataObserver.hpp
cgm/branches/merge-cubit12/geom/GeomMeasureTool.cpp
cgm/branches/merge-cubit12/geom/GeomMeasureTool.hpp
cgm/branches/merge-cubit12/geom/GeomPoint.hpp
cgm/branches/merge-cubit12/geom/GeomSeg.hpp
cgm/branches/merge-cubit12/geom/GeometryEntity.cpp
cgm/branches/merge-cubit12/geom/GeometryEntity.hpp
cgm/branches/merge-cubit12/geom/GeometryFeatureEngine.cpp
cgm/branches/merge-cubit12/geom/GeometryFeatureEngine.hpp
cgm/branches/merge-cubit12/geom/GeometryFeatureTool.cpp
cgm/branches/merge-cubit12/geom/GeometryFeatureTool.hpp
cgm/branches/merge-cubit12/geom/GeometryHealerEngine.cpp
cgm/branches/merge-cubit12/geom/GeometryHealerEngine.hpp
cgm/branches/merge-cubit12/geom/GeometryHealerTool.cpp
cgm/branches/merge-cubit12/geom/GeometryHealerTool.hpp
cgm/branches/merge-cubit12/geom/GeometryModifyEngine.cpp
cgm/branches/merge-cubit12/geom/GeometryModifyEngine.hpp
cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp
cgm/branches/merge-cubit12/geom/GeometryModifyTool.hpp
cgm/branches/merge-cubit12/geom/GeometryQueryEngine.cpp
cgm/branches/merge-cubit12/geom/GeometryQueryEngine.hpp
cgm/branches/merge-cubit12/geom/GeometryQueryTool.cpp
cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
cgm/branches/merge-cubit12/geom/GeometryUtil.cpp
cgm/branches/merge-cubit12/geom/GeometryUtil.hpp
cgm/branches/merge-cubit12/geom/GfxPreview.cpp
cgm/branches/merge-cubit12/geom/GfxPreview.hpp
cgm/branches/merge-cubit12/geom/GroupingEntity.cpp
cgm/branches/merge-cubit12/geom/GroupingEntity.hpp
cgm/branches/merge-cubit12/geom/IntermediateGeomEngine.hpp
cgm/branches/merge-cubit12/geom/Loop.cpp
cgm/branches/merge-cubit12/geom/Loop.hpp
cgm/branches/merge-cubit12/geom/LoopSM.cpp
cgm/branches/merge-cubit12/geom/LoopSM.hpp
cgm/branches/merge-cubit12/geom/Lump.cpp
cgm/branches/merge-cubit12/geom/Lump.hpp
cgm/branches/merge-cubit12/geom/LumpSM.cpp
cgm/branches/merge-cubit12/geom/LumpSM.hpp
cgm/branches/merge-cubit12/geom/Makefile.am
cgm/branches/merge-cubit12/geom/MedialTool2D.cpp
cgm/branches/merge-cubit12/geom/MedialTool2D.hpp
cgm/branches/merge-cubit12/geom/MedialTool3D.cpp
cgm/branches/merge-cubit12/geom/MedialTool3D.hpp
cgm/branches/merge-cubit12/geom/MergeTool.cpp
cgm/branches/merge-cubit12/geom/MergeTool.hpp
cgm/branches/merge-cubit12/geom/MergeToolAssistant.cpp
cgm/branches/merge-cubit12/geom/MergeToolAssistant.hpp
cgm/branches/merge-cubit12/geom/MidPlaneTool.cpp
cgm/branches/merge-cubit12/geom/MidPlaneTool.hpp
cgm/branches/merge-cubit12/geom/ModelEntity.cpp
cgm/branches/merge-cubit12/geom/ModelEntity.hpp
cgm/branches/merge-cubit12/geom/ModelQueryEngine.cpp
cgm/branches/merge-cubit12/geom/ModelQueryEngine.hpp
cgm/branches/merge-cubit12/geom/OCC/
cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp
cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp
cgm/branches/merge-cubit12/geom/OffsetSplitTool.cpp
cgm/branches/merge-cubit12/geom/OffsetSplitTool.hpp
cgm/branches/merge-cubit12/geom/OldUnmergeCode.cpp
cgm/branches/merge-cubit12/geom/OldUnmergeCode.hpp
cgm/branches/merge-cubit12/geom/PeriodicParamTool.cpp
cgm/branches/merge-cubit12/geom/PeriodicParamTool.hpp
cgm/branches/merge-cubit12/geom/Point.cpp
cgm/branches/merge-cubit12/geom/Point.hpp
cgm/branches/merge-cubit12/geom/PointSM.cpp
cgm/branches/merge-cubit12/geom/PointSM.hpp
cgm/branches/merge-cubit12/geom/RefCollection.cpp
cgm/branches/merge-cubit12/geom/RefCollection.hpp
cgm/branches/merge-cubit12/geom/RefEdge.cpp
cgm/branches/merge-cubit12/geom/RefEdge.hpp
cgm/branches/merge-cubit12/geom/RefEntity.cpp
cgm/branches/merge-cubit12/geom/RefEntity.hpp
cgm/branches/merge-cubit12/geom/RefEntityFactory.cpp
cgm/branches/merge-cubit12/geom/RefEntityFactory.hpp
cgm/branches/merge-cubit12/geom/RefEntityName.cpp
cgm/branches/merge-cubit12/geom/RefEntityName.hpp
cgm/branches/merge-cubit12/geom/RefEntityNameMap.hpp
cgm/branches/merge-cubit12/geom/RefFace.cpp
cgm/branches/merge-cubit12/geom/RefFace.hpp
cgm/branches/merge-cubit12/geom/RefGroup.cpp
cgm/branches/merge-cubit12/geom/RefGroup.hpp
cgm/branches/merge-cubit12/geom/RefVertex.cpp
cgm/branches/merge-cubit12/geom/RefVertex.hpp
cgm/branches/merge-cubit12/geom/RefVolume.cpp
cgm/branches/merge-cubit12/geom/RefVolume.hpp
cgm/branches/merge-cubit12/geom/SenseEntity.cpp
cgm/branches/merge-cubit12/geom/SenseEntity.hpp
cgm/branches/merge-cubit12/geom/Shell.cpp
cgm/branches/merge-cubit12/geom/Shell.hpp
cgm/branches/merge-cubit12/geom/ShellSM.cpp
cgm/branches/merge-cubit12/geom/ShellSM.hpp
cgm/branches/merge-cubit12/geom/SolidWorks/
cgm/branches/merge-cubit12/geom/SphereEvaluator.cpp
cgm/branches/merge-cubit12/geom/SphereEvaluator.hpp
cgm/branches/merge-cubit12/geom/SplitSurfaceTool.cpp
cgm/branches/merge-cubit12/geom/SplitSurfaceTool.hpp
cgm/branches/merge-cubit12/geom/SurfParamTool.cpp
cgm/branches/merge-cubit12/geom/SurfParamTool.hpp
cgm/branches/merge-cubit12/geom/Surface.cpp
cgm/branches/merge-cubit12/geom/Surface.hpp
cgm/branches/merge-cubit12/geom/SurfaceOverlapFacet.cpp
cgm/branches/merge-cubit12/geom/SurfaceOverlapFacet.hpp
cgm/branches/merge-cubit12/geom/SurfaceOverlapTool.cpp
cgm/branches/merge-cubit12/geom/SurfaceOverlapTool.hpp
cgm/branches/merge-cubit12/geom/SurfaceSM.cpp
cgm/branches/merge-cubit12/geom/SurfaceSM.hpp
cgm/branches/merge-cubit12/geom/TBOwner.hpp
cgm/branches/merge-cubit12/geom/TBOwnerSet.hpp
cgm/branches/merge-cubit12/geom/TDCAGE.cpp
cgm/branches/merge-cubit12/geom/TDCAGE.hpp
cgm/branches/merge-cubit12/geom/TDCompare.hpp
cgm/branches/merge-cubit12/geom/TDSourceFeature.cpp
cgm/branches/merge-cubit12/geom/TDSourceFeature.hpp
cgm/branches/merge-cubit12/geom/TDSplitSurface.cpp
cgm/branches/merge-cubit12/geom/TDSplitSurface.hpp
cgm/branches/merge-cubit12/geom/TDSurfaceOverlap.cpp
cgm/branches/merge-cubit12/geom/TDSurfaceOverlap.hpp
cgm/branches/merge-cubit12/geom/TDUniqueId.cpp
cgm/branches/merge-cubit12/geom/TDUniqueId.hpp
cgm/branches/merge-cubit12/geom/TopologyBridge.cpp
cgm/branches/merge-cubit12/geom/TopologyBridge.hpp
cgm/branches/merge-cubit12/geom/TopologyEntity.cpp
cgm/branches/merge-cubit12/geom/TopologyEntity.hpp
cgm/branches/merge-cubit12/geom/UnMergeEvent.hpp
cgm/branches/merge-cubit12/geom/facet/
cgm/branches/merge-cubit12/geom/facet/FacetModifyEngine.cpp
cgm/branches/merge-cubit12/geom/facetbool/
cgm/branches/merge-cubit12/geom/libcubit_geom.dsp
cgm/branches/merge-cubit12/geom/parallel/
cgm/branches/merge-cubit12/geom/testing/
cgm/branches/merge-cubit12/geom/virtual/
cgm/branches/merge-cubit12/init/InitCGMA.cpp
cgm/branches/merge-cubit12/test/
cgm/branches/merge-cubit12/test/Makefile.am
cgm/branches/merge-cubit12/test/operation.cpp
Log:
merge with trunk
Property changes on: cgm/branches/merge-cubit12
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit:1041-3427
/cgm/trunk:3424-3459
+ /cgm/branches/cubit:1041-3427
/cgm/trunk:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom:1041-3427*
/cgm/trunk/geom:3424-3459*
+ /cgm/branches/cubit/geom:1041-3427*
/cgm/trunk/geom:3424-3493*
Property changes on: cgm/branches/merge-cubit12/geom/ACIS
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/trunk/geom/ACIS:3424-3459
+ /cgm/trunk/geom/ACIS:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/AllocMemManagersGeom.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/AllocMemManagersGeom.cpp:1041-3427
/cgm/trunk/geom/AllocMemManagersGeom.cpp:3424-3459
+ /cgm/branches/cubit/geom/AllocMemManagersGeom.cpp:1041-3427
/cgm/trunk/geom/AllocMemManagersGeom.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/AnalyticGeometryTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/AnalyticGeometryTool.cpp:1041-3427
/cgm/trunk/geom/AnalyticGeometryTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/AnalyticGeometryTool.cpp:1041-3427
/cgm/trunk/geom/AnalyticGeometryTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/AnalyticGeometryTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/AnalyticGeometryTool.hpp:1041-3427
/cgm/trunk/geom/AnalyticGeometryTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/AnalyticGeometryTool.hpp:1041-3427
/cgm/trunk/geom/AnalyticGeometryTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/AutoMidsurfaceTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/AutoMidsurfaceTool.cpp:1041-3427
/cgm/trunk/geom/AutoMidsurfaceTool.cpp:3424-3459
+ /cgm/branches/cubit/eom/AutoMidsurfaceTool.cpp:1041-3427
/cgm/trunk/geom/AutoMidsurfaceTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/AutoMidsurfaceTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/AutoMidsurfaceTool.hpp:1041-3427
/cgm/trunk/geom/AutoMidsurfaceTool.hpp:3424-3459
+ /cgm/branches/cubit/eom/AutoMidsurfaceTool.hpp:1041-3427
/cgm/trunk/geom/AutoMidsurfaceTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BasicTopologyEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BasicTopologyEntity.cpp:1041-3427
/cgm/trunk/geom/BasicTopologyEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/BasicTopologyEntity.cpp:1041-3427
/cgm/trunk/geom/BasicTopologyEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BasicTopologyEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BasicTopologyEntity.hpp:1041-3427
/cgm/trunk/geom/BasicTopologyEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/BasicTopologyEntity.hpp:1041-3427
/cgm/trunk/geom/BasicTopologyEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Body.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Body.cpp:1041-3427
/cgm/trunk/geom/Body.cpp:3424-3459
+ /cgm/branches/cubit/geom/Body.cpp:1041-3427
/cgm/trunk/geom/Body.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Body.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Body.hpp:1041-3427
/cgm/trunk/geom/Body.hpp:3424-3459
+ /cgm/branches/cubit/geom/Body.hpp:1041-3427
/cgm/trunk/geom/Body.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BodySM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BodySM.cpp:1041-3427
/cgm/trunk/geom/BodySM.cpp:3424-3459
+ /cgm/branches/cubit/geom/BodySM.cpp:1041-3427
/cgm/trunk/geom/BodySM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BodySM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BodySM.hpp:1041-3427
/cgm/trunk/geom/BodySM.hpp:3424-3459
+ /cgm/branches/cubit/geom/BodySM.hpp:1041-3427
/cgm/trunk/geom/BodySM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BoundingBoxTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BoundingBoxTool.cpp:1041-3427
/cgm/trunk/geom/BoundingBoxTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/BoundingBoxTool.cpp:1041-3427
/cgm/trunk/geom/BoundingBoxTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BoundingBoxTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BoundingBoxTool.hpp:1041-3427
/cgm/trunk/geom/BoundingBoxTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/BoundingBoxTool.hpp:1041-3427
/cgm/trunk/geom/BoundingBoxTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BridgeManager.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BridgeManager.cpp:1041-3427
/cgm/trunk/geom/BridgeManager.cpp:3424-3459
+ /cgm/branches/cubit/geom/BridgeManager.cpp:1041-3427
/cgm/trunk/geom/BridgeManager.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/BridgeManager.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/BridgeManager.hpp:1041-3427
/cgm/trunk/geom/BridgeManager.hpp:3424-3459
+ /cgm/branches/cubit/geom/BridgeManager.hpp:1041-3427
/cgm/trunk/geom/BridgeManager.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAActuateSet.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAActuateSet.cpp:1041-3427
/cgm/trunk/geom/CAActuateSet.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAActuateSet.cpp:1041-3427
/cgm/trunk/geom/CAActuateSet.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAActuateSet.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAActuateSet.hpp:1041-3427
/cgm/trunk/geom/CAActuateSet.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAActuateSet.hpp:1041-3427
/cgm/trunk/geom/CAActuateSet.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CADeferredAttrib.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CADeferredAttrib.cpp:1041-3427
/cgm/trunk/geom/CADeferredAttrib.cpp:3424-3459
+ /cgm/branches/cubit/geom/CADeferredAttrib.cpp:1041-3427
/cgm/trunk/geom/CADeferredAttrib.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CADeferredAttrib.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CADeferredAttrib.hpp:1041-3427
/cgm/trunk/geom/CADeferredAttrib.hpp:3424-3459
+ /cgm/branches/cubit/geom/CADeferredAttrib.hpp:1041-3427
/cgm/trunk/geom/CADeferredAttrib.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CADefines.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CADefines.hpp:1041-3427
/cgm/trunk/geom/CADefines.hpp:3424-3459
+ /cgm/branches/cubit/geom/CADefines.hpp:1041-3427
/cgm/trunk/geom/CADefines.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAEntityColor.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAEntityColor.cpp:1041-3427
/cgm/trunk/geom/CAEntityColor.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAEntityColor.cpp:1041-3427
/cgm/trunk/geom/CAEntityColor.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAEntityColor.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAEntityColor.hpp:1041-3427
/cgm/trunk/geom/CAEntityColor.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAEntityColor.hpp:1041-3427
/cgm/trunk/geom/CAEntityColor.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAEntityId.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAEntityId.cpp:1041-3427
/cgm/trunk/geom/CAEntityId.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAEntityId.cpp:1041-3427
/cgm/trunk/geom/CAEntityId.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAEntityId.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAEntityId.hpp:1041-3427
/cgm/trunk/geom/CAEntityId.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAEntityId.hpp:1041-3427
/cgm/trunk/geom/CAEntityId.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAEntityName.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAEntityName.cpp:1041-3427
/cgm/trunk/geom/CAEntityName.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAEntityName.cpp:1041-3427
/cgm/trunk/geom/CAEntityName.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAEntityName.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAEntityName.hpp:1041-3427
/cgm/trunk/geom/CAEntityName.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAEntityName.hpp:1041-3427
/cgm/trunk/geom/CAEntityName.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAGroup.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAGroup.cpp:1041-3427
/cgm/trunk/geom/CAGroup.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAGroup.cpp:1041-3427
/cgm/trunk/geom/CAGroup.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAGroup.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAGroup.hpp:1041-3427
/cgm/trunk/geom/CAGroup.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAGroup.hpp:1041-3427
/cgm/trunk/geom/CAGroup.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAMergePartner.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAMergePartner.cpp:1041-3427
/cgm/trunk/geom/CAMergePartner.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAMergePartner.cpp:1041-3427
/cgm/trunk/geom/CAMergePartner.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAMergePartner.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAMergePartner.hpp:1041-3427
/cgm/trunk/geom/CAMergePartner.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAMergePartner.hpp:1041-3427
/cgm/trunk/geom/CAMergePartner.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAMergeStatus.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAMergeStatus.cpp:1041-3427
/cgm/trunk/geom/CAMergeStatus.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAMergeStatus.cpp:1041-3427
/cgm/trunk/geom/CAMergeStatus.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAMergeStatus.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAMergeStatus.hpp:1041-3427
/cgm/trunk/geom/CAMergeStatus.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAMergeStatus.hpp:1041-3427
/cgm/trunk/geom/CAMergeStatus.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CASourceFeature.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CASourceFeature.cpp:1041-3427
/cgm/trunk/geom/CASourceFeature.cpp:3424-3459
+ /cgm/branches/cubit/geom/CASourceFeature.cpp:1041-3427
/cgm/trunk/geom/CASourceFeature.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CASourceFeature.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CASourceFeature.hpp:1041-3427
/cgm/trunk/geom/CASourceFeature.hpp:3424-3459
+ /cgm/branches/cubit/geom/CASourceFeature.hpp:1041-3427
/cgm/trunk/geom/CASourceFeature.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAUniqueId.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAUniqueId.cpp:1041-3427
/cgm/trunk/geom/CAUniqueId.cpp:3424-3459
+ /cgm/branches/cubit/geom/CAUniqueId.cpp:1041-3427
/cgm/trunk/geom/CAUniqueId.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CAUniqueId.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CAUniqueId.hpp:1041-3427
/cgm/trunk/geom/CAUniqueId.hpp:3424-3459
+ /cgm/branches/cubit/geom/CAUniqueId.hpp:1041-3427
/cgm/trunk/geom/CAUniqueId.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CGMApp.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CGMApp.cpp:1041-3427
/cgm/trunk/geom/CGMApp.cpp:3424-3459
+ /cgm/branches/cubit/geom/CGMApp.cpp:1041-3427
/cgm/trunk/geom/CGMApp.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CGMApp.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CGMApp.hpp:1041-3427
/cgm/trunk/geom/CGMApp.hpp:3424-3459
+ /cgm/branches/cubit/geom/CGMApp.hpp:1041-3427
/cgm/trunk/geom/CGMApp.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CGMEngineDynamicLoader.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CGMEngineDynamicLoader.cpp:1041-3427
/cgm/trunk/geom/CGMEngineDynamicLoader.cpp:3424-3459
+ /cgm/branches/cubit/geom/CGMEngineDynamicLoader.cpp:1041-3427
/cgm/trunk/geom/CGMEngineDynamicLoader.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CGMEngineDynamicLoader.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CGMEngineDynamicLoader.hpp:1041-3427
/cgm/trunk/geom/CGMEngineDynamicLoader.hpp:3424-3459
+ /cgm/branches/cubit/geom/CGMEngineDynamicLoader.hpp:1041-3427
/cgm/trunk/geom/CGMEngineDynamicLoader.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CGMHistory.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/CGMHistory.cpp:1041-3427
/cgm/trunk/geom/CGMHistory.cpp:3424-3459
+ /cgm/branches/cubit/eom/CGMHistory.cpp:1041-3427
/cgm/trunk/geom/CGMHistory.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CGMHistory.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/CGMHistory.hpp:1041-3427
/cgm/trunk/geom/CGMHistory.hpp:3424-3459
+ /cgm/branches/cubit/eom/CGMHistory.hpp:1041-3427
/cgm/trunk/geom/CGMHistory.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CMakeLists.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CMakeLists.txt:1041-3427
/cgm/trunk/geom/CMakeLists.txt:3424-3459
+ /cgm/branches/cubit/geom/CMakeLists.txt:1041-3427
/cgm/trunk/geom/CMakeLists.txt:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Chain.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Chain.cpp:1041-3427
/cgm/trunk/geom/Chain.cpp:3424-3459
+ /cgm/branches/cubit/geom/Chain.cpp:1041-3427
/cgm/trunk/geom/Chain.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Chain.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Chain.hpp:1041-3427
/cgm/trunk/geom/Chain.hpp:3424-3459
+ /cgm/branches/cubit/geom/Chain.hpp:1041-3427
/cgm/trunk/geom/Chain.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Cholla
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Cholla:1041-3427
/cgm/trunk/geom/Cholla:3424-3459
+ /cgm/branches/cubit/geom/Cholla:1041-3427
/cgm/trunk/geom/Cholla:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoEdge.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoEdge.cpp:1041-3427
/cgm/trunk/geom/CoEdge.cpp:3424-3459
+ /cgm/branches/cubit/geom/CoEdge.cpp:1041-3427
/cgm/trunk/geom/CoEdge.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoEdge.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoEdge.hpp:1041-3427
/cgm/trunk/geom/CoEdge.hpp:3424-3459
+ /cgm/branches/cubit/geom/CoEdge.hpp:1041-3427
/cgm/trunk/geom/CoEdge.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoEdgeSM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoEdgeSM.cpp:1041-3427
/cgm/trunk/geom/CoEdgeSM.cpp:3424-3459
+ /cgm/branches/cubit/geom/CoEdgeSM.cpp:1041-3427
/cgm/trunk/geom/CoEdgeSM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoEdgeSM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoEdgeSM.hpp:1041-3427
/cgm/trunk/geom/CoEdgeSM.hpp:3424-3459
+ /cgm/branches/cubit/geom/CoEdgeSM.hpp:1041-3427
/cgm/trunk/geom/CoEdgeSM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoFace.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoFace.cpp:1041-3427
/cgm/trunk/geom/CoFace.cpp:3424-3459
+ /cgm/branches/cubit/geom/CoFace.cpp:1041-3427
/cgm/trunk/geom/CoFace.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoFace.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoFace.hpp:1041-3427
/cgm/trunk/geom/CoFace.hpp:3424-3459
+ /cgm/branches/cubit/geom/CoFace.hpp:1041-3427
/cgm/trunk/geom/CoFace.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoVertex.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoVertex.cpp:1041-3427
/cgm/trunk/geom/CoVertex.cpp:3424-3459
+ /cgm/branches/cubit/geom/CoVertex.cpp:1041-3427
/cgm/trunk/geom/CoVertex.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoVertex.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoVertex.hpp:1041-3427
/cgm/trunk/geom/CoVertex.hpp:3424-3459
+ /cgm/branches/cubit/geom/CoVertex.hpp:1041-3427
/cgm/trunk/geom/CoVertex.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoVolume.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoVolume.cpp:1041-3427
/cgm/trunk/geom/CoVolume.cpp:3424-3459
+ /cgm/branches/cubit/geom/CoVolume.cpp:1041-3427
/cgm/trunk/geom/CoVolume.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CoVolume.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CoVolume.hpp:1041-3427
/cgm/trunk/geom/CoVolume.hpp:3424-3459
+ /cgm/branches/cubit/geom/CoVolume.hpp:1041-3427
/cgm/trunk/geom/CoVolume.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CollectionEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CollectionEntity.cpp:1041-3427
/cgm/trunk/geom/CollectionEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/CollectionEntity.cpp:1041-3427
/cgm/trunk/geom/CollectionEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CollectionEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CollectionEntity.hpp:1041-3427
/cgm/trunk/geom/CollectionEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/CollectionEntity.hpp:1041-3427
/cgm/trunk/geom/CollectionEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CompositeCombineEvent.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CompositeCombineEvent.hpp:1041-3427
/cgm/trunk/geom/CompositeCombineEvent.hpp:3424-3459
+ /cgm/branches/cubit/geom/CompositeCombineEvent.hpp:1041-3427
/cgm/trunk/geom/CompositeCombineEvent.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitAttrib.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitAttrib.cpp:1041-3427
/cgm/trunk/geom/CubitAttrib.cpp:3424-3459
+ /cgm/branches/cubit/geom/CubitAttrib.cpp:1041-3427
/cgm/trunk/geom/CubitAttrib.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitAttrib.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitAttrib.hpp:1041-3427
/cgm/trunk/geom/CubitAttrib.hpp:3424-3459
+ /cgm/branches/cubit/geom/CubitAttrib.hpp:1041-3427
/cgm/trunk/geom/CubitAttrib.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitAttribManager.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitAttribManager.cpp:1041-3427
/cgm/trunk/geom/CubitAttribManager.cpp:3424-3459
+ /cgm/branches/cubit/geom/CubitAttribManager.cpp:1041-3427
/cgm/trunk/geom/CubitAttribManager.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitAttribManager.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitAttribManager.hpp:1041-3427
/cgm/trunk/geom/CubitAttribManager.hpp:3424-3459
+ /cgm/branches/cubit/geom/CubitAttribManager.hpp:1041-3427
/cgm/trunk/geom/CubitAttribManager.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitAttribUser.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitAttribUser.cpp:1041-3427
/cgm/trunk/geom/CubitAttribUser.cpp:3424-3459
+ /cgm/branches/cubit/geom/CubitAttribUser.cpp:1041-3427
/cgm/trunk/geom/CubitAttribUser.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitAttribUser.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitAttribUser.hpp:1041-3427
/cgm/trunk/geom/CubitAttribUser.hpp:3424-3459
+ /cgm/branches/cubit/geom/CubitAttribUser.hpp:1041-3427
/cgm/trunk/geom/CubitAttribUser.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitEvaluator.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitEvaluator.hpp:1041-3427
/cgm/trunk/geom/CubitEvaluator.hpp:3424-3459
+ /cgm/branches/cubit/geom/CubitEvaluator.hpp:1041-3427
/cgm/trunk/geom/CubitEvaluator.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitGeomConfigure.h
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitGeomConfigure.h:1041-3427
/cgm/trunk/geom/CubitGeomConfigure.h:3424-3459
+ /cgm/branches/cubit/geom/CubitGeomConfigure.h:1041-3427
/cgm/trunk/geom/CubitGeomConfigure.h:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitGeomConfigure.h.in
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitGeomConfigure.h.in:1041-3427
/cgm/trunk/geom/CubitGeomConfigure.h.in:3424-3459
+ /cgm/branches/cubit/geom/CubitGeomConfigure.h.in:1041-3427
/cgm/trunk/geom/CubitGeomConfigure.h.in:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitPolygon.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitPolygon.cpp:1041-3427
/cgm/trunk/geom/CubitPolygon.cpp:3424-3459
+ /cgm/branches/cubit/geom/CubitPolygon.cpp:1041-3427
/cgm/trunk/geom/CubitPolygon.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitPolygon.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitPolygon.hpp:1041-3427
/cgm/trunk/geom/CubitPolygon.hpp:3424-3459
+ /cgm/branches/cubit/geom/CubitPolygon.hpp:1041-3427
/cgm/trunk/geom/CubitPolygon.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitSimpleAttrib.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitSimpleAttrib.cpp:1041-3427
/cgm/trunk/geom/CubitSimpleAttrib.cpp:3424-3459
+ /cgm/branches/cubit/geom/CubitSimpleAttrib.cpp:1041-3427
/cgm/trunk/geom/CubitSimpleAttrib.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CubitSimpleAttrib.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CubitSimpleAttrib.hpp:1041-3427
/cgm/trunk/geom/CubitSimpleAttrib.hpp:3424-3459
+ /cgm/branches/cubit/geom/CubitSimpleAttrib.hpp:1041-3427
/cgm/trunk/geom/CubitSimpleAttrib.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Curve.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Curve.cpp:1041-3427
/cgm/trunk/geom/Curve.cpp:3424-3459
+ /cgm/branches/cubit/geom/Curve.cpp:1041-3427
/cgm/trunk/geom/Curve.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Curve.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Curve.hpp:1041-3427
/cgm/trunk/geom/Curve.hpp:3424-3459
+ /cgm/branches/cubit/geom/Curve.hpp:1041-3427
/cgm/trunk/geom/Curve.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CurveOverlapFacet.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CurveOverlapFacet.cpp:1041-3427
/cgm/trunk/geom/CurveOverlapFacet.cpp:3424-3459
+ /cgm/branches/cubit/geom/CurveOverlapFacet.cpp:1041-3427
/cgm/trunk/geom/CurveOverlapFacet.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CurveOverlapFacet.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CurveOverlapFacet.hpp:1041-3427
/cgm/trunk/geom/CurveOverlapFacet.hpp:3424-3459
+ /cgm/branches/cubit/geom/CurveOverlapFacet.hpp:1041-3427
/cgm/trunk/geom/CurveOverlapFacet.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CurveSM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CurveSM.cpp:1041-3427
/cgm/trunk/geom/CurveSM.cpp:3424-3459
+ /cgm/branches/cubit/geom/CurveSM.cpp:1041-3427
/cgm/trunk/geom/CurveSM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CurveSM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CurveSM.hpp:1041-3427
/cgm/trunk/geom/CurveSM.hpp:3424-3459
+ /cgm/branches/cubit/geom/CurveSM.hpp:1041-3427
/cgm/trunk/geom/CurveSM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CylinderEvaluator.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CylinderEvaluator.cpp:1041-3427
/cgm/trunk/geom/CylinderEvaluator.cpp:3424-3459
+ /cgm/branches/cubit/geom/CylinderEvaluator.cpp:1041-3427
/cgm/trunk/geom/CylinderEvaluator.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/CylinderEvaluator.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/CylinderEvaluator.hpp:1041-3427
/cgm/trunk/geom/CylinderEvaluator.hpp:3424-3459
+ /cgm/branches/cubit/geom/CylinderEvaluator.hpp:1041-3427
/cgm/trunk/geom/CylinderEvaluator.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/DAG.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/DAG.cpp:1041-3427
/cgm/trunk/geom/DAG.cpp:3424-3459
+ /cgm/branches/cubit/geom/DAG.cpp:1041-3427
/cgm/trunk/geom/DAG.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/DAG.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/DAG.hpp:1041-3427
/cgm/trunk/geom/DAG.hpp:3424-3459
+ /cgm/branches/cubit/geom/DAG.hpp:1041-3427
/cgm/trunk/geom/DAG.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/DagDrawingTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/DagDrawingTool.cpp:1041-3427
/cgm/trunk/geom/DagDrawingTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/DagDrawingTool.cpp:1041-3427
/cgm/trunk/geom/DagDrawingTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/DagDrawingTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/DagDrawingTool.hpp:1041-3427
/cgm/trunk/geom/DagDrawingTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/DagDrawingTool.hpp:1041-3427
/cgm/trunk/geom/DagDrawingTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/DagType.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/DagType.hpp:1041-3427
/cgm/trunk/geom/DagType.hpp:3424-3459
+ /cgm/branches/cubit/geom/DagType.hpp:1041-3427
/cgm/trunk/geom/DagType.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GSaveOpen.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GSaveOpen.cpp:1041-3427
/cgm/trunk/geom/GSaveOpen.cpp:3424-3459
+ /cgm/branches/cubit/geom/GSaveOpen.cpp:1041-3427
/cgm/trunk/geom/GSaveOpen.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GSaveOpen.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GSaveOpen.hpp:1041-3427
/cgm/trunk/geom/GSaveOpen.hpp:3424-3459
+ /cgm/branches/cubit/geom/GSaveOpen.hpp:1041-3427
/cgm/trunk/geom/GSaveOpen.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeomDataObserver.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeomDataObserver.cpp:1041-3427
/cgm/trunk/geom/GeomDataObserver.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeomDataObserver.cpp:1041-3427
/cgm/trunk/geom/GeomDataObserver.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeomDataObserver.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeomDataObserver.hpp:1041-3427
/cgm/trunk/geom/GeomDataObserver.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeomDataObserver.hpp:1041-3427
/cgm/trunk/geom/GeomDataObserver.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeomMeasureTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeomMeasureTool.cpp:1041-3427
/cgm/trunk/geom/GeomMeasureTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeomMeasureTool.cpp:1041-3427
/cgm/trunk/geom/GeomMeasureTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeomMeasureTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeomMeasureTool.hpp:1041-3427
/cgm/trunk/geom/GeomMeasureTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeomMeasureTool.hpp:1041-3427
/cgm/trunk/geom/GeomMeasureTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeomPoint.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeomPoint.hpp:1041-3427
/cgm/trunk/geom/GeomPoint.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeomPoint.hpp:1041-3427
/cgm/trunk/geom/GeomPoint.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeomSeg.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeomSeg.hpp:1041-3427
/cgm/trunk/geom/GeomSeg.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeomSeg.hpp:1041-3427
/cgm/trunk/geom/GeomSeg.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryEntity.cpp:1041-3427
/cgm/trunk/geom/GeometryEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryEntity.cpp:1041-3427
/cgm/trunk/geom/GeometryEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryEntity.hpp:1041-3427
/cgm/trunk/geom/GeometryEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryEntity.hpp:1041-3427
/cgm/trunk/geom/GeometryEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryFeatureEngine.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryFeatureEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryFeatureEngine.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryFeatureEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryFeatureEngine.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryFeatureEngine.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryFeatureEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryFeatureEngine.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryFeatureEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryFeatureEngine.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryFeatureTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryFeatureTool.cpp:1041-3427
/cgm/trunk/geom/GeometryFeatureTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryFeatureTool.cpp:1041-3427
/cgm/trunk/geom/GeometryFeatureTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryFeatureTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryFeatureTool.hpp:1041-3427
/cgm/trunk/geom/GeometryFeatureTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryFeatureTool.hpp:1041-3427
/cgm/trunk/geom/GeometryFeatureTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryHealerEngine.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryHealerEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryHealerEngine.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryHealerEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryHealerEngine.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryHealerEngine.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryHealerEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryHealerEngine.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryHealerEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryHealerEngine.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryHealerTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryHealerTool.cpp:1041-3427
/cgm/trunk/geom/GeometryHealerTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryHealerTool.cpp:1041-3427
/cgm/trunk/geom/GeometryHealerTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryHealerTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryHealerTool.hpp:1041-3427
/cgm/trunk/geom/GeometryHealerTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryHealerTool.hpp:1041-3427
/cgm/trunk/geom/GeometryHealerTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryModifyEngine.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryModifyEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryModifyEngine.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryModifyEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryModifyEngine.cpp:3424-3493
Modified: cgm/branches/merge-cubit12/geom/GeometryModifyEngine.hpp
===================================================================
--- cgm/branches/merge-cubit12/geom/GeometryModifyEngine.hpp 2010-01-27 00:35:39 UTC (rev 3493)
+++ cgm/branches/merge-cubit12/geom/GeometryModifyEngine.hpp 2010-01-27 00:51:03 UTC (rev 3494)
@@ -275,7 +275,7 @@
//- Returns the ID of the new Body or CUBIT_FAILURE
virtual BodySM* cylinder( double hi, double r1, double r2,
- double r3) const = 0;
+ double r3 ) const = 0 ;
//- Creates an ACIS frustum and assigns it to a Body $
//- {hi} input height $
//- {r1} input radius in x-direction at base $
@@ -686,6 +686,8 @@
//- data from a refentity.
virtual CubitStatus test_regularize_entity( GeometryEntity *old_entity_ptr) = 0;
+
+ // Added by CAT
virtual CubitStatus offset_curves( DLIList<Curve*>& ref_edge_list,
DLIList<Curve*>& result_curve_list,
double offset_distance,
@@ -793,10 +795,10 @@
//- intersection graph.
virtual CubitStatus get_mid_plane( const CubitVector &point_1,
- const CubitVector &point_2,
+ const CubitVector &point_2,
const CubitVector &point_3,
- BodySM *body_to_trim_to,
- BodySM *&midsurface_body ) const = 0;
+ BodySM *body_to_trim_to,
+ BodySM *&midplane_body ) const = 0;
//- Finds the mid plane described by the 3 points and trims
//- it to the body. It returns the mid planes as part of the
//- midplane_body
Property changes on: cgm/branches/merge-cubit12/geom/GeometryModifyEngine.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryModifyEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryModifyEngine.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryModifyEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryModifyEngine.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryModifyTool.cpp:1041-3427
/cgm/trunk/geom/GeometryModifyTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryModifyTool.cpp:1041-3427
/cgm/trunk/geom/GeometryModifyTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryModifyTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryModifyTool.hpp:1041-3427
/cgm/trunk/geom/GeometryModifyTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryModifyTool.hpp:1041-3427
/cgm/trunk/geom/GeometryModifyTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryQueryEngine.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryQueryEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryQueryEngine.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryQueryEngine.cpp:1041-3427
/cgm/trunk/geom/GeometryQueryEngine.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryQueryEngine.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryQueryEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryQueryEngine.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryQueryEngine.hpp:1041-3427
/cgm/trunk/geom/GeometryQueryEngine.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryQueryTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryQueryTool.cpp:1041-3427
/cgm/trunk/geom/GeometryQueryTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryQueryTool.cpp:1041-3427
/cgm/trunk/geom/GeometryQueryTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryQueryTool.hpp:1041-3427
/cgm/trunk/geom/GeometryQueryTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryQueryTool.hpp:1041-3427
/cgm/trunk/geom/GeometryQueryTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryUtil.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryUtil.cpp:1041-3427
/cgm/trunk/geom/GeometryUtil.cpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryUtil.cpp:1041-3427
/cgm/trunk/geom/GeometryUtil.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GeometryUtil.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GeometryUtil.hpp:1041-3427
/cgm/trunk/geom/GeometryUtil.hpp:3424-3459
+ /cgm/branches/cubit/geom/GeometryUtil.hpp:1041-3427
/cgm/trunk/geom/GeometryUtil.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GfxPreview.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/GfxPreview.cpp:1041-3427
/cgm/branches/cubit/geom/GfxPreview.cpp:1041-3427
/cgm/trunk/geom/GfxPreview.cpp:3424-3459
+ /cgm/branches/cubit/eom/GfxPreview.cpp:1041-3427
/cgm/branches/cubit/geom/GfxPreview.cpp:1041-3427
/cgm/trunk/geom/GfxPreview.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GfxPreview.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/GfxPreview.hpp:1041-3427
/cgm/branches/cubit/geom/GfxPreview.hpp:1041-3427
/cgm/trunk/geom/GfxPreview.hpp:3424-3459
+ /cgm/branches/cubit/eom/GfxPreview.hpp:1041-3427
/cgm/branches/cubit/geom/GfxPreview.hpp:1041-3427
/cgm/trunk/geom/GfxPreview.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GroupingEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GroupingEntity.cpp:1041-3427
/cgm/trunk/geom/GroupingEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/GroupingEntity.cpp:1041-3427
/cgm/trunk/geom/GroupingEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/GroupingEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/GroupingEntity.hpp:1041-3427
/cgm/trunk/geom/GroupingEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/GroupingEntity.hpp:1041-3427
/cgm/trunk/geom/GroupingEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/IntermediateGeomEngine.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/IntermediateGeomEngine.hpp:1041-3427
/cgm/trunk/geom/IntermediateGeomEngine.hpp:3424-3459
+ /cgm/branches/cubit/geom/IntermediateGeomEngine.hpp:1041-3427
/cgm/trunk/geom/IntermediateGeomEngine.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Loop.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Loop.cpp:1041-3427
/cgm/trunk/geom/Loop.cpp:3424-3459
+ /cgm/branches/cubit/geom/Loop.cpp:1041-3427
/cgm/trunk/geom/Loop.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Loop.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Loop.hpp:1041-3427
/cgm/trunk/geom/Loop.hpp:3424-3459
+ /cgm/branches/cubit/geom/Loop.hpp:1041-3427
/cgm/trunk/geom/Loop.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/LoopSM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/LoopSM.cpp:1041-3427
/cgm/trunk/geom/LoopSM.cpp:3424-3459
+ /cgm/branches/cubit/geom/LoopSM.cpp:1041-3427
/cgm/trunk/geom/LoopSM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/LoopSM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/LoopSM.hpp:1041-3427
/cgm/trunk/geom/LoopSM.hpp:3424-3459
+ /cgm/branches/cubit/geom/LoopSM.hpp:1041-3427
/cgm/trunk/geom/LoopSM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Lump.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Lump.cpp:1041-3427
/cgm/trunk/geom/Lump.cpp:3424-3459
+ /cgm/branches/cubit/geom/Lump.cpp:1041-3427
/cgm/trunk/geom/Lump.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Lump.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Lump.hpp:1041-3427
/cgm/trunk/geom/Lump.hpp:3424-3459
+ /cgm/branches/cubit/geom/Lump.hpp:1041-3427
/cgm/trunk/geom/Lump.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/LumpSM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/LumpSM.cpp:1041-3427
/cgm/trunk/geom/LumpSM.cpp:3424-3459
+ /cgm/branches/cubit/geom/LumpSM.cpp:1041-3427
/cgm/trunk/geom/LumpSM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/LumpSM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/LumpSM.hpp:1041-3427
/cgm/trunk/geom/LumpSM.hpp:3424-3459
+ /cgm/branches/cubit/geom/LumpSM.hpp:1041-3427
/cgm/trunk/geom/LumpSM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Makefile.am
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Makefile.am:1041-3427
/cgm/trunk/geom/Makefile.am:3424-3459
+ /cgm/branches/cubit/geom/Makefile.am:1041-3427
/cgm/trunk/geom/Makefile.am:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MedialTool2D.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MedialTool2D.cpp:1041-3427
/cgm/trunk/geom/MedialTool2D.cpp:3424-3459
+ /cgm/branches/cubit/geom/MedialTool2D.cpp:1041-3427
/cgm/trunk/geom/MedialTool2D.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MedialTool2D.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MedialTool2D.hpp:1041-3427
/cgm/trunk/geom/MedialTool2D.hpp:3424-3459
+ /cgm/branches/cubit/geom/MedialTool2D.hpp:1041-3427
/cgm/trunk/geom/MedialTool2D.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MedialTool3D.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MedialTool3D.cpp:1041-3427
/cgm/trunk/geom/MedialTool3D.cpp:3424-3459
+ /cgm/branches/cubit/geom/MedialTool3D.cpp:1041-3427
/cgm/trunk/geom/MedialTool3D.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MedialTool3D.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MedialTool3D.hpp:1041-3427
/cgm/trunk/geom/MedialTool3D.hpp:3424-3459
+ /cgm/branches/cubit/geom/MedialTool3D.hpp:1041-3427
/cgm/trunk/geom/MedialTool3D.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MergeTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MergeTool.cpp:1041-3427
/cgm/trunk/geom/MergeTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/MergeTool.cpp:1041-3427
/cgm/trunk/geom/MergeTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MergeTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MergeTool.hpp:1041-3427
/cgm/trunk/geom/MergeTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/MergeTool.hpp:1041-3427
/cgm/trunk/geom/MergeTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MergeToolAssistant.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MergeToolAssistant.cpp:1041-3427
/cgm/trunk/geom/MergeToolAssistant.cpp:3424-3459
+ /cgm/branches/cubit/geom/MergeToolAssistant.cpp:1041-3427
/cgm/trunk/geom/MergeToolAssistant.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MergeToolAssistant.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MergeToolAssistant.hpp:1041-3427
/cgm/trunk/geom/MergeToolAssistant.hpp:3424-3459
+ /cgm/branches/cubit/geom/MergeToolAssistant.hpp:1041-3427
/cgm/trunk/geom/MergeToolAssistant.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MidPlaneTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MidPlaneTool.cpp:1041-3427
/cgm/trunk/geom/MidPlaneTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/MidPlaneTool.cpp:1041-3427
/cgm/trunk/geom/MidPlaneTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/MidPlaneTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/MidPlaneTool.hpp:1041-3427
/cgm/trunk/geom/MidPlaneTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/MidPlaneTool.hpp:1041-3427
/cgm/trunk/geom/MidPlaneTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/ModelEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/ModelEntity.cpp:1041-3427
/cgm/trunk/geom/ModelEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/ModelEntity.cpp:1041-3427
/cgm/trunk/geom/ModelEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/ModelEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/ModelEntity.hpp:1041-3427
/cgm/trunk/geom/ModelEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/ModelEntity.hpp:1041-3427
/cgm/trunk/geom/ModelEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/ModelQueryEngine.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/ModelQueryEngine.cpp:1041-3427
/cgm/trunk/geom/ModelQueryEngine.cpp:3424-3459
+ /cgm/branches/cubit/geom/ModelQueryEngine.cpp:1041-3427
/cgm/trunk/geom/ModelQueryEngine.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/ModelQueryEngine.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/ModelQueryEngine.hpp:1041-3427
/cgm/trunk/geom/ModelQueryEngine.hpp:3424-3459
+ /cgm/branches/cubit/geom/ModelQueryEngine.hpp:1041-3427
/cgm/trunk/geom/ModelQueryEngine.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/OCC
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/OCC:1041-3427
/cgm/trunk/geom/OCC:3424-3459
+ /cgm/branches/cubit/geom/OCC:1041-3427
/cgm/trunk/geom/OCC:3424-3493
Modified: cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2010-01-27 00:35:39 UTC (rev 3493)
+++ cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2010-01-27 00:51:03 UTC (rev 3494)
@@ -4572,18 +4572,18 @@
const CubitVector &v2,
const CubitVector &v3,
DLIList<BodySM*>& results_list,
- bool imprint )
+ bool imprint ) const
{
CubitStatus stat;
DLIList<BodySM*> new_BodySMs;
- stat = section(webcut_body_list, v1, v2, v3, new_BodySMs, true, true,false);
+ stat = OCCModifyEngine::instance()->section(webcut_body_list, v1, v2, v3, new_BodySMs, true, true,false);
if(stat == CUBIT_FAILURE)
{
PRINT_ERROR("Can't webcut the bodies using a plane determined by 3 points.\n");
return stat;
}
- stat = section(webcut_body_list, v1, v2, v3, new_BodySMs, false, false, false);
+ stat = OCCModifyEngine::instance()->section(webcut_body_list, v1, v2, v3, new_BodySMs, false, false, false);
if(stat == CUBIT_FAILURE)
{
PRINT_ERROR("Can't webcut the bodies using a plane determined by 3 points.\n");
@@ -4622,7 +4622,7 @@
CubitStatus OCCModifyEngine::webcut(DLIList<BodySM*>& webcut_body_list,
BodySM const* tool_body,
DLIList<BodySM*>& results_list,
- bool imprint )
+ bool imprint ) const
{
//do intersect and subtract separately and with imprint option and keep_old
// is true.
@@ -5700,7 +5700,7 @@
const CubitVector & point_2,
const CubitVector & point_3,
BodySM * body_to_trim_to,
- DLIList<BodySM*>& midplane_bodies ) const
+ BodySM *& result_body ) const
{
//Calculate normal of the mid plane
CubitVector v1, v2, normal;
@@ -5729,11 +5729,17 @@
BodySM* tool = CAST_TO(surf, OCCSurface)->my_body();
DLIList<BodySM*> from_bodies;
from_bodies.append(body_to_trim_to);
-
+ DLIList<BodySM*> midplane_bodies;
CubitStatus stat = intersect(tool, from_bodies, midplane_bodies,
CUBIT_TRUE);
OCCQueryEngine::instance()->delete_solid_model_entities(tool);
-
+ if (midplane_bodies.size() == 1)
+ result_body = midplane_bodies.get();
+ else {
+ for (int i = 0; i < midplane_bodies.size(); ++i)
+ OCCQueryEngine::instance()->delete_solid_model_entities(midplane_bodies.get_and_step());
+ stat = CUBIT_FAILURE;
+ }
return stat;
}
@@ -5747,7 +5753,7 @@
CubitStatus OCCModifyEngine::get_spheric_mid_surface( Surface* surface_ptr1,
Surface* surface_ptr2,
BodySM* body_to_trim_to,
- DLIList<BodySM *>&midsurface_bodies ) const
+ BodySM*& result_body ) const
{
OCCSurface* occ_surf1 = CAST_TO(surface_ptr1, OCCSurface);
OCCSurface* occ_surf2 = CAST_TO(surface_ptr2, OCCSurface);
@@ -5778,12 +5784,19 @@
CubitVector center(center1.X(), center1.Y(), center1.Z());
OCCQueryEngine::instance()->translate(tool, center);
- DLIList<BodySM*> from_bodies;
+ DLIList<BodySM*> from_bodies, midsurface_bodies;
from_bodies.append(body_to_trim_to);
-
+
CubitStatus stat = intersect(tool, from_bodies, midsurface_bodies,
CUBIT_TRUE);
OCCQueryEngine::instance()->delete_solid_model_entities(tool);
+ if (midsurface_bodies.size() == 1)
+ result_body = midsurface_bodies.get();
+ else {
+ for (int i = 0; i < midsurface_bodies.size(); ++i)
+ OCCQueryEngine::instance()->delete_solid_model_entities(midsurface_bodies.get_and_step());
+ stat = CUBIT_FAILURE;
+ }
return stat;
}
@@ -5798,7 +5811,7 @@
CubitStatus OCCModifyEngine::get_conic_mid_surface( Surface* surface_ptr1,
Surface* surface_ptr2,
BodySM* body_to_trim_to,
- DLIList<BodySM *>&midsurface_bodies ) const
+ BodySM*& result_body ) const
{
OCCSurface* occ_surf1 = CAST_TO(surface_ptr1, OCCSurface);
OCCSurface* occ_surf2 = CAST_TO(surface_ptr2, OCCSurface);
@@ -5892,12 +5905,19 @@
OCCQueryEngine::instance()->populate_topology_bridge(face, CUBIT_TRUE);
tool = CAST_TO(surface,OCCSurface)->my_body();
}
- DLIList<BodySM*> from_bodies;
+ DLIList<BodySM*> from_bodies, midsurface_bodies;
from_bodies.append(body_to_trim_to);
CubitStatus stat = intersect(tool, from_bodies, midsurface_bodies,
CUBIT_TRUE);
OCCQueryEngine::instance()->delete_solid_model_entities(tool);
+ if (midsurface_bodies.size() == 1)
+ result_body = midsurface_bodies.get();
+ else {
+ for (int i = 0; i < midsurface_bodies.size(); ++i)
+ OCCQueryEngine::instance()->delete_solid_model_entities(midsurface_bodies.get_and_step());
+ stat = CUBIT_FAILURE;
+ }
return stat;
}
@@ -5912,7 +5932,7 @@
CubitStatus OCCModifyEngine::get_toric_mid_surface( Surface* surface_ptr1,
Surface* surface_ptr2,
BodySM* body_to_trim_to,
- DLIList<BodySM *>&midsurface_bodies ) const
+ BodySM*& result_body ) const
{
OCCSurface* occ_surf1 = CAST_TO(surface_ptr1, OCCSurface);
OCCSurface* occ_surf2 = CAST_TO(surface_ptr2, OCCSurface);
@@ -5971,12 +5991,19 @@
BodySM* tool = CAST_TO(lump, OCCLump)->get_body();
- DLIList<BodySM*> from_bodies;
+ DLIList<BodySM*> from_bodies, midsurface_bodies;
from_bodies.append(body_to_trim_to);
CubitStatus stat = intersect(tool, from_bodies, midsurface_bodies,
CUBIT_TRUE);
OCCQueryEngine::instance()->delete_solid_model_entities(tool);
+ if (midsurface_bodies.size() == 1)
+ result_body = midsurface_bodies.get();
+ else {
+ for (int i = 0; i < midsurface_bodies.size(); ++i)
+ OCCQueryEngine::instance()->delete_solid_model_entities(midsurface_bodies.get_and_step());
+ stat = CUBIT_FAILURE;
+ }
return stat;
}
Modified: cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp
===================================================================
--- cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp 2010-01-27 00:35:39 UTC (rev 3493)
+++ cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp 2010-01-27 00:51:03 UTC (rev 3494)
@@ -269,12 +269,12 @@
const CubitVector &v2,
const CubitVector &v3,
DLIList<BodySM*>& results_list,
- bool imprint = false ) ;
+ bool imprint = false ) const;
virtual CubitStatus webcut(DLIList<BodySM*>& webcut_body_list,
BodySM const* tool_body,
DLIList<BodySM*>& results_list,
- bool imprint = false ) ;
+ bool imprint = false ) const;
virtual CubitStatus webcut_across_translate( DLIList<BodySM*>& body_list,
Surface* plane_surf1,
@@ -374,23 +374,23 @@
const CubitVector &point_2,
const CubitVector &point_3,
BodySM *body_to_trim_to,
- DLIList<BodySM*>& midplane_bodies ) const;
+ BodySM *&midplane_body ) const;
virtual CubitStatus get_spheric_mid_surface( Surface *surface_ptr1,
Surface *surface_ptr2,
BodySM *body_to_trim_to,
- DLIList<BodySM *>&midsurface_bodies ) const;
+ BodySM *&midsurface_body ) const;
virtual CubitStatus get_conic_mid_surface( Surface *surface_ptr1,
Surface *surface_ptr2,
BodySM *body_to_trim_to,
- DLIList<BodySM *>&midsurface_bodies ) const;
+ BodySM *&midsurface_body ) const;
virtual CubitStatus get_toric_mid_surface( Surface *surface_ptr1,
Surface *surface_ptr2,
BodySM *body_to_trim_to,
- DLIList<BodySM *>&midsurface_bodies ) const;
+ BodySM *&midsurface_body ) const;
virtual CubitStatus tweak_chamfer( DLIList<Curve*> &curve_list,
double left_offset,
Property changes on: cgm/branches/merge-cubit12/geom/OffsetSplitTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/OffsetSplitTool.cpp:1041-3427
/cgm/trunk/geom/OffsetSplitTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/OffsetSplitTool.cpp:1041-3427
/cgm/trunk/geom/OffsetSplitTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/OffsetSplitTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/OffsetSplitTool.hpp:1041-3427
/cgm/trunk/geom/OffsetSplitTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/OffsetSplitTool.hpp:1041-3427
/cgm/trunk/geom/OffsetSplitTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/OldUnmergeCode.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/OldUnmergeCode.cpp:1041-3427
/cgm/trunk/geom/OldUnmergeCode.cpp:3424-3459
+ /cgm/branches/cubit/geom/OldUnmergeCode.cpp:1041-3427
/cgm/trunk/geom/OldUnmergeCode.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/OldUnmergeCode.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/OldUnmergeCode.hpp:1041-3427
/cgm/trunk/geom/OldUnmergeCode.hpp:3424-3459
+ /cgm/branches/cubit/geom/OldUnmergeCode.hpp:1041-3427
/cgm/trunk/geom/OldUnmergeCode.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/PeriodicParamTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/PeriodicParamTool.cpp:1041-3427
/cgm/trunk/geom/PeriodicParamTool.cpp:3424-3459
+ /cgm/branches/cubit/eom/PeriodicParamTool.cpp:1041-3427
/cgm/trunk/geom/PeriodicParamTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/PeriodicParamTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/PeriodicParamTool.hpp:1041-3427
/cgm/trunk/geom/PeriodicParamTool.hpp:3424-3459
+ /cgm/branches/cubit/eom/PeriodicParamTool.hpp:1041-3427
/cgm/trunk/geom/PeriodicParamTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Point.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Point.cpp:1041-3427
/cgm/trunk/geom/Point.cpp:3424-3459
+ /cgm/branches/cubit/geom/Point.cpp:1041-3427
/cgm/trunk/geom/Point.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Point.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Point.hpp:1041-3427
/cgm/trunk/geom/Point.hpp:3424-3459
+ /cgm/branches/cubit/geom/Point.hpp:1041-3427
/cgm/trunk/geom/Point.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/PointSM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/PointSM.cpp:1041-3427
/cgm/trunk/geom/PointSM.cpp:3424-3459
+ /cgm/branches/cubit/geom/PointSM.cpp:1041-3427
/cgm/trunk/geom/PointSM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/PointSM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/PointSM.hpp:1041-3427
/cgm/trunk/geom/PointSM.hpp:3424-3459
+ /cgm/branches/cubit/geom/PointSM.hpp:1041-3427
/cgm/trunk/geom/PointSM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefCollection.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefCollection.cpp:1041-3427
/cgm/trunk/geom/RefCollection.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefCollection.cpp:1041-3427
/cgm/trunk/geom/RefCollection.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefCollection.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefCollection.hpp:1041-3427
/cgm/trunk/geom/RefCollection.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefCollection.hpp:1041-3427
/cgm/trunk/geom/RefCollection.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEdge.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEdge.cpp:1041-3427
/cgm/trunk/geom/RefEdge.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefEdge.cpp:1041-3427
/cgm/trunk/geom/RefEdge.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEdge.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEdge.hpp:1041-3427
/cgm/trunk/geom/RefEdge.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefEdge.hpp:1041-3427
/cgm/trunk/geom/RefEdge.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEntity.cpp:1041-3427
/cgm/trunk/geom/RefEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefEntity.cpp:1041-3427
/cgm/trunk/geom/RefEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEntity.hpp:1041-3427
/cgm/trunk/geom/RefEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefEntity.hpp:1041-3427
/cgm/trunk/geom/RefEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEntityFactory.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEntityFactory.cpp:1041-3427
/cgm/trunk/geom/RefEntityFactory.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefEntityFactory.cpp:1041-3427
/cgm/trunk/geom/RefEntityFactory.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEntityFactory.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEntityFactory.hpp:1041-3427
/cgm/trunk/geom/RefEntityFactory.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefEntityFactory.hpp:1041-3427
/cgm/trunk/geom/RefEntityFactory.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEntityName.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEntityName.cpp:1041-3427
/cgm/trunk/geom/RefEntityName.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefEntityName.cpp:1041-3427
/cgm/trunk/geom/RefEntityName.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEntityName.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEntityName.hpp:1041-3427
/cgm/trunk/geom/RefEntityName.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefEntityName.hpp:1041-3427
/cgm/trunk/geom/RefEntityName.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefEntityNameMap.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefEntityNameMap.hpp:1041-3427
/cgm/trunk/geom/RefEntityNameMap.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefEntityNameMap.hpp:1041-3427
/cgm/trunk/geom/RefEntityNameMap.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefFace.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefFace.cpp:1041-3427
/cgm/trunk/geom/RefFace.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefFace.cpp:1041-3427
/cgm/trunk/geom/RefFace.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefFace.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefFace.hpp:1041-3427
/cgm/trunk/geom/RefFace.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefFace.hpp:1041-3427
/cgm/trunk/geom/RefFace.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefGroup.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefGroup.cpp:1041-3427
/cgm/trunk/geom/RefGroup.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefGroup.cpp:1041-3427
/cgm/trunk/geom/RefGroup.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefGroup.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefGroup.hpp:1041-3427
/cgm/trunk/geom/RefGroup.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefGroup.hpp:1041-3427
/cgm/trunk/geom/RefGroup.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefVertex.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefVertex.cpp:1041-3427
/cgm/trunk/geom/RefVertex.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefVertex.cpp:1041-3427
/cgm/trunk/geom/RefVertex.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefVertex.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefVertex.hpp:1041-3427
/cgm/trunk/geom/RefVertex.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefVertex.hpp:1041-3427
/cgm/trunk/geom/RefVertex.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefVolume.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefVolume.cpp:1041-3427
/cgm/trunk/geom/RefVolume.cpp:3424-3459
+ /cgm/branches/cubit/geom/RefVolume.cpp:1041-3427
/cgm/trunk/geom/RefVolume.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/RefVolume.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/RefVolume.hpp:1041-3427
/cgm/trunk/geom/RefVolume.hpp:3424-3459
+ /cgm/branches/cubit/geom/RefVolume.hpp:1041-3427
/cgm/trunk/geom/RefVolume.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SenseEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SenseEntity.cpp:1041-3427
/cgm/trunk/geom/SenseEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/SenseEntity.cpp:1041-3427
/cgm/trunk/geom/SenseEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SenseEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SenseEntity.hpp:1041-3427
/cgm/trunk/geom/SenseEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/SenseEntity.hpp:1041-3427
/cgm/trunk/geom/SenseEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Shell.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Shell.cpp:1041-3427
/cgm/trunk/geom/Shell.cpp:3424-3459
+ /cgm/branches/cubit/geom/Shell.cpp:1041-3427
/cgm/trunk/geom/Shell.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Shell.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Shell.hpp:1041-3427
/cgm/trunk/geom/Shell.hpp:3424-3459
+ /cgm/branches/cubit/geom/Shell.hpp:1041-3427
/cgm/trunk/geom/Shell.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/ShellSM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/ShellSM.cpp:1041-3427
/cgm/trunk/geom/ShellSM.cpp:3424-3459
+ /cgm/branches/cubit/geom/ShellSM.cpp:1041-3427
/cgm/trunk/geom/ShellSM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/ShellSM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/ShellSM.hpp:1041-3427
/cgm/trunk/geom/ShellSM.hpp:3424-3459
+ /cgm/branches/cubit/geom/ShellSM.hpp:1041-3427
/cgm/trunk/geom/ShellSM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SolidWorks
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SolidWorks:1041-3427
/cgm/trunk/geom/SolidWorks:3424-3459
+ /cgm/branches/cubit/geom/SolidWorks:1041-3427
/cgm/trunk/geom/SolidWorks:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SphereEvaluator.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SphereEvaluator.cpp:1041-3427
/cgm/trunk/geom/SphereEvaluator.cpp:3424-3459
+ /cgm/branches/cubit/geom/SphereEvaluator.cpp:1041-3427
/cgm/trunk/geom/SphereEvaluator.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SphereEvaluator.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SphereEvaluator.hpp:1041-3427
/cgm/trunk/geom/SphereEvaluator.hpp:3424-3459
+ /cgm/branches/cubit/geom/SphereEvaluator.hpp:1041-3427
/cgm/trunk/geom/SphereEvaluator.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SplitSurfaceTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SplitSurfaceTool.cpp:1041-3427
/cgm/trunk/geom/SplitSurfaceTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/SplitSurfaceTool.cpp:1041-3427
/cgm/trunk/geom/SplitSurfaceTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SplitSurfaceTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SplitSurfaceTool.hpp:1041-3427
/cgm/trunk/geom/SplitSurfaceTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/SplitSurfaceTool.hpp:1041-3427
/cgm/trunk/geom/SplitSurfaceTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfParamTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfParamTool.cpp:1041-3427
/cgm/trunk/geom/SurfParamTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/SurfParamTool.cpp:1041-3427
/cgm/trunk/geom/SurfParamTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfParamTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfParamTool.hpp:1041-3427
/cgm/trunk/geom/SurfParamTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/SurfParamTool.hpp:1041-3427
/cgm/trunk/geom/SurfParamTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Surface.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Surface.cpp:1041-3427
/cgm/trunk/geom/Surface.cpp:3424-3459
+ /cgm/branches/cubit/geom/Surface.cpp:1041-3427
/cgm/trunk/geom/Surface.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/Surface.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/Surface.hpp:1041-3427
/cgm/trunk/geom/Surface.hpp:3424-3459
+ /cgm/branches/cubit/geom/Surface.hpp:1041-3427
/cgm/trunk/geom/Surface.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfaceOverlapFacet.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfaceOverlapFacet.cpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapFacet.cpp:3424-3459
+ /cgm/branches/cubit/geom/SurfaceOverlapFacet.cpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapFacet.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfaceOverlapFacet.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfaceOverlapFacet.hpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapFacet.hpp:3424-3459
+ /cgm/branches/cubit/geom/SurfaceOverlapFacet.hpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapFacet.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfaceOverlapTool.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfaceOverlapTool.cpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapTool.cpp:3424-3459
+ /cgm/branches/cubit/geom/SurfaceOverlapTool.cpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapTool.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfaceOverlapTool.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfaceOverlapTool.hpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapTool.hpp:3424-3459
+ /cgm/branches/cubit/geom/SurfaceOverlapTool.hpp:1041-3427
/cgm/trunk/geom/SurfaceOverlapTool.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfaceSM.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfaceSM.cpp:1041-3427
/cgm/trunk/geom/SurfaceSM.cpp:3424-3459
+ /cgm/branches/cubit/geom/SurfaceSM.cpp:1041-3427
/cgm/trunk/geom/SurfaceSM.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/SurfaceSM.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/SurfaceSM.hpp:1041-3427
/cgm/trunk/geom/SurfaceSM.hpp:3424-3459
+ /cgm/branches/cubit/geom/SurfaceSM.hpp:1041-3427
/cgm/trunk/geom/SurfaceSM.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TBOwner.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TBOwner.hpp:1041-3427
/cgm/trunk/geom/TBOwner.hpp:3424-3459
+ /cgm/branches/cubit/geom/TBOwner.hpp:1041-3427
/cgm/trunk/geom/TBOwner.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TBOwnerSet.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TBOwnerSet.hpp:1041-3427
/cgm/trunk/geom/TBOwnerSet.hpp:3424-3459
+ /cgm/branches/cubit/geom/TBOwnerSet.hpp:1041-3427
/cgm/trunk/geom/TBOwnerSet.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDCAGE.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDCAGE.cpp:1041-3427
/cgm/trunk/geom/TDCAGE.cpp:3424-3459
+ /cgm/branches/cubit/geom/TDCAGE.cpp:1041-3427
/cgm/trunk/geom/TDCAGE.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDCAGE.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDCAGE.hpp:1041-3427
/cgm/trunk/geom/TDCAGE.hpp:3424-3459
+ /cgm/branches/cubit/geom/TDCAGE.hpp:1041-3427
/cgm/trunk/geom/TDCAGE.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDCompare.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDCompare.hpp:1041-3427
/cgm/trunk/geom/TDCompare.hpp:3424-3459
+ /cgm/branches/cubit/geom/TDCompare.hpp:1041-3427
/cgm/trunk/geom/TDCompare.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDSourceFeature.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDSourceFeature.cpp:1041-3427
/cgm/trunk/geom/TDSourceFeature.cpp:3424-3459
+ /cgm/branches/cubit/geom/TDSourceFeature.cpp:1041-3427
/cgm/trunk/geom/TDSourceFeature.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDSourceFeature.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDSourceFeature.hpp:1041-3427
/cgm/trunk/geom/TDSourceFeature.hpp:3424-3459
+ /cgm/branches/cubit/geom/TDSourceFeature.hpp:1041-3427
/cgm/trunk/geom/TDSourceFeature.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDSplitSurface.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDSplitSurface.cpp:1041-3427
/cgm/trunk/geom/TDSplitSurface.cpp:3424-3459
+ /cgm/branches/cubit/geom/TDSplitSurface.cpp:1041-3427
/cgm/trunk/geom/TDSplitSurface.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDSplitSurface.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDSplitSurface.hpp:1041-3427
/cgm/trunk/geom/TDSplitSurface.hpp:3424-3459
+ /cgm/branches/cubit/geom/TDSplitSurface.hpp:1041-3427
/cgm/trunk/geom/TDSplitSurface.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDSurfaceOverlap.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDSurfaceOverlap.cpp:1041-3427
/cgm/trunk/geom/TDSurfaceOverlap.cpp:3424-3459
+ /cgm/branches/cubit/geom/TDSurfaceOverlap.cpp:1041-3427
/cgm/trunk/geom/TDSurfaceOverlap.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDSurfaceOverlap.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDSurfaceOverlap.hpp:1041-3427
/cgm/trunk/geom/TDSurfaceOverlap.hpp:3424-3459
+ /cgm/branches/cubit/geom/TDSurfaceOverlap.hpp:1041-3427
/cgm/trunk/geom/TDSurfaceOverlap.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDUniqueId.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDUniqueId.cpp:1041-3427
/cgm/trunk/geom/TDUniqueId.cpp:3424-3459
+ /cgm/branches/cubit/geom/TDUniqueId.cpp:1041-3427
/cgm/trunk/geom/TDUniqueId.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TDUniqueId.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TDUniqueId.hpp:1041-3427
/cgm/trunk/geom/TDUniqueId.hpp:3424-3459
+ /cgm/branches/cubit/geom/TDUniqueId.hpp:1041-3427
/cgm/trunk/geom/TDUniqueId.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TopologyBridge.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TopologyBridge.cpp:1041-3427
/cgm/trunk/geom/TopologyBridge.cpp:3424-3459
+ /cgm/branches/cubit/geom/TopologyBridge.cpp:1041-3427
/cgm/trunk/geom/TopologyBridge.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TopologyBridge.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TopologyBridge.hpp:1041-3427
/cgm/trunk/geom/TopologyBridge.hpp:3424-3459
+ /cgm/branches/cubit/geom/TopologyBridge.hpp:1041-3427
/cgm/trunk/geom/TopologyBridge.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TopologyEntity.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TopologyEntity.cpp:1041-3427
/cgm/trunk/geom/TopologyEntity.cpp:3424-3459
+ /cgm/branches/cubit/geom/TopologyEntity.cpp:1041-3427
/cgm/trunk/geom/TopologyEntity.cpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/TopologyEntity.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/TopologyEntity.hpp:1041-3427
/cgm/trunk/geom/TopologyEntity.hpp:3424-3459
+ /cgm/branches/cubit/geom/TopologyEntity.hpp:1041-3427
/cgm/trunk/geom/TopologyEntity.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/UnMergeEvent.hpp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/UnMergeEvent.hpp:1041-3427
/cgm/trunk/geom/UnMergeEvent.hpp:3424-3459
+ /cgm/branches/cubit/geom/UnMergeEvent.hpp:1041-3427
/cgm/trunk/geom/UnMergeEvent.hpp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/facet
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/facet:1041-3427
/cgm/trunk/geom/facet:3424-3459
+ /cgm/branches/cubit/geom/facet:1041-3427
/cgm/trunk/geom/facet:3424-3493
Modified: cgm/branches/merge-cubit12/geom/facet/FacetModifyEngine.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/facet/FacetModifyEngine.cpp 2010-01-27 00:35:39 UTC (rev 3493)
+++ cgm/branches/merge-cubit12/geom/facet/FacetModifyEngine.cpp 2010-01-27 00:51:03 UTC (rev 3494)
@@ -917,13 +917,6 @@
goto end_brick;
}
- PRINT_INFO("Body successfully created.\n");
- PRINT_INFO(" Number of vertices = %d\n", gti->num_ref_vertices());
- PRINT_INFO(" Number of edges = %d\n", gti->num_ref_edges());
- PRINT_INFO(" Number of faces = %d\n", gti->num_ref_faces());
- PRINT_INFO(" Number of volumes = %d\n", gti->num_ref_volumes());
- PRINT_INFO(" Number of bodies = %d\n", gti->num_bodies());
-
return rv;
end_brick:
Property changes on: cgm/branches/merge-cubit12/geom/facetbool
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/facetbool:1041-3427
/cgm/trunk/geom/facetbool:3424-3459
+ /cgm/branches/cubit/geom/facetbool:1041-3427
/cgm/trunk/geom/facetbool:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/libcubit_geom.dsp
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/libcubit_geom.dsp:1041-3427
/cgm/trunk/geom/libcubit_geom.dsp:3424-3459
+ /cgm/branches/cubit/geom/libcubit_geom.dsp:1041-3427
/cgm/trunk/geom/libcubit_geom.dsp:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/parallel
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/parallel:1041-3427
/cgm/trunk/geom/parallel:3424-3459
+ /cgm/branches/cubit/geom/parallel:1041-3427
/cgm/trunk/geom/parallel:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/testing
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/eom/testing:1041-3427*
/cgm/trunk/geom/testing:3424-3459
+ /cgm/branches/cubit/eom/testing:1041-3427*
/cgm/trunk/geom/testing:3424-3493
Property changes on: cgm/branches/merge-cubit12/geom/virtual
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/geom/virtual:1041-3427
/cgm/trunk/geom/virtual:3424-3459
+ /cgm/branches/cubit/geom/virtual:1041-3427
/cgm/trunk/geom/virtual:3424-3493
Modified: cgm/branches/merge-cubit12/init/InitCGMA.cpp
===================================================================
--- cgm/branches/merge-cubit12/init/InitCGMA.cpp 2010-01-27 00:35:39 UTC (rev 3493)
+++ cgm/branches/merge-cubit12/init/InitCGMA.cpp 2010-01-27 00:51:03 UTC (rev 3494)
@@ -117,8 +117,10 @@
FacetModifyEngine::instance();
VirtualQueryEngine::instance()->register_attributes();
- if (default_engine_name && streq_nocase("FACET",default_engine_name))
+ if (default_engine_name && streq_nocase("FACET",default_engine_name)) {
default_engine = FacetModifyEngine::instance();
+ FacetModifyEngine::instance()->set_modify_enabled(CUBIT_TRUE);
+ }
if(default_engine_name && !ignore_default) {
if (!default_engine) {
Property changes on: cgm/branches/merge-cubit12/test
___________________________________________________________________
Modified: svn:mergeinfo
- /cgm/branches/cubit/test:1041-3427
/cgm/trunk/test:3424-3470
+ /cgm/branches/cubit/test:1041-3427
/cgm/trunk/test:3424-3493
Modified: cgm/branches/merge-cubit12/test/Makefile.am
===================================================================
--- cgm/branches/merge-cubit12/test/Makefile.am 2010-01-27 00:35:39 UTC (rev 3493)
+++ cgm/branches/merge-cubit12/test/Makefile.am 2010-01-27 00:51:03 UTC (rev 3494)
@@ -12,12 +12,14 @@
-I$(srcdir) \
$(OCC_INC_FLAG)
-TESTS = init sheet brick_facet
+TESTS = init sheet
if build_ACIS
TESTS += webcut hollow_acis brick_acis
else
if WITH_CUBIT
TESTS += webcut brick_acis
+else
+ TESTS += brick_facet
endif
endif
if build_OCC
Modified: cgm/branches/merge-cubit12/test/operation.cpp
===================================================================
--- cgm/branches/merge-cubit12/test/operation.cpp 2010-01-27 00:35:39 UTC (rev 3493)
+++ cgm/branches/merge-cubit12/test/operation.cpp 2010-01-27 00:51:03 UTC (rev 3494)
@@ -128,12 +128,12 @@
CubitVector v1(1,1,3);
CubitVector v2(1,2,2);
CubitVector v3(1,1,1);
- DLIList<BodySM*> mid_planes;
- status = OCCModifyEngine::instance()->get_mid_plane(v1, v2, v3, from_body, mid_planes);
- if(mid_planes.size() > 0)
+ BodySM* midplane_bodysm = 0;
+ status = OCCModifyEngine::instance()->get_mid_plane(v1, v2, v3, from_body, midplane_bodysm);
+ if(midplane_bodysm)
{
Body *midplane_body;
- midplane_body = gti->make_Body(mid_planes.pop());
+ midplane_body = gti->make_Body(midplane_bodysm);
double d = midplane_body->measure();
//d = 100
}
@@ -142,30 +142,16 @@
v2.x(2);
v3.x(2);
- status = OCCModifyEngine::instance()->get_mid_plane(v1, v2, v3, from_body, mid_planes);
- if(mid_planes.size() > 0)
+ midplane_bodysm = 0;
+ status = OCCModifyEngine::instance()->get_mid_plane(v1, v2, v3, from_body, midplane_bodysm);
+ if(midplane_bodysm)
{
Body *midplane_body;
- midplane_body = gti->make_Body(mid_planes.pop());
+ midplane_body = gti->make_Body(midplane_bodysm);
double d = midplane_body->measure();
//d = 70
}
- CubitVector v4(0,0,0);
- CubitVector v5(1,0,2);
- CubitVector v6(0,1,0);
- status = OCCModifyEngine::instance()->get_mid_plane(v4, v5, v6, from_body, mid_planes);
- if(mid_planes.size() > 0)
- {
- Body *midplane_body;
- for(int i = 0; i < mid_planes.size(); i++)
- {
- midplane_body = gti->make_Body(mid_planes.get_and_step());
- double d = midplane_body->measure();
- //d = 22.36 & 78.26
- }
- }
-
status = gmti->webcut_with_plane(from_bodies, v1, v2, v3, new_bodies, CUBIT_TRUE);
double d = new_bodies.step_and_get()->measure();
CubitVector v = new_bodies.get()->center_point();
More information about the cgma-dev
mailing list