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

[janehu at mcs.anl.gov]

Author: janehu
Date: 2008-09-03 13:15:05 -0500 (Wed, 03 Sep 2008)
New Revision: 2054

Modified:
   cgm/trunk/geom/OCC/OCCAttribSet.cpp
   cgm/trunk/geom/OCC/OCCQueryEngine.cpp
Log:
Remove attributes when the entities get deleted.

Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCAttribSet.cpp	2008-09-03 16:04:25 UTC (rev 2053)
+++ cgm/trunk/geom/OCC/OCCAttribSet.cpp	2008-09-03 18:15:05 UTC (rev 2054)
@@ -280,7 +280,7 @@
   if(!found)
     return;
 
-  myLabel.Nullify();
+  myLabel.ForgetAllAttributes();
 }
 
 void OCCAttribSet::remove_attribute( CubitSimpleAttrib* csa, 

Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCQueryEngine.cpp	2008-09-03 16:04:25 UTC (rev 2053)
+++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp	2008-09-03 18:15:05 UTC (rev 2054)
@@ -1718,6 +1718,9 @@
   if (!shape)
     return CUBIT_FAILURE;
 
+  //remove the entry from label tree
+  OCCAttribSet::remove_attribute(*shape) ;
+
   //remove the entry from the map
   int k;
   OCCBody* occ_body_find = NULL;
@@ -1774,6 +1777,9 @@
   if(!solid)
     return CUBIT_FAILURE;
 
+  //remove the entry from label tree
+  OCCAttribSet::remove_attribute(*solid) ;
+
   //remove the entry from the map
   int k;
   if(OCCMap->IsBound(*solid))
@@ -1919,6 +1925,9 @@
 
   unhook_cofaces_of_a_surface(fsurf);
 
+  //remove the entry from label tree
+  OCCAttribSet::remove_attribute(*face) ;
+
   //remove the entry from the map
   int k;
   if(OCCMap->IsBound(*face))
@@ -2102,6 +2111,8 @@
   if (!edge)
     return CUBIT_FAILURE;
 
+  //remove the entry from label tree
+  OCCAttribSet::remove_attribute(*edge) ;
   
   //remove the entry from the map
   int k;
@@ -2162,6 +2173,9 @@
   if (!vertex)
     return CUBIT_FAILURE;
 
+  //remove the entry from label tree
+  OCCAttribSet::remove_attribute(*vertex) ;
+
   //remove the entry from the map
   int k;
   if(OCCMap->IsBound(*vertex))