[cgma-dev] r2792 - cgm/trunk/test

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2009-04-01 15:30:46 -0500 (Wed, 01 Apr 2009)
New Revision: 2792

Modified:
   cgm/trunk/test/r_w.cpp
   cgm/trunk/test/stitch.name_occ
   cgm/trunk/test/unite1.occ
   cgm/trunk/test/unite4.occ
Log:
updated for brep files format of having attributes.

Modified: cgm/trunk/test/r_w.cpp
===================================================================
--- cgm/trunk/test/r_w.cpp	2009-04-01 20:16:59 UTC (rev 2791)
+++ cgm/trunk/test/r_w.cpp	2009-04-01 20:30:46 UTC (rev 2792)
@@ -308,8 +308,8 @@
   Body* tool_body = bodies.step_and_get();  
   rsl = gmti->subtract(tool_body,from_bodies, new_bodies,
                        CUBIT_TRUE, CUBIT_FALSE);
-  //Created volume(s): 5, 6
-  //Destroyed volume(s): 3, 4
+  //Created volume(s): 24, 25
+  //Destroyed volume(s): 22, 23
   double d = new_bodies.step_and_get()->measure();
   CubitVector v = new_bodies.get()->center_point();
   int n = new_bodies.get()->num_ref_faces();

Modified: cgm/trunk/test/stitch.name_occ
===================================================================
--- cgm/trunk/test/stitch.name_occ	2009-04-01 20:16:59 UTC (rev 2791)
+++ cgm/trunk/test/stitch.name_occ	2009-04-01 20:30:46 UTC (rev 2792)
@@ -213,8 +213,6 @@
 Fa
 0  1e-07 1 0
 
-CGM_ATTRIB ENTITY_NAME* face1* * *
-*
 0111000
 +89 0 *
 Ve
@@ -329,8 +327,6 @@
 Fa
 0  1e-07 2 0
 
-CGM_ATTRIB ENTITY_NAME* face2* * *
-*
 0101000
 +74 0 *
 Ve
@@ -365,8 +361,6 @@
 Fa
 0  1e-07 3 0
 
-CGM_ATTRIB ENTITY_NAME* face16* * *
-*
 0111000
 +69 0 *
 Ve
@@ -465,8 +459,6 @@
 Fa
 0  1e-07 4 0
 
-CGM_ATTRIB ENTITY_NAME* face3* * *
-*
 0101000
 +56 0 *
 Ed
@@ -485,8 +477,6 @@
 Fa
 0  1e-07 5 0
 
-CGM_ATTRIB ENTITY_NAME* face4* * *
-*
 0101000
 +53 0 *
 Ed
@@ -505,8 +495,6 @@
 Fa
 0  1e-07 6 1
 
-CGM_ATTRIB ENTITY_NAME* face5* * *
-*
 0101000
 +50 0 *
 Ed
@@ -525,8 +513,6 @@
 Fa
 0  1e-07 8 1
 
-CGM_ATTRIB ENTITY_NAME* face6* * *
-*
 0101000
 +47 0 *
 Ed
@@ -545,8 +531,6 @@
 Fa
 0  1e-07 9 1
 
-CGM_ATTRIB ENTITY_NAME* face7* * *
-*
 0101000
 +44 0 *
 Ed
@@ -565,8 +549,6 @@
 Fa
 0  1e-07 5 0
 
-CGM_ATTRIB ENTITY_NAME* face8* * *
-*
 0101000
 +41 0 *
 Wi
@@ -576,8 +558,6 @@
 Fa
 0  1e-07 10 0
 
-CGM_ATTRIB ENTITY_NAME* face9* * *
-*
 0111000
 +39 0 *
 Sh
@@ -660,8 +640,6 @@
 Fa
 0  1e-07 12 0
 
-CGM_ATTRIB ENTITY_NAME* face10* * *
-*
 0111000
 +27 0 *
 Ve
@@ -735,8 +713,6 @@
 Fa
 0  1e-07 17 0
 
-CGM_ATTRIB ENTITY_NAME* face11* * *
-*
 0111000
 +17 0 *
 Ed
@@ -764,8 +740,6 @@
 Fa
 0  1e-07 13 0
 
-CGM_ATTRIB ENTITY_NAME* face12* * *
-*
 0111000
 +13 0 *
 Ed
@@ -793,8 +767,6 @@
 Fa
 0  1e-07 15 0
 
-CGM_ATTRIB ENTITY_NAME* face13* * *
-*
 0111000
 +9 0 *
 Wi
@@ -804,8 +776,6 @@
 Fa
 0  1e-07 16 0
 
-CGM_ATTRIB ENTITY_NAME* face14* * *
-*
 0111000
 +7 0 *
 Wi
@@ -815,8 +785,6 @@
 Fa
 0  1e-07 14 0
 
-CGM_ATTRIB ENTITY_NAME* face15* * *
-*
 0111000
 +5 0 *
 Sh
@@ -833,3 +801,116 @@
 +36 0 +2 3 *
 
 +1 0 
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face1* * *
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face2* * *
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face16* * *
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face3* * *
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face4* * *
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face5* * *
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face6* * *
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face7* * *
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face8* * *
+*
+*
+CGM_ATTRIB ENTITY_NAME* face9* * *
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face10* * *
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face11* * *
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face12* * *
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* face13* * *
+*
+*
+CGM_ATTRIB ENTITY_NAME* face14* * *
+*
+*
+CGM_ATTRIB ENTITY_NAME* face15* * *
+*
+*
+*
+*

Modified: cgm/trunk/test/unite1.occ
===================================================================
--- cgm/trunk/test/unite1.occ	2009-04-01 20:16:59 UTC (rev 2791)
+++ cgm/trunk/test/unite1.occ	2009-04-01 20:30:46 UTC (rev 2792)
@@ -327,8 +327,6 @@
 -60 0 +50 0 -46 0 +42 0 -40 0 +38 0 *
 So
 
-CGM_ATTRIB ENTITY_NAME* volumeB* * *
-*
 0100000
 +37 0 *
 Ve
@@ -555,8 +553,6 @@
 -26 0 +16 0 -12 0 +8 0 -6 0 +4 0 *
 So
 
-CGM_ATTRIB ENTITY_NAME* volumeA* * *
-*
 0100000
 +3 0 *
 Co
@@ -565,3 +561,74 @@
 +36 3 +2 0 *
 
 +1 0 
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* volumeB* * *
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* volumeA* * *
+*
+*

Modified: cgm/trunk/test/unite4.occ
===================================================================
--- cgm/trunk/test/unite4.occ	2009-04-01 20:16:59 UTC (rev 2791)
+++ cgm/trunk/test/unite4.occ	2009-04-01 20:30:46 UTC (rev 2792)
@@ -322,8 +322,6 @@
 -60 0 +50 0 -46 0 +42 0 -40 0 +38 0 *
 So
 
-CGM_ATTRIB ENTITY_NAME* volumeA* * *
-*
 0100000
 +37 0 *
 Ve
@@ -550,8 +548,6 @@
 -26 0 +16 0 -12 0 +8 0 -6 0 +4 0 *
 So
 
-CGM_ATTRIB ENTITY_NAME* volumeB* * *
-*
 0100000
 +3 0 *
 Co
@@ -560,3 +556,74 @@
 +36 1 +2 0 *
 
 +1 0 
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* volumeA* * *
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+CGM_ATTRIB ENTITY_NAME* volumeB* * *
+*
+*