[Lemon-commits] [lemon_svn] hegyi: r2047 - hugo/trunk/gui

[Lemon SVN]

Author: hegyi
Date: Tue Jul 12 23:45:39 2005
New Revision: 2047

Modified:
   hugo/trunk/gui/graph_displayer_canvas-event.cc

Log:
Developing of edgemap editing is started.

Modified: hugo/trunk/gui/graph_displayer_canvas-event.cc
==============================================================================
--- hugo/trunk/gui/graph_displayer_canvas-event.cc	(original)
+++ hugo/trunk/gui/graph_displayer_canvas-event.cc	Tue Jul 12 23:45:39 2005
@@ -25,6 +25,11 @@
 
   actual_tool=newtool;
 
+  active_item=NULL; 
+  target_item=NULL; 
+  active_edge=INVALID;	
+  active_node=INVALID;	
+
   switch(newtool)
     {
     case MOVE:
@@ -498,23 +503,23 @@
 	      active_edge=i;
 	    }
 	}
-      if(active_edge!=INVALID)
+      if((active_edge!=INVALID)&&(edgetextmap[active_edge]->property_text().get_value()!=""))
 	{
 	  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");
+	  entrywidget.set_text(edgetextmap[active_edge]->property_text().get_value());
+	  xy<double> entry_coos;
+	  entry_coos.x=(edgetextmap[active_edge])->property_x().get_value();
+	  entry_coos.x-=edgetextmap[active_edge]->property_text_width().get_value()/2;
+	  entry_coos.y=(edgetextmap[active_edge])->property_y().get_value();
+	  entry_coos.y-=edgetextmap[active_edge]->property_text_height().get_value()*1.5/2;
+	  canvasentrywidget=new Gnome::Canvas::Widget(displayed_graph, entry_coos.x, entry_coos.y, entrywidget);
+	  canvasentrywidget->property_width().set_value(edgetextmap[active_edge]->property_text_width().get_value()*1.5);
+	  canvasentrywidget->property_height().set_value(edgetextmap[active_edge]->property_text_height().get_value()*1.5);
 	}
-      active_item=NULL;		// !!!!!!!!!!!!!!!!!!!!!!!!!!!
-      active_edge=INVALID;	// !!!!!!!!!!!!!!!!!!!!!!!!!!!
       break;
     default:
       break;