[cgma-dev] r4490 - in cgm/trunk: geom/OCC util

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-02-14 12:08:12 -0600 (Mon, 14 Feb 2011)
New Revision: 4490

Modified:
   cgm/trunk/geom/OCC/OCCCurve.cpp
   cgm/trunk/geom/OCC/OCCSurface.cpp
   cgm/trunk/util/GeometryDefines.h
Log:
remove OCC-specfic geometry types and fix related build issues

Modified: cgm/trunk/geom/OCC/OCCCurve.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCurve.cpp	2011-02-14 16:26:46 UTC (rev 4489)
+++ cgm/trunk/geom/OCC/OCCCurve.cpp	2011-02-14 18:08:12 UTC (rev 4490)
@@ -610,7 +610,7 @@
   if (acurve.GetType() == GeomAbs_BezierCurve)
      return SPLINE_CURVE_TYPE;
   if (acurve.GetType() == GeomAbs_BSplineCurve)
-     return BSPLINE_CURVE_TYPE;
+     return SPLINE_CURVE_TYPE;
   if (acurve.GetType() == GeomAbs_Line)
      return STRAIGHT_CURVE_TYPE;
   if (acurve.GetType() == GeomAbs_Parabola)

Modified: cgm/trunk/geom/OCC/OCCSurface.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCSurface.cpp	2011-02-14 16:26:46 UTC (rev 4489)
+++ cgm/trunk/geom/OCC/OCCSurface.cpp	2011-02-14 18:08:12 UTC (rev 4490)
@@ -202,7 +202,7 @@
   if (asurface.GetType() == GeomAbs_BezierSurface)
      return SPLINE_SURFACE_TYPE;
   if (asurface.GetType() == GeomAbs_BSplineSurface)
-     return BSPLINE_SURFACE_TYPE;
+     return SPLINE_SURFACE_TYPE;
   if (asurface.GetType() == GeomAbs_Plane)      
      return PLANE_SURFACE_TYPE;
   if (asurface.GetType() == GeomAbs_Cylinder ||
@@ -213,11 +213,11 @@
   if (asurface.GetType() == GeomAbs_Torus)
       return TORUS_SURFACE_TYPE;
   if (asurface.GetType() == GeomAbs_SurfaceOfRevolution)
-     return REVOLUTION_SURFACE_TYPE;
+     return UNDEFINED_SURFACE_TYPE;
   if (asurface.GetType() == GeomAbs_SurfaceOfExtrusion)
-     return EXTRUSION_SURFACE_TYPE;
+     return UNDEFINED_SURFACE_TYPE;
   if (asurface.GetType() == GeomAbs_OffsetSurface)
-     return OFFSET_SURFACE_TYPE;
+     return UNDEFINED_SURFACE_TYPE;
   return UNDEFINED_SURFACE_TYPE;  
 }
 //-------------------------------------------------------------------------

Modified: cgm/trunk/util/GeometryDefines.h
===================================================================
--- cgm/trunk/util/GeometryDefines.h	2011-02-14 16:26:46 UTC (rev 4489)
+++ cgm/trunk/util/GeometryDefines.h	2011-02-14 18:08:12 UTC (rev 4490)
@@ -83,14 +83,6 @@
   
     /* Lump types */
   UNDEFINED_LUMP_TYPE