1.1 --- a/gui/broken_edge.cc Wed Jun 29 12:52:20 2005 +0000
1.2 +++ b/gui/broken_edge.cc Wed Jun 29 15:41:33 2005 +0000
1.3 @@ -7,8 +7,8 @@
1.4
1.5 arrow=new Gnome::Canvas::Polygon(g);
1.6 *arrow << Gnome::Canvas::Properties::fill_color("red");
1.7 - arrow->signal_event().connect(sigc::mem_fun(*this, &BrokenEdge::edge_former_event_handler));
1.8 - set_points(p);
1.9 + arrow->signal_event().connect(sigc::mem_fun(*this, &BrokenEdge::edgeFormerEventHandler));
1.10 + setPoints(p);
1.11 }
1.12
1.13 BrokenEdge::~BrokenEdge()
1.14 @@ -16,7 +16,7 @@
1.15 if(arrow)delete(arrow);
1.16 }
1.17
1.18 -void BrokenEdge::set_points(Gnome::Canvas::Points p, bool move)
1.19 +void BrokenEdge::setPoints(Gnome::Canvas::Points p, bool move)
1.20 {
1.21 bool set_arrow=false;
1.22 if(!move)
1.23 @@ -103,24 +103,24 @@
1.24 }
1.25 }
1.26
1.27 -bool BrokenEdge::edge_former_event_handler(GdkEvent* e)
1.28 +bool BrokenEdge::edgeFormerEventHandler(GdkEvent* e)
1.29 {
1.30 switch(e->type)
1.31 {
1.32 case GDK_BUTTON_PRESS:
1.33 //we mark the location of the event to be able to calculate parameters of dragging
1.34 - if(gdc.get_actual_tool()!=CREATE_NODE)
1.35 + if(gdc.getActualTool()!=CREATE_NODE)
1.36 {
1.37 - gdc.toggle_edge_activity(this, true);
1.38 + gdc.toggleEdgeActivity(this, true);
1.39 clicked_x=e->button.x;
1.40 clicked_y=e->button.y;
1.41 isbutton=true;
1.42 }
1.43 break;
1.44 case GDK_BUTTON_RELEASE:
1.45 - if(gdc.get_actual_tool()!=CREATE_NODE)
1.46 + if(gdc.getActualTool()!=CREATE_NODE)
1.47 {
1.48 - gdc.toggle_edge_activity(this, false);
1.49 + gdc.toggleEdgeActivity(this, false);
1.50 isbutton=false;
1.51 }
1.52 break;
1.53 @@ -142,8 +142,8 @@
1.54 points_new.push_back(my_points[1]=Gnome::Art::Point(my_points[1].get_x()+dx,my_points[1].get_y()+dy));
1.55 points_new.push_back(my_points[2]);
1.56
1.57 - set_points(points_new);
1.58 - gdc.text_reposition(xy<double>(my_points[1].get_x(),my_points[1].get_y()));
1.59 + setPoints(points_new);
1.60 + gdc.textReposition(xy<double>(my_points[1].get_x(),my_points[1].get_y()));
1.61
1.62 clicked_x=e->motion.x;
1.63 clicked_y=e->motion.y;
1.64 @@ -155,7 +155,7 @@
1.65 return true;
1.66 }
1.67
1.68 -xy<double> BrokenEdge::get_arrow_pos()
1.69 +xy<double> BrokenEdge::getArrowPos()
1.70 {
1.71 xy<double> ret_val(my_points[1].get_x(),my_points[1].get_y());
1.72 return ret_val;
2.1 --- a/gui/broken_edge.h Wed Jun 29 12:52:20 2005 +0000
2.2 +++ b/gui/broken_edge.h Wed Jun 29 15:41:33 2005 +0000
2.3 @@ -26,12 +26,12 @@
2.4 double clicked_x, clicked_y;
2.5
2.6 ///event handler for forming edges
2.7 - bool edge_former_event_handler(GdkEvent*);
2.8 + bool edgeFormerEventHandler(GdkEvent*);
2.9 public:
2.10 BrokenEdge(Gnome::Canvas::Group &, Gnome::Canvas::Points, GraphDisplayerCanvas &);
2.11 ~BrokenEdge();
2.12 - void set_points(Gnome::Canvas::Points, bool move=false);
2.13 - xy<double> get_arrow_pos();
2.14 + void setPoints(Gnome::Canvas::Points, bool move=false);
2.15 + xy<double> getArrowPos();
2.16 };
2.17
2.18
3.1 --- a/gui/edit_win.cc Wed Jun 29 12:52:20 2005 +0000
3.2 +++ b/gui/edit_win.cc Wed Jun 29 15:41:33 2005 +0000
3.3 @@ -1,7 +1,7 @@
3.4 #include <edit_win.h>
3.5 #include <set>
3.6
3.7 -bool EditWin::close_if_escape_is_pressed(GdkEventKey* e)
3.8 +bool EditWin::closeIfEscapeIsPressed(GdkEventKey* e)
3.9 {
3.10 if(e->keyval==GDK_Escape)
3.11 {
3.12 @@ -15,7 +15,7 @@
3.13 set_title(title);
3.14 set_default_size(200, 50);
3.15 set_keep_above(true);
3.16 - signal_key_press_event().connect(sigc::mem_fun(*this, &EditWin::close_if_escape_is_pressed));
3.17 + signal_key_press_event().connect(sigc::mem_fun(*this, &EditWin::closeIfEscapeIsPressed));
3.18
3.19 //buttons array
3.20 buttons=new Gtk::RadioButton * [TOOL_NUM];
4.1 --- a/gui/edit_win.h Wed Jun 29 12:52:20 2005 +0000
4.2 +++ b/gui/edit_win.h Wed Jun 29 15:41:33 2005 +0000
4.3 @@ -29,7 +29,7 @@
4.4 ///Constructor of EditWin creates the widgets shown in EditWin.
4.5 EditWin(const std::string& title, GraphDisplayerCanvas &);
4.6
4.7 - virtual bool close_if_escape_is_pressed(GdkEventKey*);
4.8 + virtual bool closeIfEscapeIsPressed(GdkEventKey*);
4.9
4.10 ///Callback function in case of button pression.
4.11 ///It changes the actual tool ins editor's hand.
5.1 --- a/gui/graph_displayer_canvas-event.cc Wed Jun 29 12:52:20 2005 +0000
5.2 +++ b/gui/graph_displayer_canvas-event.cc Wed Jun 29 15:41:33 2005 +0000
5.3 @@ -20,7 +20,7 @@
5.4 GdkEvent * generated=new GdkEvent();
5.5 generated->type=GDK_BUTTON_RELEASE;
5.6 generated->button.button=3;
5.7 - create_edge_event_handler(generated);
5.8 + createEdgeEventHandler(generated);
5.9 }
5.10
5.11 actual_tool=newtool;
5.12 @@ -28,20 +28,20 @@
5.13 switch(newtool)
5.14 {
5.15 case MOVE:
5.16 - actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::move_event_handler), false);
5.17 + actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::moveEventHandler), false);
5.18 break;
5.19
5.20 //it has to assigned to canvas, because all the canvas has to be monitored, not only the elements of the already drawn group
5.21 case CREATE_NODE:
5.22 - actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_node_event_handler), false);
5.23 + actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::createNodeEventHandler), false);
5.24 break;
5.25
5.26 case CREATE_EDGE:
5.27 - actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_edge_event_handler), false);
5.28 + actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::createEdgeEventHandler), false);
5.29 break;
5.30
5.31 case ERASER:
5.32 - actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::eraser_event_handler), false);
5.33 + actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::eraserEventHandler), false);
5.34 break;
5.35
5.36 default:
5.37 @@ -49,12 +49,12 @@
5.38 }
5.39 }
5.40
5.41 -int GraphDisplayerCanvas::get_actual_tool()
5.42 +int GraphDisplayerCanvas::getActualTool()
5.43 {
5.44 return actual_tool;
5.45 }
5.46
5.47 -bool GraphDisplayerCanvas::move_event_handler(GdkEvent* e)
5.48 +bool GraphDisplayerCanvas::moveEventHandler(GdkEvent* e)
5.49 {
5.50 switch(e->type)
5.51 {
5.52 @@ -124,15 +124,15 @@
5.53
5.54 if(isbutton==3)
5.55 {
5.56 - edgesmap[ei]->set_points(coos);
5.57 + edgesmap[ei]->setPoints(coos);
5.58 }
5.59 else
5.60 {
5.61 - edgesmap[ei]->set_points(coos,true);
5.62 + edgesmap[ei]->setPoints(coos,true);
5.63 }
5.64
5.65 //reposition of edgetext
5.66 - xy<double> text_pos=edgesmap[ei]->get_arrow_pos();
5.67 + xy<double> text_pos=edgesmap[ei]->getArrowPos();
5.68 text_pos+=(xy<double>(10,10));
5.69 edgetextmap[ei]->property_x().set_value(text_pos.x);
5.70 edgetextmap[ei]->property_y().set_value(text_pos.y);
5.71 @@ -152,14 +152,14 @@
5.72
5.73 if(isbutton==3)
5.74 {
5.75 - edgesmap[ei]->set_points(coos);
5.76 + edgesmap[ei]->setPoints(coos);
5.77 }
5.78 else
5.79 {
5.80 - edgesmap[ei]->set_points(coos,true);
5.81 + edgesmap[ei]->setPoints(coos,true);
5.82 }
5.83
5.84 - xy<double> text_pos=edgesmap[ei]->get_arrow_pos();
5.85 + xy<double> text_pos=edgesmap[ei]->getArrowPos();
5.86 text_pos+=(xy<double>(10,10));
5.87 edgetextmap[ei]->property_x().set_value(text_pos.x);
5.88 edgetextmap[ei]->property_y().set_value(text_pos.y);
5.89 @@ -171,7 +171,7 @@
5.90 return true;
5.91 }
5.92
5.93 -bool GraphDisplayerCanvas::create_node_event_handler(GdkEvent* e)
5.94 +bool GraphDisplayerCanvas::createNodeEventHandler(GdkEvent* e)
5.95 {
5.96 switch(e->type)
5.97 {
5.98 @@ -196,7 +196,7 @@
5.99 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, "");
5.100 nodetextmap[active_node]->property_fill_color().set_value("darkblue");
5.101
5.102 - mapwin->update_node(active_node);
5.103 + mapwin->updateNode(active_node);
5.104
5.105 break;
5.106
5.107 @@ -209,7 +209,7 @@
5.108 generated->motion.x=world_motion_x;
5.109 generated->motion.y=world_motion_y;
5.110 generated->type=GDK_MOTION_NOTIFY;
5.111 - move_event_handler(generated);
5.112 + moveEventHandler(generated);
5.113 break;
5.114 }
5.115
5.116 @@ -227,7 +227,7 @@
5.117 return false;
5.118 }
5.119
5.120 -bool GraphDisplayerCanvas::create_edge_event_handler(GdkEvent* e)
5.121 +bool GraphDisplayerCanvas::createEdgeEventHandler(GdkEvent* e)
5.122 {
5.123 switch(e->type)
5.124 {
5.125 @@ -289,7 +289,7 @@
5.126 active_edge=EdgeIt(g,g.addEdge(active_node, target_node));
5.127
5.128 //initiating values corresponding to new edge in maps
5.129 - mapstorage.init_maps_for_edge(active_edge);
5.130 + mapstorage.initMapsForEdge(active_edge);
5.131
5.132 //calculating coordinates of new edge
5.133 Gnome::Canvas::Points coos;
5.134 @@ -311,14 +311,14 @@
5.135 active_item->raise_to_top();
5.136
5.137 //initializing edge-text as well, to empty string
5.138 - xy<double> text_pos=edgesmap[active_edge]->get_arrow_pos();
5.139 + xy<double> text_pos=edgesmap[active_edge]->getArrowPos();
5.140 text_pos+=(xy<double>(10,10));
5.141
5.142 edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
5.143 edgetextmap[active_edge]->property_fill_color().set_value("darkgreen");
5.144
5.145 //updating its properties
5.146 - mapwin->update_edge(active_edge);
5.147 + mapwin->updateEdge(active_edge);
5.148 }
5.149 else
5.150 {
5.151 @@ -361,7 +361,7 @@
5.152 return false;
5.153 }
5.154
5.155 -bool GraphDisplayerCanvas::eraser_event_handler(GdkEvent* e)
5.156 +bool GraphDisplayerCanvas::eraserEventHandler(GdkEvent* e)
5.157 {
5.158 switch(e->type)
5.159 {
5.160 @@ -414,14 +414,14 @@
5.161 //deleting collected edges
5.162 for(std::set<Graph::Edge>::iterator edge_set_it=edges_to_delete.begin();edge_set_it!=edges_to_delete.end();edge_set_it++)
5.163 {
5.164 - delete_item(*edge_set_it);
5.165 + deleteItem(*edge_set_it);
5.166 }
5.167 - delete_item(active_node);
5.168 + deleteItem(active_node);
5.169 }
5.170 //a simple edge was chosen
5.171 else
5.172 {
5.173 - delete_item(active_edge);
5.174 + deleteItem(active_edge);
5.175 }
5.176
5.177
5.178 @@ -453,35 +453,35 @@
5.179 return true;
5.180 }
5.181
5.182 -void GraphDisplayerCanvas::delete_item(NodeIt node_to_delete)
5.183 +void GraphDisplayerCanvas::deleteItem(NodeIt node_to_delete)
5.184 {
5.185 delete(nodetextmap[node_to_delete]);
5.186 delete(nodesmap[node_to_delete]);
5.187 g.erase(node_to_delete);
5.188 }
5.189
5.190 -void GraphDisplayerCanvas::delete_item(EdgeIt edge_to_delete)
5.191 +void GraphDisplayerCanvas::deleteItem(EdgeIt edge_to_delete)
5.192 {
5.193 delete(edgetextmap[edge_to_delete]);
5.194 delete(edgesmap[edge_to_delete]);
5.195 g.erase(edge_to_delete);
5.196 }
5.197
5.198 -void GraphDisplayerCanvas::delete_item(Graph::Edge edge_to_delete)
5.199 +void GraphDisplayerCanvas::deleteItem(Graph::Edge edge_to_delete)
5.200 {
5.201 delete(edgetextmap[edge_to_delete]);
5.202 delete(edgesmap[edge_to_delete]);
5.203 g.erase(edge_to_delete);
5.204 }
5.205
5.206 -void GraphDisplayerCanvas::text_reposition(xy<double> new_place)
5.207 +void GraphDisplayerCanvas::textReposition(xy<double> new_place)
5.208 {
5.209 new_place+=(xy<double>(10,10));
5.210 edgetextmap[active_edge]->property_x().set_value(new_place.x);
5.211 edgetextmap[active_edge]->property_y().set_value(new_place.y);
5.212 }
5.213
5.214 -void GraphDisplayerCanvas::toggle_edge_activity(BrokenEdge* active_bre, bool on)
5.215 +void GraphDisplayerCanvas::toggleEdgeActivity(BrokenEdge* active_bre, bool on)
5.216 {
5.217 if(on)
5.218 {
6.1 --- a/gui/graph_displayer_canvas.cc Wed Jun 29 12:52:20 2005 +0000
6.2 +++ b/gui/graph_displayer_canvas.cc Wed Jun 29 15:41:33 2005 +0000
6.3 @@ -5,7 +5,7 @@
6.4 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)
6.5 {
6.6
6.7 - actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_node_event_handler), false);
6.8 + actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::createNodeEventHandler), false);
6.9 actual_tool=CREATE_NODE;
6.10
6.11 active_node=INVALID;
6.12 @@ -30,7 +30,7 @@
6.13
6.14 //initializing edge-text as well, to empty string
6.15
6.16 - xy<double> text_pos=edgesmap[i]->get_arrow_pos();
6.17 + xy<double> text_pos=edgesmap[i]->getArrowPos();
6.18 text_pos+=(xy<double>(10,10));
6.19
6.20 edgetextmap[i]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
7.1 --- a/gui/graph_displayer_canvas.h Wed Jun 29 12:52:20 2005 +0000
7.2 +++ b/gui/graph_displayer_canvas.h Wed Jun 29 15:41:33 2005 +0000
7.3 @@ -70,7 +70,7 @@
7.4 ///reaction of any action happened in the territory
7.5 ///of the canvas
7.6 ///DEPRECATED!!!!
7.7 - bool event_handler(GdkEvent* e, Node n);
7.8 + bool eventHandler(GdkEvent* e, Node n);
7.9
7.10 ///actual event handler
7.11 ///
7.12 @@ -78,38 +78,38 @@
7.13 sigc::connection actual_handler;
7.14
7.15 ///event handler for the case when move-tool is active
7.16 - bool move_event_handler(GdkEvent*);
7.17 + bool moveEventHandler(GdkEvent*);
7.18 ///event handler for the case when create_node-tool is active
7.19 - bool create_node_event_handler(GdkEvent*);
7.20 + bool createNodeEventHandler(GdkEvent*);
7.21 ///event handler for the case when create_edge-tool is active
7.22 - bool create_edge_event_handler(GdkEvent*);
7.23 + bool createEdgeEventHandler(GdkEvent*);
7.24 ///event handler for the case when eraser-tool is active
7.25 - bool eraser_event_handler(GdkEvent*);
7.26 + bool eraserEventHandler(GdkEvent*);
7.27 ///event handler for the case when eraser-tool is active
7.28 - bool edge_map_edit_event_handler(GdkEvent*);
7.29 + bool edgeMapEditEventHandler(GdkEvent*);
7.30
7.31 public:
7.32 ///Moves the text to new place
7.33 - void text_reposition(xy<double>);
7.34 + void textReposition(xy<double>);
7.35 ///Activates an edge belonging to a BrokenEdge
7.36 - void toggle_edge_activity(BrokenEdge*, bool);
7.37 + void toggleEdgeActivity(BrokenEdge*, bool);
7.38
7.39 public:
7.40 ///\return the actual tool in hand
7.41 - int get_actual_tool();
7.42 + int getActualTool();
7.43
7.44 private:
7.45 ///Deletes the given element.
7.46 - void delete_item(NodeIt);
7.47 + void deleteItem(NodeIt);
7.48 ///Deletes the given element.
7.49 - void delete_item(EdgeIt);
7.50 + void deleteItem(EdgeIt);
7.51 ///Deletes the given element.
7.52 - void delete_item(Graph::Edge);
7.53 + void deleteItem(Graph::Edge);
7.54
7.55 private:
7.56
7.57 ///The graph, on which we work
7.58 - Graph g;
7.59 + Graph & g;
7.60
7.61 ///Map of nodes of graph
7.62 Graph::NodeMap<Gnome::Canvas::Ellipse *> nodesmap;
8.1 --- a/gui/map_win.cc Wed Jun 29 12:52:20 2005 +0000
8.2 +++ b/gui/map_win.cc Wed Jun 29 15:41:33 2005 +0000
8.3 @@ -1,7 +1,7 @@
8.4 #include <map_win.h>
8.5 #include <set>
8.6
8.7 -bool MapWin::close_if_escape_is_pressed(GdkEventKey* e)
8.8 +bool MapWin::closeIfEscapeIsPressed(GdkEventKey* e)
8.9 {
8.10 if(e->keyval==GDK_Escape)
8.11 {
8.12 @@ -15,7 +15,7 @@
8.13 set_title(title);
8.14 set_default_size(200, 50);
8.15
8.16 - signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::close_if_escape_is_pressed));
8.17 + signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::closeIfEscapeIsPressed));
8.18
8.19 e_combo_array=new Gtk::Combo [EDGE_PROPERTY_NUM];
8.20
8.21 @@ -74,7 +74,7 @@
8.22 (
8.23 sigc::bind
8.24 (
8.25 - sigc::mem_fun(*this, &MapWin::e_combo_changed),
8.26 + sigc::mem_fun(*this, &MapWin::eComboChanged),
8.27 i
8.28 )
8.29 );
8.30 @@ -153,7 +153,7 @@
8.31 (
8.32 sigc::bind
8.33 (
8.34 - sigc::mem_fun(*this, &MapWin::n_combo_changed),
8.35 + sigc::mem_fun(*this, &MapWin::nComboChanged),
8.36 i
8.37 )
8.38 );
8.39 @@ -179,7 +179,7 @@
8.40
8.41 }
8.42
8.43 -void MapWin::e_combo_changed(int prop)
8.44 +void MapWin::eComboChanged(int prop)
8.45 {
8.46 Gtk::Entry* entry = e_combo_array[prop].get_entry();
8.47
8.48 @@ -214,7 +214,7 @@
8.49 }
8.50 };
8.51
8.52 -void MapWin::n_combo_changed(int prop)
8.53 +void MapWin::nComboChanged(int prop)
8.54 {
8.55
8.56 Gtk::Entry* entry = n_combo_array[prop].get_entry();
8.57 @@ -250,7 +250,7 @@
8.58 }
8.59 };
8.60
8.61 -void MapWin::update_node(Graph::Node node)
8.62 +void MapWin::updateNode(Graph::Node node)
8.63 {
8.64 for(int i=0;i<NODE_PROPERTY_NUM;i++)
8.65 {
8.66 @@ -289,7 +289,7 @@
8.67 }
8.68 }
8.69
8.70 -void MapWin::update_edge(Graph::Edge edge)
8.71 +void MapWin::updateEdge(Graph::Edge edge)
8.72 {
8.73 for(int i=0;i<EDGE_PROPERTY_NUM;i++)
8.74 {
9.1 --- a/gui/map_win.h Wed Jun 29 12:52:20 2005 +0000
9.2 +++ b/gui/map_win.h Wed Jun 29 15:41:33 2005 +0000
9.3 @@ -42,20 +42,20 @@
9.4 ///which button was that and after that calls the
9.5 ///appropriate function of the \ref GraphDisplayerCanvas
9.6 ///to change the visible values of that attribute.
9.7 - virtual void e_combo_changed(int);
9.8 + virtual void eComboChanged(int);
9.9 ///If a radiobutton is clicked, this function determines
9.10 ///which button was that and after that calls the
9.11 ///appropriate function of the \ref GraphDisplayerCanvas
9.12 ///to change the visible values of that attribute.
9.13 - virtual void n_combo_changed(int);
9.14 + virtual void nComboChanged(int);
9.15
9.16 ///This function is created to set the appropriate maps on the newly created node
9.17 - void update_node(Graph::Node);
9.18 + void updateNode(Graph::Node);
9.19
9.20 ///This function is created to set the appropriate maps on the newly created edge
9.21 - void update_edge(Graph::Edge);
9.22 + void updateEdge(Graph::Edge);
9.23
9.24 - virtual bool close_if_escape_is_pressed(GdkEventKey*);
9.25 + virtual bool closeIfEscapeIsPressed(GdkEventKey*);
9.26 };
9.27
9.28 #endif //MAP_WIN_H
10.1 --- a/gui/mapstorage.cc Wed Jun 29 12:52:20 2005 +0000
10.2 +++ b/gui/mapstorage.cc Wed Jun 29 15:41:33 2005 +0000
10.3 @@ -100,7 +100,7 @@
10.4 return min;
10.5 }
10.6
10.7 -void MapStorage::init_maps_for_edge(Graph::Edge e)
10.8 +void MapStorage::initMapsForEdge(Graph::Edge e)
10.9 {
10.10 e=e;
10.11 // beragad, aztan csovez
11.1 --- a/gui/mapstorage.h Wed Jun 29 12:52:20 2005 +0000
11.2 +++ b/gui/mapstorage.h Wed Jun 29 15:41:33 2005 +0000
11.3 @@ -82,10 +82,10 @@
11.4 std::map< std::string,Graph::EdgeMap<double> * >::iterator beginOfEdgeMaps(){return edgemap_storage.begin();};
11.5
11.6 ///This function sets a default base value for the newly created node
11.7 - void init_maps_for_node(NodeIt);
11.8 + void initMapsForNode(NodeIt);
11.9
11.10 ///This function sets a default base value for the newly created node
11.11 - void init_maps_for_edge(Graph::Edge);
11.12 + void initMapsForEdge(Graph::Edge);
11.13 };
11.14
11.15 #endif //MAPSTORAGE_H