[cgma-dev] r5603 - cgm/branches/merge-cubit13.1/geom/OCC

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-06-28 10:48:17 -0500 (Thu, 28 Jun 2012)
New Revision: 5603

Added:
   cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5466
Removed:
   cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5528
   cgm/branches/merge-cubit13.1/geom/OCC/OCCSurface.cpp_5466
Modified:
   cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp
Log:
Update OCCCurve functions to create stand-along curves.

Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp
===================================================================
--- cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp	2012-06-28 15:29:04 UTC (rev 5602)
+++ cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp	2012-06-28 15:48:17 UTC (rev 5603)
@@ -841,7 +841,7 @@
           if (point)
 	    result_list.append_unique(dynamic_cast<OCCPoint*>(point));
   }
-    if(result_list.size() ==0)
+  if(result_list.size() ==0)
     return;
   //make sure the points are in the start-end order
   double start , end;     
@@ -1173,12 +1173,12 @@
       for (Ex.Init(new_shape,TopAbs_EDGE); Ex.More(); Ex.Next())
       {
         new_edge = TopoDS::Edge(Ex.Current());
-        return OCCQueryEngine::instance()->populate_topology_bridge(new_edge);
+        return OCCQueryEngine::instance()->populate_topology_bridge(new_edge, CUBIT_TRUE);
       }
       for(Ex.Init(new_shape,TopAbs_VERTEX);Ex.More(); Ex.Next())
       {
         new_point = TopoDS::Vertex(Ex.Current());
-        normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(new_point));
+        normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(new_point,CUBIT_TRUE));
       } 
       return (Curve*) NULL;
    }
@@ -1204,14 +1204,14 @@
       for(Ex.Init(new_shape,TopAbs_VERTEX);Ex.More(); Ex.Next())
       {
         point = TopoDS::Vertex(Ex.Current());
-        normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(point));
+        normal_proj_points.append(OCCQueryEngine::instance()->populate_topology_bridge(point, CUBIT_TRUE));
       }
 
       if(edge1.IsNull())
-        return OCCQueryEngine::instance()->populate_topology_bridge(edge2);
+        return OCCQueryEngine::instance()->populate_topology_bridge(edge2, CUBIT_TRUE);
 
       if(edge2.IsNull())
-        return OCCQueryEngine::instance()->populate_topology_bridge(edge1);
+        return OCCQueryEngine::instance()->populate_topology_bridge(edge1, CUBIT_TRUE);
 
       if(edge1.IsNull() && edge2.IsNull())
         return (Curve*) NULL;
@@ -1246,7 +1246,7 @@
         double d2 = projOncurve2.LowerDistance();
         TopoDS_Edge new_edge =
                 d > d2 ? edge2 : edge1 ;
-        return OCCQueryEngine::instance()->populate_topology_bridge(new_edge);