Changeset 1485:3a1c6678fa23 in lemon-0.x for gui

Timestamp:

06/14/05 17:58:12 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Erasing from graph would be possible, if erasing from graph would be possible... (Afternoon has become timewasting...)

Location:

gui

Files:

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

gui/all_include.h

@@ -18 +18 @@
 
 enum {WIDTH, COLOR, TEXT, PROPERTY_NUM}; // edge properties;
-enum {MOVE, CREATE_NODE, CREATE_EDGE, TOOL_NUM}; // tools;
+enum {MOVE, CREATE_NODE, CREATE_EDGE, ERASER, TOOL_NUM}; // tools;
 #define RANGE 3
 #define WIN_WIDTH 900

gui/edit_win.cc

@@ -69 +69 @@
   table.attach(*buttons[MOVE],0,1,1,2);
       
+  //New edge button
+  buttons[ERASER]=new Gtk::RadioButton("Erase Item");
+  buttons[ERASER]->set_mode(false);
+  buttons[ERASER]->set_group(group);
+  buttons[ERASER]->signal_clicked().connect
+    (
+     sigc::bind
+     (
+      sigc::mem_fun(*this, &EditWin::makeEditorialToolChanged),
+      3
+      )
+     );
+  table.attach(*buttons[ERASER],1,2,1,2);
+    
   add(table);
 

gui/graph_displayer_canvas.cc

@@ -323 +323 @@
       actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_edge_event_handler), false);
       break;
+
+    case ERASER:
+      actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::eraser_event_handler), false);
+      break;
+
     default:
       break;
@@ -585 +590 @@
 }
 
+bool GraphDisplayerCanvas::eraser_event_handler(GdkEvent* e)
+{
+  switch(e->type)
+    {
+    case GDK_BUTTON_PRESS:
+      active_item=(get_item_at(e->button.x, e->button.y));
+      active_node=INVALID;
+      active_edge=INVALID;
+      for (NodeIt i(g); i!=INVALID; ++i)
+        {
+          if(nodesmap[i]==active_item)
+            {
+              active_node=i;
+            }
+        }
+      if(active_node==INVALID)
+        {
+          for (EdgeIt i(g); i!=INVALID; ++i)
+            {
+              if(edgesmap[i]==active_item)
+                {
+                  active_edge=i;
+                }
+            }
+        }
+    *active_item << Gnome::Canvas::Properties::fill_color("red");
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      if(active_item==(get_item_at(e->button.x, e->button.y)))
+        {
+          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);
+          
+        }
+      else
+        {
+          if(active_node!=INVALID)
+            {
+              *active_item << Gnome::Canvas::Properties::fill_color("blue");
+            }
+          else
+            {
+              *active_item << Gnome::Canvas::Properties::fill_color("green");
+            }
+        }
+      active_item=NULL;
+      active_edge=INVALID;
+      active_node=INVALID;
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      break;
+
+    default:
+      break;
+    }
+  return true;
+}
+
+void GraphDisplayerCanvas::delete_item(Gnome::Canvas::Item * item_to_delete)
+{
+  //item_to_delete->hide();
+  delete(item_to_delete);
+}
+

gui/graph_displayer_canvas.h

@@ -67 +67 @@
   ///event handler for the case when create_edge-tool is active
   bool create_edge_event_handler(GdkEvent*);
+  ///event handler for the case when eraser-tool is active
+  bool eraser_event_handler(GdkEvent*);
+
+  ///Deletes the given item.
+  void delete_item(Gnome::Canvas::Item *);
 
   ///The graph, on which we work