Changeset 14:39945305a572 in glemon-0.x

Timestamp:

06/14/05 18:56:37 (19 years ago)

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

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

Message:

Sorry, the previous commit was uncorrect. Erasing is now possible on edges, but on nodes not.

Files:

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

graph_displayer_canvas.cc

@@ -623 +623 @@
           if(active_node!=INVALID)
             {
-              EdgeIt e;
-              g.firstOut(e,active_node);
-              for(;e!=INVALID;g.nextOut(e))
-                {
-                  delete_item(edgesmap[e]);
-                  //edgesmap[e]->property_points().set_value(coos);
-                  //edgetextmap[e]->property_y().set_value((y1+y2)/2);
-                }
-
-              g.firstIn(e,active_node);
-              for(;e!=INVALID;g.nextIn(e))
-                {
-                  delete_item(edgesmap[e]);
-                  //edgesmap[e]->get_bounds(x1, y1, x2, y2);
-                  //edgetextmap[e]->property_y().set_value((y1+y2)/2);
-                }
-            }
-          delete_item(active_item);
+//            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);
+                    }
+                }
+              delete_item(active_node);
+            }
+          else
+            {
+              delete_item(active_edge);
+            }
+
           
         }
@@ -668 +677 @@
 }
 
-void GraphDisplayerCanvas::delete_item(Gnome::Canvas::Item * item_to_delete)
-{
-  //item_to_delete->hide();
-  delete(item_to_delete);
-}
-
+void GraphDisplayerCanvas::delete_item(NodeIt node_to_delete)
+{
+  delete(nodesmap[node_to_delete]);
+  g.erase(node_to_delete);
+}
+
+void GraphDisplayerCanvas::delete_item(EdgeIt edge_to_delete)
+{
+  delete(edgesmap[edge_to_delete]);
+  g.erase(edge_to_delete);
+}
+

graph_displayer_canvas.h

@@ -70 +70 @@
   bool eraser_event_handler(GdkEvent*);
 
-  ///Deletes the given item.
-  void delete_item(Gnome::Canvas::Item *);
+  ///Deletes the given element.
+  void delete_item(NodeIt);
+  ///Deletes the given element.
+  void delete_item(EdgeIt);
 
   ///The graph, on which we work