# HG changeset patch # User hegyi # Date 1121204739 0 # Node ID 8dc87bc15ec590393eb50c6c3c3f0ae79ee8645c # Parent 1f45545f124c6bd9c8f9ca4105edea2ecea4b028 Developing of edgemap editing is started. diff -r 1f45545f124c -r 8dc87bc15ec5 graph_displayer_canvas-event.cc --- a/graph_displayer_canvas-event.cc Tue Jul 12 18:21:49 2005 +0000 +++ b/graph_displayer_canvas-event.cc Tue Jul 12 21:45:39 2005 +0000 @@ -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 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;