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

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-12-09 12:35:34 -0600 (Fri, 09 Dec 2011)
New Revision: 5255

Modified:
   cgm/trunk/geom/OCC/OCCModifyEngine.cpp
Log:
Fixed testcase mcnp2cad/INP-complement, passed cgm tests and mcnp2cad cone, cone2, cone3, transform6, hexlat.

Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2011-12-09 15:25:36 UTC (rev 5254)
+++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2011-12-09 18:35:34 UTC (rev 5255)
@@ -2204,7 +2204,7 @@
 
   //list of face on from_shape that has been imprinted
   DLIList<TopoDS_Face*> from_faces; 
-  CubitBoolean need_1_split = CUBIT_FALSE;
+  //CubitBoolean need_1_split = CUBIT_FALSE;
   while( more_face)
     {
       TopoDS_Face from_face,tool_face;
@@ -2477,8 +2477,10 @@
             if(fabs(-after_mass + orig_mass) > TOL && after_mass > TOL)
               return 1; 
           }
+/*
           else
             need_1_split = CUBIT_TRUE;
+*/
           //have to use boolean operation, see 
           //http://www.opencascade.org/org/forum/thread_20672/ for more info
         }
@@ -2723,9 +2725,10 @@
             CubitBox* pbox = new CubitBox(box);
             bs.append(pbox);
           }
+/*
           if(size > 1)
             need_1_split = CUBIT_TRUE;
-
+*/
           bs.append((CubitBox*) NULL);
 
           for(int i = 0; i < size-1; i++)
@@ -2934,8 +2937,10 @@
 	  TopoDS_Face* topo_face = new TopoDS_Face(from_face);
 	  from_faces.append(topo_face);
 	} 
+/*
       if (need_1_split)
         break;
+*/
     }
   
   
@@ -3531,35 +3536,8 @@
          //for cylinder overlapping cases, doing boolean operation is necessary for 
          //now. 10/25/11
          BodySM* tool_copy = copy_body(from_body_list[j%size]);