diff -r 8db44e105187 -r f70bbee5350a broken_edge.cc --- a/broken_edge.cc Wed Jun 29 12:52:20 2005 +0000 +++ b/broken_edge.cc Wed Jun 29 15:41:33 2005 +0000 @@ -7,8 +7,8 @@ arrow=new Gnome::Canvas::Polygon(g); *arrow << Gnome::Canvas::Properties::fill_color("red"); - arrow->signal_event().connect(sigc::mem_fun(*this, &BrokenEdge::edge_former_event_handler)); - set_points(p); + arrow->signal_event().connect(sigc::mem_fun(*this, &BrokenEdge::edgeFormerEventHandler)); + setPoints(p); } BrokenEdge::~BrokenEdge() @@ -16,7 +16,7 @@ if(arrow)delete(arrow); } -void BrokenEdge::set_points(Gnome::Canvas::Points p, bool move) +void BrokenEdge::setPoints(Gnome::Canvas::Points p, bool move) { bool set_arrow=false; if(!move) @@ -103,24 +103,24 @@ } } -bool BrokenEdge::edge_former_event_handler(GdkEvent* e) +bool BrokenEdge::edgeFormerEventHandler(GdkEvent* e) { switch(e->type) { case GDK_BUTTON_PRESS: //we mark the location of the event to be able to calculate parameters of dragging - if(gdc.get_actual_tool()!=CREATE_NODE) + if(gdc.getActualTool()!=CREATE_NODE) { - gdc.toggle_edge_activity(this, true); + gdc.toggleEdgeActivity(this, true); clicked_x=e->button.x; clicked_y=e->button.y; isbutton=true; } break; case GDK_BUTTON_RELEASE: - if(gdc.get_actual_tool()!=CREATE_NODE) + if(gdc.getActualTool()!=CREATE_NODE) { - gdc.toggle_edge_activity(this, false); + gdc.toggleEdgeActivity(this, false); isbutton=false; } break; @@ -142,8 +142,8 @@ points_new.push_back(my_points[1]=Gnome::Art::Point(my_points[1].get_x()+dx,my_points[1].get_y()+dy)); points_new.push_back(my_points[2]); - set_points(points_new); - gdc.text_reposition(xy(my_points[1].get_x(),my_points[1].get_y())); + setPoints(points_new); + gdc.textReposition(xy(my_points[1].get_x(),my_points[1].get_y())); clicked_x=e->motion.x; clicked_y=e->motion.y; @@ -155,7 +155,7 @@ return true; } -xy BrokenEdge::get_arrow_pos() +xy BrokenEdge::getArrowPos() { xy ret_val(my_points[1].get_x(),my_points[1].get_y()); return ret_val;