Changeset 32:1f45545f124c in glemon-0.x

Timestamp:

07/12/05 20:21:49 (20 years ago)

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

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

Message:

Editors are based.

Files:

• all_include.h (modified) (1 diff)
• graph_displayer_canvas-event.cc (modified) (4 diffs)
• graph_displayer_canvas.cc (modified) (2 diffs)
• graph_displayer_canvas.h (modified) (2 diffs)
• main_win.cc (modified) (2 diffs)

all_include.h

@@ -19 +19 @@
 enum {E_WIDTH, E_COLOR, E_TEXT, EDGE_PROPERTY_NUM}; // edge properties;
 enum {N_RADIUS, N_COLOR, N_TEXT, NODE_PROPERTY_NUM}; // node properties;
-enum {MOVE, CREATE_NODE, CREATE_EDGE, ERASER, EDGE_MAP_EDIT, TOOL_NUM}; // tools;
+enum {MOVE, CREATE_NODE, CREATE_EDGE, ERASER, EDGE_MAP_EDIT, NODE_MAP_EDIT, TOOL_NUM}; // tools;
 #define RANGE 3
 #define WIN_WIDTH 900

graph_displayer_canvas-event.cc

@@ -42 +42 @@
     case ERASER:
       actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::eraserEventHandler), false);
+      break;
+
+    case EDGE_MAP_EDIT:
+      actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::edgeMapEditEventHandler), false);
+      break;
+
+    case NODE_MAP_EDIT:
+      actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::nodeMapEditEventHandler), false);
       break;
 
@@ -211 +219 @@
     case GDK_MOTION_NOTIFY:
       {
-        double world_motion_x, world_motion_y;
         GdkEvent * generated=new GdkEvent();
         generated->motion.x=e->motion.x;
@@ -477 +484 @@
 }
 
+bool GraphDisplayerCanvas::edgeMapEditEventHandler(GdkEvent* e)
+{
+  switch(e->type)
+    {
+    case GDK_BUTTON_PRESS:
+      window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
+      active_item=(get_item_at(clicked_x, clicked_y));
+      active_edge=INVALID;
+      for (EdgeIt i(g); i!=INVALID; ++i)
+        {
+          if(edgesmap[i]==active_item)
+            {
+              active_edge=i;
+            }
+        }
+      if(active_edge!=INVALID)
+        {
+          if(canvasentrywidget)
+            {
+              delete(canvasentrywidget);
+            }
+          entrywidget.show();
+          entrywidget.set_text("Hello!");
+          //      canvasentrywidget=new Gnome::Canvas::Widget(displayed_graph, clicked_x, clicked_y,entrywidget);
+          canvasentrywidget=new Gnome::Canvas::Widget(displayed_graph, e->button.x, e->button.y, entrywidget);
+          canvasentrywidget->property_width().set_value(70);
+          canvasentrywidget->property_height().set_value(50);
+          canvasentrywidget->show();
+          *(edgesmap[active_edge]) << Gnome::Canvas::Properties::fill_color("red");
+        }
+      active_item=NULL;         // !!!!!!!!!!!!!!!!!!!!!!!!!!!
+      active_edge=INVALID;      // !!!!!!!!!!!!!!!!!!!!!!!!!!!
+      break;
+    default:
+      break;
+    }
+  return false;  
+}
+
+bool GraphDisplayerCanvas::nodeMapEditEventHandler(GdkEvent* e)
+{
+  e=e;
+  return false;
+}
+
 void GraphDisplayerCanvas::deleteItem(NodeIt node_to_delete)
 {
@@ -537 +589 @@
 
 }
+

graph_displayer_canvas.cc

@@ -3 +3 @@
 #include <math.h>
 
-GraphDisplayerCanvas::GraphDisplayerCanvas(Graph & gr, CoordinatesMap & cm, MapStorage & ms, MapWin * mw):g(gr),nodesmap(g),edgesmap(g),edgetextmap(g),nodetextmap(g),displayed_graph(*(root()), 0, 0),mapstorage(ms),isbutton(0),active_item(NULL),target_item(NULL),mapwin(mw)
+GraphDisplayerCanvas::GraphDisplayerCanvas(Graph & gr, CoordinatesMap & cm, MapStorage & ms, MapWin * mw):g(gr),nodesmap(g),edgesmap(g),edgetextmap(g),nodetextmap(g),displayed_graph(*(root()), 0, 0),canvasentrywidget(NULL),mapstorage(ms),isbutton(0),active_item(NULL),target_item(NULL),mapwin(mw)
 {
   
@@ -71 +71 @@
 GraphDisplayerCanvas::~GraphDisplayerCanvas()
 {
+  if(canvasentrywidget)
+    {
+      delete(canvasentrywidget);
+    }
 
   //writing out the end state of the graph

graph_displayer_canvas.h

@@ -86 +86 @@
   ///event handler for the case when eraser-tool is active
   bool eraserEventHandler(GdkEvent*);
-  ///event handler for the case when eraser-tool is active
+  ///event handler for the case when edge map editor tool is active
   bool edgeMapEditEventHandler(GdkEvent*);
+  ///event handler for the case when node map editor tool is active
+  bool nodeMapEditEventHandler(GdkEvent*);
 
 public:
@@ -127 +129 @@
   Gnome::Canvas::Group displayed_graph;
 
+  ///Map editor entry
+  Gtk::Entry entrywidget;
+
+  ///GnomeCanvas holder for entry
+  Gnome::Canvas::Widget * canvasentrywidget;
+
   ///Here we store the maps that can be displayed through properties.
   MapStorage mapstorage;

main_win.cc

@@ -46 +46 @@
   ag->add( Gtk::Action::create("MoveItem", Gtk::Stock::CONVERT),
       sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 0) );
+  ag->add( Gtk::Action::create("EditEdgeMap", Gtk::Stock::PROPERTIES),
+      sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 4) );
+  ag->add( Gtk::Action::create("EditNodeMap", Gtk::Stock::PREFERENCES),
+      sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 5) );
 
   uim=Gtk::UIManager::create();
@@ -89 +93 @@
       "    <toolitem action='EraseItem' />"
       "    <toolitem action='MoveItem' />"
+      "    <toolitem action='EditEdgeMap' />"
+      "    <toolitem action='EditNodeMap' />"
       "  </toolbar>"
       "</ui>";