Changeset 1496:c60369a1c987 in lemon-0.x

Timestamp:

06/15/05 13:15:01 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1977

Message:

At last, the most simple task, the graph-item deletion is solved...

Location:

gui

Files:

• graph_displayer_canvas.cc (modified) (4 diffs)
• graph_displayer_canvas.h (modified) (1 diff)

gui/graph_displayer_canvas.cc

@@ -623 +623 @@
           if(active_node!=INVALID)
             {
-//            EdgeIt e;
-//            g.firstOut(e,active_node);
-//            for(;e!=INVALID;g.nextOut(e))
-//              {
-//                if(e!=INVALID)delete_item(e);
-//              }
-
-//            g.firstIn(e,active_node);
-//            for(;e!=INVALID;g.nextIn(e))
-//              {
-//                if(e!=INVALID)delete_item(e);
-//              }
-              for (EdgeIt i(g); i!=INVALID; ++i)
-                {
-                  //std::cout << g.source(i).id << "-" << g.target(i).id << " " << active_node.id << std::endl;
-                  if((g.source(i)==active_node)||(g.target(i)==active_node))
-                    {
-                      delete_item(i);
-                    }
+
+              //collecting edges to delete
+              EdgeIt e;
+              std::set<Graph::Edge> edges_to_delete;
+
+              g.firstOut(e,active_node);
+              for(;e!=INVALID;g.nextOut(e))
+                {
+                      edges_to_delete.insert(e);
+                }
+
+              g.firstIn(e,active_node);
+              for(;e!=INVALID;g.nextIn(e))
+                {
+                      edges_to_delete.insert(e);
+                }
+
+              //deleting collected edges
+              for(std::set<Graph::Edge>::iterator edge_set_it=edges_to_delete.begin();edge_set_it!=edges_to_delete.end();edge_set_it++)
+                {
+                  delete_item(*edge_set_it);
                 }
               delete_item(active_node);
             }
+          //a simple edge was chosen
           else
             {
@@ -652 +655 @@
           
         }
+      //pointer was moved, deletion is cancelled
       else
         {
@@ -663 +667 @@
             }
         }
+      //reseting datas
       active_item=NULL;
       active_edge=INVALID;
@@ -689 +694 @@
 }
 
+void GraphDisplayerCanvas::delete_item(Graph::Edge edge_to_delete)
+{
+  delete(edgesmap[edge_to_delete]);
+  g.erase(edge_to_delete);
+}
+

gui/graph_displayer_canvas.h

@@ -74 +74 @@
   ///Deletes the given element.
   void delete_item(EdgeIt);
+  ///Deletes the given element.
+  void delete_item(Graph::Edge);
 
   ///The graph, on which we work