[cgma-dev] r4466 - in cgm/branches/merge-cubit12: . geom geom/ACIS geom/Cholla geom/OCC geom/SolidWorks geom/facet geom/facetbool geom/parallel geom/testing geom/testing/data geom/virtual itaps

kraftche at cae.wisc.edu kraftche at cae.wisc.edu
Mon Jan 24 10:46:06 CST 2011 

Author: kraftche
Date: 2011-01-24 10:46:06 -0600 (Mon, 24 Jan 2011)
New Revision: 4466

Modified:
   cgm/branches/merge-cubit12/
   cgm/branches/merge-cubit12/KNOWN_ISSUES
   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/CubitCompat.cpp
   cgm/branches/merge-cubit12/geom/CubitCompat.h.in
   cgm/branches/merge-cubit12/geom/CubitCompat.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/OCCQueryEngine.cpp
   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/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/testing/AngleCalc.cpp
   cgm/branches/merge-cubit12/geom/testing/CMakeLists.txt
   cgm/branches/merge-cubit12/geom/testing/CreateGeometry.cpp
   cgm/branches/merge-cubit12/geom/testing/GraphicsData.cpp
   cgm/branches/merge-cubit12/geom/testing/ReadIgesFile.cpp
   cgm/branches/merge-cubit12/geom/testing/TestConfig.h.in
   cgm/branches/merge-cubit12/geom/testing/TestUtilities.cpp
   cgm/branches/merge-cubit12/geom/testing/TestUtilities.hpp
   cgm/branches/merge-cubit12/geom/testing/cgm_test.hpp
   cgm/branches/merge-cubit12/geom/testing/data/
   cgm/branches/merge-cubit12/geom/virtual/
   cgm/branches/merge-cubit12/itaps/iGeom.h
   cgm/branches/merge-cubit12/itaps/iGeom_CGMA.cc
Log:
merge changes from trunk/


Property changes on: cgm/branches/merge-cubit12
___________________________________________________________________
Modified: svn:mergeinfo
   - /cgm/branches/cubit:1041-3427
/cgm/trunk:3424-4340
   + /cgm/branches/cubit:1041-3427
/cgm/trunk:3424-4465

Modified: cgm/branches/merge-cubit12/KNOWN_ISSUES
===================================================================
--- cgm/branches/merge-cubit12/KNOWN_ISSUES	2011-01-24 15:42:24 UTC (rev 4465)
+++ cgm/branches/merge-cubit12/KNOWN_ISSUES	2011-01-24 16:46:06 UTC (rev 4466)
@@ -10,8 +10,6 @@
 
 176 minor     CGM memory leak
 
-177 minor     3-D scale with different scale factors doesn't work.
-
 178 major     Unite function doesn't unite smoothly connected surfaces.
 
 179 major     mcnp2cad test suite lat1-7 not working, needs debugging.
@@ -25,3 +23,5 @@
 183 minor     Don't have proper tool to visualize the TopoDS_Shapes, debugging
            process is long preparing for graphics to understand the issue 
 
+185 major     mcnp2cad/tests/INP-torus test case fails on imprinting 2 spline 
+              surfaces.


Property changes on: cgm/branches/merge-cubit12/geom
___________________________________________________________________
Modified: svn:mergeinfo
   - /cgm/branches/cubit/geom:1041-3427*
/cgm/trunk/geom:3424-4340*
   + /cgm/branches/cubit/geom:1041-3427*
/cgm/trunk/geom:3424-4465*


Property changes on: cgm/branches/merge-cubit12/geom/ACIS
___________________________________________________________________
Modified: svn:mergeinfo
   - /cgm/trunk/geom/ACIS:3424-3493
   + /cgm/trunk/geom/ACIS:3424-4465


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-4340

More information about the cgma-dev mailing list