[cgma-dev] r4413 - cgm/branches/merge-cubit12/geom/OCC

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-01-03 11:07:45 -0600 (Mon, 03 Jan 2011)
New Revision: 4413

Modified:
   cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp
   cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp
   cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp
   cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.hpp
Log:
Added or Changed function signatures to for all new capabilities with cubit12.

Modified: cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp	2010-12-22 23:06:49 UTC (rev 4412)
+++ cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp	2011-01-03 17:07:45 UTC (rev 4413)
@@ -140,17 +140,15 @@
   OCCQueryEngine *OQE = OCCQueryEngine::instance();
   if( tessellate )
   {
-    int num_tris, num_pnts, num_facets;
     GMem g_mem ;
-    OQE->get_graphics( surface, num_tris, num_pnts, num_facets,
-      &g_mem );
+    OQE->get_graphics( surface, &g_mem);
 
     // Draw the triangles
     GPoint p[3];
     GPoint* plist = g_mem.point_list();
     int* facet_list = g_mem.facet_list();
     int i, c = 0;
-    for( i=0; i<num_tris; i++ )
+    for( i=0; i<g_mem.facet_list_size(); i++ )
     {
       p[0] = plist[facet_list[++c]];
       p[2] = plist[facet_list[++c]];
@@ -179,16 +177,15 @@
 OCCDrawTool::draw_curve( Curve *curve, int color , CubitBoolean flush )
 {
   GMem g_mem;
-  int num_points;
   OCCQueryEngine *OQE = OCCQueryEngine::instance();
   double tol = OQE->get_sme_resabs_tolerance();
   if (curve->get_arc_length() < tol)
     return CUBIT_SUCCESS;
   // get the graphics
   CubitStatus stat;
-  stat = OQE->get_graphics( curve, num_points, &g_mem );
+  stat = OQE->get_graphics( curve, &g_mem );
 
-  if (stat==CUBIT_FAILURE || num_points == 0)
+  if (stat==CUBIT_FAILURE )
   {
     PRINT_ERROR("Unable to tessellate a curve for display\n" );
     return CUBIT_FAILURE;

Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp
===================================================================
--- cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp	2010-12-22 23:06:49 UTC (rev 4412)
+++ cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp	2011-01-03 17:07:45 UTC (rev 4413)
@@ -50,6 +50,8 @@
   inline TopoDS_Wire* get_TopoDS_Wire() {return myTopoDSWire;}
   void set_TopoDS_Wire(TopoDS_Wire loop);