[Lemon-commits] [lemon_svn] hegyi: r2010 - hugo/trunk/gui
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:49:29 CET 2006
Author: hegyi
Date: Wed Jun 29 17:41:33 2005
New Revision: 2010
Modified:
hugo/trunk/gui/broken_edge.cc
hugo/trunk/gui/broken_edge.h
hugo/trunk/gui/edit_win.cc
hugo/trunk/gui/edit_win.h
hugo/trunk/gui/graph_displayer_canvas-event.cc
hugo/trunk/gui/graph_displayer_canvas.cc
hugo/trunk/gui/graph_displayer_canvas.h
hugo/trunk/gui/map_win.cc
hugo/trunk/gui/map_win.h
hugo/trunk/gui/mapstorage.cc
hugo/trunk/gui/mapstorage.h
Log:
Function names are corrected according to naming conventions.
Modified: hugo/trunk/gui/broken_edge.cc
==============================================================================
--- hugo/trunk/gui/broken_edge.cc (original)
+++ hugo/trunk/gui/broken_edge.cc Wed Jun 29 17:41:33 2005
@@ -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<double>(my_points[1].get_x(),my_points[1].get_y()));
+ setPoints(points_new);
+ gdc.textReposition(xy<double>(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<double> BrokenEdge::get_arrow_pos()
+xy<double> BrokenEdge::getArrowPos()
{
xy<double> ret_val(my_points[1].get_x(),my_points[1].get_y());
return ret_val;
Modified: hugo/trunk/gui/broken_edge.h
==============================================================================
--- hugo/trunk/gui/broken_edge.h (original)
+++ hugo/trunk/gui/broken_edge.h Wed Jun 29 17:41:33 2005
@@ -26,12 +26,12 @@
double clicked_x, clicked_y;
///event handler for forming edges
- bool edge_former_event_handler(GdkEvent*);
+ bool edgeFormerEventHandler(GdkEvent*);
public:
BrokenEdge(Gnome::Canvas::Group &, Gnome::Canvas::Points, GraphDisplayerCanvas &);
~BrokenEdge();
- void set_points(Gnome::Canvas::Points, bool move=false);
- xy<double> get_arrow_pos();
+ void setPoints(Gnome::Canvas::Points, bool move=false);
+ xy<double> getArrowPos();
};
Modified: hugo/trunk/gui/edit_win.cc
==============================================================================
--- hugo/trunk/gui/edit_win.cc (original)
+++ hugo/trunk/gui/edit_win.cc Wed Jun 29 17:41:33 2005
@@ -1,7 +1,7 @@
#include <edit_win.h>
#include <set>
-bool EditWin::close_if_escape_is_pressed(GdkEventKey* e)
+bool EditWin::closeIfEscapeIsPressed(GdkEventKey* e)
{
if(e->keyval==GDK_Escape)
{
@@ -15,7 +15,7 @@
set_title(title);
set_default_size(200, 50);
set_keep_above(true);
- signal_key_press_event().connect(sigc::mem_fun(*this, &EditWin::close_if_escape_is_pressed));
+ signal_key_press_event().connect(sigc::mem_fun(*this, &EditWin::closeIfEscapeIsPressed));
//buttons array
buttons=new Gtk::RadioButton * [TOOL_NUM];
Modified: hugo/trunk/gui/edit_win.h
==============================================================================
--- hugo/trunk/gui/edit_win.h (original)
+++ hugo/trunk/gui/edit_win.h Wed Jun 29 17:41:33 2005
@@ -29,7 +29,7 @@
///Constructor of EditWin creates the widgets shown in EditWin.
EditWin(const std::string& title, GraphDisplayerCanvas &);
- virtual bool close_if_escape_is_pressed(GdkEventKey*);
+ virtual bool closeIfEscapeIsPressed(GdkEventKey*);
///Callback function in case of button pression.
///It changes the actual tool ins editor's hand.
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 Wed Jun 29 17:41:33 2005
@@ -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<double> text_pos=edgesmap[ei]->get_arrow_pos();
+ xy<double> text_pos=edgesmap[ei]->getArrowPos();
text_pos+=(xy<double>(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<double> text_pos=edgesmap[ei]->get_arrow_pos();
+ xy<double> text_pos=edgesmap[ei]->getArrowPos();
text_pos+=(xy<double>(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<double> text_pos=edgesmap[active_edge]->get_arrow_pos();
+ xy<double> text_pos=edgesmap[active_edge]->getArrowPos();
text_pos+=(xy<double>(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<Graph::Edge>::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<double> new_place)
+void GraphDisplayerCanvas::textReposition(xy<double> new_place)
{
new_place+=(xy<double>(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)
{
Modified: hugo/trunk/gui/graph_displayer_canvas.cc
==============================================================================
--- hugo/trunk/gui/graph_displayer_canvas.cc (original)
+++ hugo/trunk/gui/graph_displayer_canvas.cc Wed Jun 29 17:41:33 2005
@@ -5,7 +5,7 @@
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)
{
- 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);
actual_tool=CREATE_NODE;
active_node=INVALID;
@@ -30,7 +30,7 @@
//initializing edge-text as well, to empty string
- xy<double> text_pos=edgesmap[i]->get_arrow_pos();
+ xy<double> text_pos=edgesmap[i]->getArrowPos();
text_pos+=(xy<double>(10,10));
edgetextmap[i]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
Modified: hugo/trunk/gui/graph_displayer_canvas.h
==============================================================================
--- hugo/trunk/gui/graph_displayer_canvas.h (original)
+++ hugo/trunk/gui/graph_displayer_canvas.h Wed Jun 29 17:41:33 2005
@@ -70,7 +70,7 @@
///reaction of any action happened in the territory
///of the canvas
///DEPRECATED!!!!
- bool event_handler(GdkEvent* e, Node n);
+ bool eventHandler(GdkEvent* e, Node n);
///actual event handler
///
@@ -78,38 +78,38 @@
sigc::connection actual_handler;
///event handler for the case when move-tool is active
- bool move_event_handler(GdkEvent*);
+ bool moveEventHandler(GdkEvent*);
///event handler for the case when create_node-tool is active
- bool create_node_event_handler(GdkEvent*);
+ bool createNodeEventHandler(GdkEvent*);
///event handler for the case when create_edge-tool is active
- bool create_edge_event_handler(GdkEvent*);
+ bool createEdgeEventHandler(GdkEvent*);
///event handler for the case when eraser-tool is active
- bool eraser_event_handler(GdkEvent*);
+ bool eraserEventHandler(GdkEvent*);
///event handler for the case when eraser-tool is active
- bool edge_map_edit_event_handler(GdkEvent*);
+ bool edgeMapEditEventHandler(GdkEvent*);
public:
///Moves the text to new place
- void text_reposition(xy<double>);
+ void textReposition(xy<double>);
///Activates an edge belonging to a BrokenEdge
- void toggle_edge_activity(BrokenEdge*, bool);
+ void toggleEdgeActivity(BrokenEdge*, bool);
public:
///\return the actual tool in hand
- int get_actual_tool();
+ int getActualTool();
private:
///Deletes the given element.
- void delete_item(NodeIt);
+ void deleteItem(NodeIt);
///Deletes the given element.
- void delete_item(EdgeIt);
+ void deleteItem(EdgeIt);
///Deletes the given element.
- void delete_item(Graph::Edge);
+ void deleteItem(Graph::Edge);
private:
///The graph, on which we work
- Graph g;
+ Graph & g;
///Map of nodes of graph
Graph::NodeMap<Gnome::Canvas::Ellipse *> nodesmap;
Modified: hugo/trunk/gui/map_win.cc
==============================================================================
--- hugo/trunk/gui/map_win.cc (original)
+++ hugo/trunk/gui/map_win.cc Wed Jun 29 17:41:33 2005
@@ -1,7 +1,7 @@
#include <map_win.h>
#include <set>
-bool MapWin::close_if_escape_is_pressed(GdkEventKey* e)
+bool MapWin::closeIfEscapeIsPressed(GdkEventKey* e)
{
if(e->keyval==GDK_Escape)
{
@@ -15,7 +15,7 @@
set_title(title);
set_default_size(200, 50);
- signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::close_if_escape_is_pressed));
+ signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::closeIfEscapeIsPressed));
e_combo_array=new Gtk::Combo [EDGE_PROPERTY_NUM];
@@ -74,7 +74,7 @@
(
sigc::bind
(
- sigc::mem_fun(*this, &MapWin::e_combo_changed),
+ sigc::mem_fun(*this, &MapWin::eComboChanged),
i
)
);
@@ -153,7 +153,7 @@
(
sigc::bind
(
- sigc::mem_fun(*this, &MapWin::n_combo_changed),
+ sigc::mem_fun(*this, &MapWin::nComboChanged),
i
)
);
@@ -179,7 +179,7 @@
}
-void MapWin::e_combo_changed(int prop)
+void MapWin::eComboChanged(int prop)
{
Gtk::Entry* entry = e_combo_array[prop].get_entry();
@@ -214,7 +214,7 @@
}
};
-void MapWin::n_combo_changed(int prop)
+void MapWin::nComboChanged(int prop)
{
Gtk::Entry* entry = n_combo_array[prop].get_entry();
@@ -250,7 +250,7 @@
}
};
-void MapWin::update_node(Graph::Node node)
+void MapWin::updateNode(Graph::Node node)
{
for(int i=0;i<NODE_PROPERTY_NUM;i++)
{
@@ -289,7 +289,7 @@
}
}
-void MapWin::update_edge(Graph::Edge edge)
+void MapWin::updateEdge(Graph::Edge edge)
{
for(int i=0;i<EDGE_PROPERTY_NUM;i++)
{
Modified: hugo/trunk/gui/map_win.h
==============================================================================
--- hugo/trunk/gui/map_win.h (original)
+++ hugo/trunk/gui/map_win.h Wed Jun 29 17:41:33 2005
@@ -42,20 +42,20 @@
///which button was that and after that calls the
///appropriate function of the \ref GraphDisplayerCanvas
///to change the visible values of that attribute.
- virtual void e_combo_changed(int);
+ virtual void eComboChanged(int);
///If a radiobutton is clicked, this function determines
///which button was that and after that calls the
///appropriate function of the \ref GraphDisplayerCanvas
///to change the visible values of that attribute.
- virtual void n_combo_changed(int);
+ virtual void nComboChanged(int);
///This function is created to set the appropriate maps on the newly created node
- void update_node(Graph::Node);
+ void updateNode(Graph::Node);
///This function is created to set the appropriate maps on the newly created edge
- void update_edge(Graph::Edge);
+ void updateEdge(Graph::Edge);
- virtual bool close_if_escape_is_pressed(GdkEventKey*);
+ virtual bool closeIfEscapeIsPressed(GdkEventKey*);
};
#endif //MAP_WIN_H
Modified: hugo/trunk/gui/mapstorage.cc
==============================================================================
--- hugo/trunk/gui/mapstorage.cc (original)
+++ hugo/trunk/gui/mapstorage.cc Wed Jun 29 17:41:33 2005
@@ -100,7 +100,7 @@
return min;
}
-void MapStorage::init_maps_for_edge(Graph::Edge e)
+void MapStorage::initMapsForEdge(Graph::Edge e)
{
e=e;
// beragad, aztan csovez
Modified: hugo/trunk/gui/mapstorage.h
==============================================================================
--- hugo/trunk/gui/mapstorage.h (original)
+++ hugo/trunk/gui/mapstorage.h Wed Jun 29 17:41:33 2005
@@ -82,10 +82,10 @@
std::map< std::string,Graph::EdgeMap<double> * >::iterator beginOfEdgeMaps(){return edgemap_storage.begin();};
///This function sets a default base value for the newly created node
- void init_maps_for_node(NodeIt);
+ void initMapsForNode(NodeIt);
///This function sets a default base value for the newly created node
- void init_maps_for_edge(Graph::Edge);
+ void initMapsForEdge(Graph::Edge);
};
#endif //MAPSTORAGE_H
More information about the Lemon-commits
mailing list