[Lemon-commits] hegyi: r3191 - glemon/branches/fastopen
Lemon SVN
svn at lemon.cs.elte.hu
Tue Feb 20 16:08:30 CET 2007
Author: hegyi
Date: Tue Feb 20 16:08:30 2007
New Revision: 3191
Modified:
glemon/branches/fastopen/graph_displayer_canvas-edge.cc
glemon/branches/fastopen/graph_displayer_canvas-event.cc
glemon/branches/fastopen/graph_displayer_canvas-node.cc
glemon/branches/fastopen/graph_displayer_canvas.cc
Log:
The much faster way.
Modified: glemon/branches/fastopen/graph_displayer_canvas-edge.cc
==============================================================================
--- glemon/branches/fastopen/graph_displayer_canvas-edge.cc (original)
+++ glemon/branches/fastopen/graph_displayer_canvas-edge.cc Tue Feb 20 16:08:30 2007
@@ -244,7 +244,7 @@
std::ostringstream ostr;
ostr << number;
- edgetextmap[i]->property_text().set_value(ostr.str());
+// edgetextmap[i]->property_text().set_value(ostr.str());
}
}
@@ -255,7 +255,7 @@
std::ostringstream ostr;
ostr << number;
- edgetextmap[edge]->property_text().set_value(ostr.str());
+// edgetextmap[edge]->property_text().set_value(ostr.str());
}
return 0;
@@ -274,13 +274,13 @@
for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
{
edgemap_to_edit="";
- edgetextmap[i]->property_text().set_value("");
+// edgetextmap[i]->property_text().set_value("");
}
}
else
{
- edgetextmap[edge]->property_text().set_value("");
+// edgetextmap[edge]->property_text().set_value("");
}
return 0;
Modified: glemon/branches/fastopen/graph_displayer_canvas-event.cc
==============================================================================
--- glemon/branches/fastopen/graph_displayer_canvas-event.cc (original)
+++ glemon/branches/fastopen/graph_displayer_canvas-event.cc Tue Feb 20 16:08:30 2007
@@ -340,11 +340,11 @@
(nodesmap[active_node])->show();
- 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");
- nodetextmap[active_node]->raise_to_top();
+// 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");
+// nodetextmap[active_node]->raise_to_top();
// mapwin.updateNode(active_node);
propertyUpdate(active_node);
@@ -466,11 +466,11 @@
XY text_pos=mytab.mapstorage.arrow_pos[active_edge];
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");
- edgetextmap[active_edge]->raise_to_top();
+// edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,
+// text_pos.x, text_pos.y, "");
+// edgetextmap[active_edge]->property_fill_color().set_value(
+// "darkgreen");
+// edgetextmap[active_edge]->raise_to_top();
propertyUpdate(active_edge);
}
@@ -638,10 +638,10 @@
for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
{
//at the same time only one can be active
- if(nodetextmap[i]==active_item)
- {
- clicked_node=i;
- }
+// if(nodetextmap[i]==active_item)
+// {
+// clicked_node=i;
+// }
}
//if there was not, search for it between nodes
@@ -663,10 +663,10 @@
for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
{
//at the same time only one can be active
- if(edgetextmap[i]==active_item)
- {
- clicked_edge=i;
- }
+// if(edgetextmap[i]==active_item)
+// {
+// clicked_edge=i;
+// }
}
//if it was not between texts, search for it between edges
@@ -690,40 +690,40 @@
if (nodemap_to_edit == "label") return 0;
//and there is activated map
- if(nodetextmap[clicked_node]->property_text().get_value()!="")
- {
- //activate the general variable for it
- active_node=clicked_node;
-
- //create a dialog
- Gtk::Dialog dialog("Edit value", true);
- dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
- dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
- Gtk::VBox* vbox = dialog.get_vbox();
- Gtk::SpinButton spin(0.0, 4);
- spin.set_increments(1.0, 10.0);
- spin.set_range(-1000000.0, 1000000.0);
- spin.set_numeric(true);
- spin.set_value(atof(nodetextmap[active_node]->property_text().get_value().c_str()));
- vbox->add(spin);
- spin.show();
- switch (dialog.run())
- {
- case Gtk::RESPONSE_NONE:
- case Gtk::RESPONSE_CANCEL:
- break;
- case Gtk::RESPONSE_ACCEPT:
- double new_value = spin.get_value();
- (*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
- new_value;
- std::ostringstream ostr;
- ostr << new_value;
- nodetextmap[active_node]->property_text().set_value(ostr.str());
- //mapwin.updateNode(active_node);
- //mapwin.updateNode(Node(INVALID));
- propertyUpdate(Node(INVALID));
- }
- }
+// if(nodetextmap[clicked_node]->property_text().get_value()!="")
+// {
+// //activate the general variable for it
+// active_node=clicked_node;
+
+// //create a dialog
+// Gtk::Dialog dialog("Edit value", true);
+// dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+// dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
+// Gtk::VBox* vbox = dialog.get_vbox();
+// Gtk::SpinButton spin(0.0, 4);
+// spin.set_increments(1.0, 10.0);
+// spin.set_range(-1000000.0, 1000000.0);
+// spin.set_numeric(true);
+// spin.set_value(atof(nodetextmap[active_node]->property_text().get_value().c_str()));
+// vbox->add(spin);
+// spin.show();
+// switch (dialog.run())
+// {
+// case Gtk::RESPONSE_NONE:
+// case Gtk::RESPONSE_CANCEL:
+// break;
+// case Gtk::RESPONSE_ACCEPT:
+// double new_value = spin.get_value();
+// (*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
+// new_value;
+// std::ostringstream ostr;
+// ostr << new_value;
+// nodetextmap[active_node]->property_text().set_value(ostr.str());
+// //mapwin.updateNode(active_node);
+// //mapwin.updateNode(Node(INVALID));
+// propertyUpdate(Node(INVALID));
+// }
+// }
}
else
//if it was really an edge...
@@ -733,41 +733,41 @@
if (edgemap_to_edit == "label") return 0;
//and there is activated map
- if(edgetextmap[clicked_edge]->property_text().get_value()!="")
- {
- //activate the general variable for it
- active_edge=clicked_edge;
-
- //create a dialog
- Gtk::Dialog dialog("Edit value", true);
- dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
- dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
- Gtk::VBox* vbox = dialog.get_vbox();
- Gtk::SpinButton spin(0.0, 4);
- spin.set_increments(1.0, 10.0);
- spin.set_range(-1000000.0, 1000000.0);
- spin.set_numeric(true);
- spin.set_value(atof(edgetextmap[active_edge]->property_text().get_value().c_str()));
- vbox->add(spin);
- spin.show();
- switch (dialog.run())
- {
- case Gtk::RESPONSE_NONE:
- case Gtk::RESPONSE_CANCEL:
- break;
- case Gtk::RESPONSE_ACCEPT:
- double new_value = spin.get_value();
- (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
- new_value;
- std::ostringstream ostr;
- ostr << new_value;
- edgetextmap[active_edge]->property_text().set_value(
- ostr.str());
- //mapwin.updateEdge(active_edge);
- // mapwin.updateEdge(Edge(INVALID));
- propertyUpdate(Edge(INVALID));
- }
- }
+// if(edgetextmap[clicked_edge]->property_text().get_value()!="")
+// {
+// //activate the general variable for it
+// active_edge=clicked_edge;
+
+// //create a dialog
+// Gtk::Dialog dialog("Edit value", true);
+// dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+// dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
+// Gtk::VBox* vbox = dialog.get_vbox();
+// Gtk::SpinButton spin(0.0, 4);
+// spin.set_increments(1.0, 10.0);
+// spin.set_range(-1000000.0, 1000000.0);
+// spin.set_numeric(true);
+// spin.set_value(atof(edgetextmap[active_edge]->property_text().get_value().c_str()));
+// vbox->add(spin);
+// spin.show();
+// switch (dialog.run())
+// {
+// case Gtk::RESPONSE_NONE:
+// case Gtk::RESPONSE_CANCEL:
+// break;
+// case Gtk::RESPONSE_ACCEPT:
+// double new_value = spin.get_value();
+// (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
+// new_value;
+// std::ostringstream ostr;
+// ostr << new_value;
+// edgetextmap[active_edge]->property_text().set_value(
+// ostr.str());
+// //mapwin.updateEdge(active_edge);
+// // mapwin.updateEdge(Edge(INVALID));
+// propertyUpdate(Edge(INVALID));
+// }
+// }
}
break;
}
@@ -780,14 +780,14 @@
void GraphDisplayerCanvas::deleteItem(Node node_to_delete)
{
- delete(nodetextmap[node_to_delete]);
+ // delete(nodetextmap[node_to_delete]);
delete(nodesmap[node_to_delete]);
(mytab.mapstorage).graph.erase(node_to_delete);
}
void GraphDisplayerCanvas::deleteItem(Edge edge_to_delete)
{
- delete(edgetextmap[edge_to_delete]);
+ // delete(edgetextmap[edge_to_delete]);
delete(edgesmap[edge_to_delete]);
(mytab.mapstorage).graph.erase(edge_to_delete);
}
@@ -795,8 +795,8 @@
void GraphDisplayerCanvas::textReposition(XY new_place)
{
new_place+=(XY(10,10));
- edgetextmap[forming_edge]->property_x().set_value(new_place.x);
- edgetextmap[forming_edge]->property_y().set_value(new_place.y);
+// edgetextmap[forming_edge]->property_x().set_value(new_place.x);
+// edgetextmap[forming_edge]->property_y().set_value(new_place.y);
}
void GraphDisplayerCanvas::toggleEdgeActivity(EdgeBase* active_bre, bool on)
@@ -848,7 +848,7 @@
//repositioning node and its text
moved_item->move(dx, dy);
- nodetextmap[moved_node]->move(dx, dy);
+ // nodetextmap[moved_node]->move(dx, dy);
// the new coordinates of the centre of the node
double coord_x = dx + (mytab.mapstorage).coords[moved_node].x;
@@ -884,8 +884,8 @@
//reposition of edgetext
XY text_pos=mytab.mapstorage.arrow_pos[ei];
text_pos+=(XY(10,10));
- edgetextmap[ei]->property_x().set_value(text_pos.x);
- edgetextmap[ei]->property_y().set_value(text_pos.y);
+// edgetextmap[ei]->property_x().set_value(text_pos.x);
+// edgetextmap[ei]->property_y().set_value(text_pos.y);
}
for(InEdgeIt ei((mytab.mapstorage).graph,moved_node);ei!=INVALID;++ei)
@@ -908,8 +908,8 @@
//reposition of edgetext
XY text_pos=mytab.mapstorage.arrow_pos[ei];
text_pos+=(XY(10,10));
- edgetextmap[ei]->property_x().set_value(text_pos.x);
- edgetextmap[ei]->property_y().set_value(text_pos.y);
+// edgetextmap[ei]->property_x().set_value(text_pos.x);
+// edgetextmap[ei]->property_y().set_value(text_pos.y);
}
}
}
Modified: glemon/branches/fastopen/graph_displayer_canvas-node.cc
==============================================================================
--- glemon/branches/fastopen/graph_displayer_canvas-node.cc (original)
+++ glemon/branches/fastopen/graph_displayer_canvas-node.cc Tue Feb 20 16:08:30 2007
@@ -291,7 +291,7 @@
std::ostringstream ostr;
ostr << number;
- nodetextmap[i]->property_text().set_value(ostr.str());
+ // nodetextmap[i]->property_text().set_value(ostr.str());
}
}
else
@@ -301,7 +301,7 @@
std::ostringstream ostr;
ostr << number;
- nodetextmap[node]->property_text().set_value(ostr.str());
+ // nodetextmap[node]->property_text().set_value(ostr.str());
}
return 0;
};
@@ -319,12 +319,12 @@
for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
{
nodemap_to_edit="";
- nodetextmap[i]->property_text().set_value("");
+ // nodetextmap[i]->property_text().set_value("");
}
}
else
{
- nodetextmap[node]->property_text().set_value("");
+ // nodetextmap[node]->property_text().set_value("");
}
return 0;
};
Modified: glemon/branches/fastopen/graph_displayer_canvas.cc
==============================================================================
--- glemon/branches/fastopen/graph_displayer_canvas.cc (original)
+++ glemon/branches/fastopen/graph_displayer_canvas.cc Tue Feb 20 16:08:30 2007
@@ -72,13 +72,13 @@
for (NodeIt n((mytab.mapstorage).graph); n != INVALID; ++n)
{
delete nodesmap[n];
- delete nodetextmap[n];
+ // delete nodetextmap[n];
}
for (EdgeIt e((mytab.mapstorage).graph); e != INVALID; ++e)
{
delete edgesmap[e];
- delete edgetextmap[e];
+ // delete edgetextmap[e];
}
}
@@ -222,10 +222,10 @@
XY text_pos=mytab.mapstorage.arrow_pos[i];
text_pos+=(XY(10,10));
- edgetextmap[i]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
- edgetextmap[i]->property_fill_color().set_value("darkgreen");
- edgetextmap[i]->signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::mapEditEventHandler), false);
- edgetextmap[i]->raise_to_top();
+// edgetextmap[i]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
+// edgetextmap[i]->property_fill_color().set_value("darkgreen");
+// edgetextmap[i]->signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::mapEditEventHandler), false);
+// edgetextmap[i]->raise_to_top();
}
//afterwards nodes come to be drawn
@@ -250,11 +250,11 @@
((mytab.mapstorage).coords[i].x+node_property_defaults[N_RADIUS]+5),
((mytab.mapstorage).coords[i].y+node_property_defaults[N_RADIUS]+5));
- nodetextmap[i]=new Gnome::Canvas::Text(displayed_graph,
- text_pos.x, text_pos.y, "");
- nodetextmap[i]->property_fill_color().set_value("darkblue");
- nodetextmap[i]->signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::mapEditEventHandler), false);
- nodetextmap[i]->raise_to_top();
+// nodetextmap[i]=new Gnome::Canvas::Text(displayed_graph,
+// text_pos.x, text_pos.y, "");
+// nodetextmap[i]->property_fill_color().set_value("darkblue");
+// nodetextmap[i]->signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::mapEditEventHandler), false);
+// nodetextmap[i]->raise_to_top();
}
is_drawn=true;
@@ -284,13 +284,13 @@
for (NodeIt n((mytab.mapstorage).graph); n != INVALID; ++n)
{
delete nodesmap[n];
- delete nodetextmap[n];
+ // delete nodetextmap[n];
}
for (EdgeIt e((mytab.mapstorage).graph); e != INVALID; ++e)
{
delete edgesmap[e];
- delete edgetextmap[e];
+ // delete edgetextmap[e];
}
is_drawn=false;
More information about the Lemon-commits
mailing list