Changeset 2043

Timestamp:

08/18/08 11:45:24 (4 months ago)

Author:

janehu

Message:

Coedge wasn't cleaned totally when deleting, fixed this bug,updated testcases.

Files:

• cgm/trunk/geom/OCC/OCCCoEdge.cpp (modified) (1 diff)
• cgm/trunk/geom/OCC/OCCCoEdge.hpp (modified) (2 diffs)
• cgm/trunk/geom/OCC/OCCModifyEngine.cpp (modified) (1 diff)
• cgm/trunk/geom/OCC/OCCQueryEngine.cpp (modified) (2 diffs)
• cgm/trunk/geom/OCC/OCCShell.cpp (modified) (2 diffs)
• cgm/trunk/geom/OCC/OCCSurface.cpp (modified) (2 diffs)
• cgm/trunk/test/modify.cpp (modified) (9 diffs)
• cgm/trunk/test/r_w.cpp (modified) (2 diffs)

cgm/trunk/geom/OCC/OCCCoEdge.cpp

@@ -42 +42 @@
-OCCCoEdge::OCCCoEdge( Curve *curv_ptr, 
-                      LoopSM *loop_ptr, CubitSense sense )
-
+Mark(0), my
-                      myLoop(loop_ptr),edgeSense(sense)
-{

cgm/trunk/geom/OCC/OCCCoEdge.hpp

@@ -65 +65 @@
-  inline void set_loop(LoopSM * loop) {myLoop = loop;}
-
+  inline int get_mark(){return myMark;}
+  inline void set_mark(int k){myMark = k;}
+
-  virtual GeometryQueryEngine*
-  get_geometry_query_engine() const;
@@ -121 +124 @@
-  Curve *myCurve;
-  CubitSense edgeSense;
+  int myMark;
-};
-

cgm/trunk/geom/OCC/OCCModifyEngine.cpp

@@ -3542 +3542 @@
-    TopoDS_Shape new_shape = fuser.Shape();
-
-    //Debug:: check how many faces are there in new_shape.
-    TopExp_Explorer Ex;
-    int count = 0;
-    for (Ex.Init(new_shape, TopAbs_FACE);Ex.More(); Ex.Next())
-      count++;
- 
-    CubitBoolean has_changed;
-    check_operation(new_shape, first_shape, first_is_volume, has_changed, &fuser);

cgm/trunk/geom/OCC/OCCQueryEngine.cpp

@@ -1422 +1422 @@
-      if(coedge->curve() == curve)
-      {
+        coedge->set_mark(1);
-        exist = CUBIT_TRUE;
-        coedge->set_sense(sense);
@@ -1460 +1461 @@
-  loop->coedges(coedges_new);
-
+  //remove unused coedges
+  for(int i = 0; i < coedges_old.size(); i++)
+  {
+    OCCCoEdge *coedge = coedges_old.get_and_step();
+    if(coedge->get_mark() != 1)
+      delete coedge;
+    else
+      coedge->set_mark(0);
+  }
-  return loop;
-}

cgm/trunk/geom/OCC/OCCShell.cpp

@@ -233 +233 @@
-                                                      shape);
-        }
-        shape.Nullify();
-      }
-
-
+
-    }
-    else if(op->IsDeleted(*get_TopoDS_Shell()))
@@ -295 +293 @@
-    if(shapes.Extent() == 1)
-      shape = shapes.First();
-
+ if(shapes.Extent() > 1)
-    {
-
+
+
+
-      {
-
-
-
-
-
-
-
+
+
-      }
+      shape = shapes.First();
+    }
+    else 
-      shape.Nullify();
-    }
-    if(shapes.Extent() > 0 || (op && op->IsDeleted(face)))
-      OCCSurface::update_OCC_entity(face,shape, op, sp);

cgm/trunk/geom/OCC/OCCSurface.cpp

@@ -893 +893 @@
-         for(it; it.More(); it.Next())
-         {
-
+_edge
-           OCCQueryEngine::instance()->copy_attributes(edge, shape_edge);
-         }
@@ -920 +920 @@
-         for(it; it.More(); it.Next())
-         {
-
+_vertex
-           OCCQueryEngine::instance()->copy_attributes(vertex, shape_vertex);
-         }

cgm/trunk/test/modify.cpp

@@ -290 +290 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities);
+  assert(free_entities.size() == 0);
-  //there shouldn't be any free_entites.
-
@@ -381 +382 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities);
+  assert(free_entities.size() == 0);
-  //there shouldn't be any free_entites.
-
@@ -485 +487 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities);  
-
+
+
-  OCCQueryEngine* oqe = OCCQueryEngine::instance();
-  DLIList <OCCBody* > *occ_bodies = oqe->BodyList;
@@ -512 +515 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities);
-
+
-  //test body-body intersect.
-  //1. from body is the commom body, no update
@@ -561 +564 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities);
+  assert(free_entities.size() == 0);
-
-  //test chop operation
@@ -585 +589 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities);
-
+
-  //test chop 2
-  from_body = gmti->brick(4, 4, 4);
@@ -608 +612 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities);
+  assert(free_entities.size() == 0);
-
-  //test unite 1
@@ -627 +632 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities); //free_entities.size() = 0
+  assert(free_entities.size() == 0);
-  //delete all entities
-  gti->delete_Body(bodies);
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities); //free_entities.size() = 0
-
+
-  //test unite 2
-  tool_body = gmti->brick(4, 4,4);
@@ -651 +657 @@
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities); //free_entities.size() = 0
+  assert(free_entities.size() == 0);
-  //delete all entities
-  gti->delete_Body(bodies);
-  free_entities.clean_out();
-  gti->get_free_ref_entities(free_entities); //free_entities.size() = 0
+  assert(free_entities.size() == 0);
-
-  //test making thick body.

cgm/trunk/test/r_w.cpp

@@ -173 +173 @@
-  rsl = gmti->subtract(tool_body,from_bodies, new_bodies,
-                       CUBIT_TRUE, CUBIT_FALSE);
-21, 22
-18, 20
+5, 6
+3, 4
-  double d = new_bodies.step_and_get()->measure();
-  CubitVector v = new_bodies.get()->center_point();
@@ -194 +194 @@
-  gti->delete_Body(bodies); 
-  
+  gti->get_free_ref_entities(free_entities);
+  assert(free_entities.size() ==0);
-  return CUBIT_SUCCESS;
-}