[cgma-dev] r5757 - cgm/trunk/geom/OCC

[janehu at mcs.anl.gov]

Author: janehu
Date: 2012-09-27 11:41:29 -0500 (Thu, 27 Sep 2012)
New Revision: 5757

Modified:
   cgm/trunk/geom/OCC/OCCCurve.cpp
   cgm/trunk/geom/OCC/OCCModifyEngine.cpp
   cgm/trunk/geom/OCC/OCCQueryEngine.cpp
Log:
Back port changes in merge-cubit13.1 to cgm trunk, passed cgm check, now still double check on mcnp2cad, already passed 33.

Modified: cgm/trunk/geom/OCC/OCCCurve.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCCurve.cpp	2012-09-27 02:22:30 UTC (rev 5756)
+++ cgm/trunk/geom/OCC/OCCCurve.cpp	2012-09-27 16:41:29 UTC (rev 5757)
@@ -462,14 +462,12 @@
   double sqr_dist = CUBIT_DBL_MAX;
   double pparam;
   for (int i = 1; i <= ext.NbExt(); ++i) {
-    if (ext.IsMin(i)) {
       double new_sqr_dist = p.SquareDistance( ext.Point(i).Value() );
       if (new_sqr_dist < sqr_dist) {
         sqr_dist = new_sqr_dist;
         newP = ext.Point(i).Value();
         pparam = ext.Point(i).Parameter();
       }
-    }
   }
 
     // if we didn't find any minimum...

Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2012-09-27 02:22:30 UTC (rev 5756)
+++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2012-09-27 16:41:29 UTC (rev 5757)
@@ -2363,13 +2363,16 @@
                     &cutter, keep_old);
       else
       {
+/*
         if(!keep_old)
           OCCQueryEngine::instance()->delete_solid_model_entities(from_body);
         from_shape->Nullify();
+*/
+        from_shape = NULL;
       }
 
       int stat;
-      if(!has_changed && !from_shape->IsNull())
+      if(!has_changed && from_shape && !from_shape->IsNull())
       {
         //Add imprint code here 
         DLIList<TopoDS_Face*> face_list;
@@ -2387,9 +2390,9 @@
     }
 
     //ok, we're done with all cuts, construct new Body'
-    if (count < tool_bodies_copy.size() && !from_shape->IsNull())
+    if (count < tool_bodies_copy.size() && from_shape && !from_shape->IsNull())
       tbs += OCCQueryEngine::instance()->populate_topology_bridge(*from_shape);
-    else if (!from_shape->IsNull())
+    else if (from_shape && !from_shape->IsNull())