[cgma-dev] r5543 - in cgm/branches/merge-cubit13.1/geom: . OCC

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-06-04 10:14:42 -0500 (Mon, 04 Jun 2012)
New Revision: 5543

Modified:
   cgm/branches/merge-cubit13.1/geom/GeometryModifyTool.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCAttribSet.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCAttribSet.hpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCLoop.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCLump.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCPoint.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCShell.cpp
   cgm/branches/merge-cubit13.1/geom/OCC/OCCSurface.cpp
Log:
Update in 1. Unite logics. 2. Attributes wirte out. 3. make finish_sm_op status different then op status itself, to avoid misleading report. 4. Other minor changes here and there.
Passed geom make check, passed the mcnp2cad tests as previous status except the complement test, which is failing now and am looking at.

Modified: cgm/branches/merge-cubit13.1/geom/GeometryModifyTool.cpp
===================================================================
--- cgm/branches/merge-cubit13.1/geom/GeometryModifyTool.cpp	2012-06-04 15:06:54 UTC (rev 5542)
+++ cgm/branches/merge-cubit13.1/geom/GeometryModifyTool.cpp	2012-06-04 15:14:42 UTC (rev 5543)
@@ -6068,6 +6068,9 @@
 
    CubitStatus stat = finish_sm_op(bodies, body_sm_list, result_bodies);
 
+   if( keep_old == CUBIT_FALSE )
+     fixup_merged_entities( merged_surface_ids, merged_curve_ids);
+
    if( CubitUndo::get_undo_enabled() )
    {
      if( stat == CUBIT_SUCCESS )
@@ -6120,9 +6123,6 @@
 
    }
 
-   if( keep_old == CUBIT_FALSE )
-     fixup_merged_entities( merged_surface_ids, merged_curve_ids);
-
   if( CubitUndo::get_undo_enabled() )
   {
     if( leftoversBody )
@@ -6809,11 +6809,11 @@
     return CUBIT_FAILURE;
   }
 
-   if (get_group_imprint() == CUBIT_FALSE)
-   {
-     CubitStatus result = imprint_singly( from_body_list, new_body_list, keep_old );
-     return result;
-   }
+   //if (get_group_imprint() == CUBIT_FALSE)
+   //{
+   //  CubitStatus result = imprint_singly( from_body_list, new_body_list, keep_old );
+   //  return result;
+   //}
 
      // Check the GeometryEngine for each of the Body's; check to
      // make sure they're all the same
@@ -7064,7 +7064,7 @@
 }
 
 
-
+/*
 CubitStatus GeometryModifyTool::imprint_singly( DLIList<Body*> &from_body_list,
                                                 DLIList<Body*> &new_body_list,
                                                 CubitBoolean keep_old )
@@ -7247,8 +7247,8 @@