diff -r 8db44e105187 -r f70bbee5350a graph_displayer_canvas-event.cc --- a/graph_displayer_canvas-event.cc Wed Jun 29 12:52:20 2005 +0000 +++ b/graph_displayer_canvas-event.cc Wed Jun 29 15:41:33 2005 +0000 @@ -20,7 +20,7 @@ GdkEvent * generated=new GdkEvent(); generated->type=GDK_BUTTON_RELEASE; generated->button.button=3; - create_edge_event_handler(generated); + createEdgeEventHandler(generated); } actual_tool=newtool; @@ -28,20 +28,20 @@ switch(newtool) { case MOVE: - actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::move_event_handler), false); + actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::moveEventHandler), false); break; //it has to assigned to canvas, because all the canvas has to be monitored, not only the elements of the already drawn group case CREATE_NODE: - actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_node_event_handler), false); + actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::createNodeEventHandler), false); break; case CREATE_EDGE: - actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_edge_event_handler), false); + actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::createEdgeEventHandler), false); break; case ERASER: - actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::eraser_event_handler), false); + actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::eraserEventHandler), false); break; default: @@ -49,12 +49,12 @@ } } -int GraphDisplayerCanvas::get_actual_tool() +int GraphDisplayerCanvas::getActualTool() { return actual_tool; } -bool GraphDisplayerCanvas::move_event_handler(GdkEvent* e) +bool GraphDisplayerCanvas::moveEventHandler(GdkEvent* e) { switch(e->type) { @@ -124,15 +124,15 @@ if(isbutton==3) { - edgesmap[ei]->set_points(coos); + edgesmap[ei]->setPoints(coos); } else { - edgesmap[ei]->set_points(coos,true); + edgesmap[ei]->setPoints(coos,true); } //reposition of edgetext - xy text_pos=edgesmap[ei]->get_arrow_pos(); + xy text_pos=edgesmap[ei]->getArrowPos(); text_pos+=(xy(10,10)); edgetextmap[ei]->property_x().set_value(text_pos.x); edgetextmap[ei]->property_y().set_value(text_pos.y); @@ -152,14 +152,14 @@ if(isbutton==3) { - edgesmap[ei]->set_points(coos); + edgesmap[ei]->setPoints(coos); } else { - edgesmap[ei]->set_points(coos,true); + edgesmap[ei]->setPoints(coos,true); } - xy text_pos=edgesmap[ei]->get_arrow_pos(); + xy text_pos=edgesmap[ei]->getArrowPos(); text_pos+=(xy(10,10)); edgetextmap[ei]->property_x().set_value(text_pos.x); edgetextmap[ei]->property_y().set_value(text_pos.y); @@ -171,7 +171,7 @@ return true; } -bool GraphDisplayerCanvas::create_node_event_handler(GdkEvent* e) +bool GraphDisplayerCanvas::createNodeEventHandler(GdkEvent* e) { switch(e->type) { @@ -196,7 +196,7 @@ nodetextmap[active_node]=new Gnome::Canvas::Text(displayed_graph, clicked_x+node_property_defaults[N_RADIUS]+5, clicked_y+node_property_defaults[N_RADIUS]+5, ""); nodetextmap[active_node]->property_fill_color().set_value("darkblue"); - mapwin->update_node(active_node); + mapwin->updateNode(active_node); break; @@ -209,7 +209,7 @@ generated->motion.x=world_motion_x; generated->motion.y=world_motion_y; generated->type=GDK_MOTION_NOTIFY; - move_event_handler(generated); + moveEventHandler(generated); break; } @@ -227,7 +227,7 @@ return false; } -bool GraphDisplayerCanvas::create_edge_event_handler(GdkEvent* e) +bool GraphDisplayerCanvas::createEdgeEventHandler(GdkEvent* e) { switch(e->type) { @@ -289,7 +289,7 @@ active_edge=EdgeIt(g,g.addEdge(active_node, target_node)); //initiating values corresponding to new edge in maps - mapstorage.init_maps_for_edge(active_edge); + mapstorage.initMapsForEdge(active_edge); //calculating coordinates of new edge Gnome::Canvas::Points coos; @@ -311,14 +311,14 @@ active_item->raise_to_top(); //initializing edge-text as well, to empty string - xy text_pos=edgesmap[active_edge]->get_arrow_pos(); + xy text_pos=edgesmap[active_edge]->getArrowPos(); text_pos+=(xy(10,10)); edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, ""); edgetextmap[active_edge]->property_fill_color().set_value("darkgreen"); //updating its properties - mapwin->update_edge(active_edge); + mapwin->updateEdge(active_edge); } else { @@ -361,7 +361,7 @@ return false; } -bool GraphDisplayerCanvas::eraser_event_handler(GdkEvent* e) +bool GraphDisplayerCanvas::eraserEventHandler(GdkEvent* e) { switch(e->type) { @@ -414,14 +414,14 @@ //deleting collected edges for(std::set::iterator edge_set_it=edges_to_delete.begin();edge_set_it!=edges_to_delete.end();edge_set_it++) { - delete_item(*edge_set_it); + deleteItem(*edge_set_it); } - delete_item(active_node); + deleteItem(active_node); } //a simple edge was chosen else { - delete_item(active_edge); + deleteItem(active_edge); } @@ -453,35 +453,35 @@ return true; } -void GraphDisplayerCanvas::delete_item(NodeIt node_to_delete) +void GraphDisplayerCanvas::deleteItem(NodeIt node_to_delete) { delete(nodetextmap[node_to_delete]); delete(nodesmap[node_to_delete]); g.erase(node_to_delete); } -void GraphDisplayerCanvas::delete_item(EdgeIt edge_to_delete) +void GraphDisplayerCanvas::deleteItem(EdgeIt edge_to_delete) { delete(edgetextmap[edge_to_delete]); delete(edgesmap[edge_to_delete]); g.erase(edge_to_delete); } -void GraphDisplayerCanvas::delete_item(Graph::Edge edge_to_delete) +void GraphDisplayerCanvas::deleteItem(Graph::Edge edge_to_delete) { delete(edgetextmap[edge_to_delete]); delete(edgesmap[edge_to_delete]); g.erase(edge_to_delete); } -void GraphDisplayerCanvas::text_reposition(xy new_place) +void GraphDisplayerCanvas::textReposition(xy new_place) { new_place+=(xy(10,10)); edgetextmap[active_edge]->property_x().set_value(new_place.x); edgetextmap[active_edge]->property_y().set_value(new_place.y); } -void GraphDisplayerCanvas::toggle_edge_activity(BrokenEdge* active_bre, bool on) +void GraphDisplayerCanvas::toggleEdgeActivity(BrokenEdge* active_bre, bool on) { if(on) {