1.1 --- a/graph_displayer_canvas-event.cc Tue Feb 20 15:07:03 2007 +0000
1.2 +++ b/graph_displayer_canvas-event.cc Tue Feb 20 15:08:30 2007 +0000
1.3 @@ -340,11 +340,11 @@
1.4
1.5 (nodesmap[active_node])->show();
1.6
1.7 - nodetextmap[active_node]=new Gnome::Canvas::Text(displayed_graph,
1.8 - clicked_x+node_property_defaults[N_RADIUS]+5,
1.9 - clicked_y+node_property_defaults[N_RADIUS]+5, "");
1.10 - nodetextmap[active_node]->property_fill_color().set_value("darkblue");
1.11 - nodetextmap[active_node]->raise_to_top();
1.12 +// nodetextmap[active_node]=new Gnome::Canvas::Text(displayed_graph,
1.13 +// clicked_x+node_property_defaults[N_RADIUS]+5,
1.14 +// clicked_y+node_property_defaults[N_RADIUS]+5, "");
1.15 +// nodetextmap[active_node]->property_fill_color().set_value("darkblue");
1.16 +// nodetextmap[active_node]->raise_to_top();
1.17
1.18 // mapwin.updateNode(active_node);
1.19 propertyUpdate(active_node);
1.20 @@ -466,11 +466,11 @@
1.21 XY text_pos=mytab.mapstorage.arrow_pos[active_edge];
1.22 text_pos+=(XY(10,10));
1.23
1.24 - edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,
1.25 - text_pos.x, text_pos.y, "");
1.26 - edgetextmap[active_edge]->property_fill_color().set_value(
1.27 - "darkgreen");
1.28 - edgetextmap[active_edge]->raise_to_top();
1.29 +// edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,
1.30 +// text_pos.x, text_pos.y, "");
1.31 +// edgetextmap[active_edge]->property_fill_color().set_value(
1.32 +// "darkgreen");
1.33 +// edgetextmap[active_edge]->raise_to_top();
1.34
1.35 propertyUpdate(active_edge);
1.36 }
1.37 @@ -638,10 +638,10 @@
1.38 for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
1.39 {
1.40 //at the same time only one can be active
1.41 - if(nodetextmap[i]==active_item)
1.42 - {
1.43 - clicked_node=i;
1.44 - }
1.45 +// if(nodetextmap[i]==active_item)
1.46 +// {
1.47 +// clicked_node=i;
1.48 +// }
1.49 }
1.50
1.51 //if there was not, search for it between nodes
1.52 @@ -663,10 +663,10 @@
1.53 for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
1.54 {
1.55 //at the same time only one can be active
1.56 - if(edgetextmap[i]==active_item)
1.57 - {
1.58 - clicked_edge=i;
1.59 - }
1.60 +// if(edgetextmap[i]==active_item)
1.61 +// {
1.62 +// clicked_edge=i;
1.63 +// }
1.64 }
1.65
1.66 //if it was not between texts, search for it between edges
1.67 @@ -690,40 +690,40 @@
1.68 if (nodemap_to_edit == "label") return 0;
1.69
1.70 //and there is activated map
1.71 - if(nodetextmap[clicked_node]->property_text().get_value()!="")
1.72 - {
1.73 - //activate the general variable for it
1.74 - active_node=clicked_node;
1.75 +// if(nodetextmap[clicked_node]->property_text().get_value()!="")
1.76 +// {
1.77 +// //activate the general variable for it
1.78 +// active_node=clicked_node;
1.79
1.80 - //create a dialog
1.81 - Gtk::Dialog dialog("Edit value", true);
1.82 - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1.83 - dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
1.84 - Gtk::VBox* vbox = dialog.get_vbox();
1.85 - Gtk::SpinButton spin(0.0, 4);
1.86 - spin.set_increments(1.0, 10.0);
1.87 - spin.set_range(-1000000.0, 1000000.0);
1.88 - spin.set_numeric(true);
1.89 - spin.set_value(atof(nodetextmap[active_node]->property_text().get_value().c_str()));
1.90 - vbox->add(spin);
1.91 - spin.show();
1.92 - switch (dialog.run())
1.93 - {
1.94 - case Gtk::RESPONSE_NONE:
1.95 - case Gtk::RESPONSE_CANCEL:
1.96 - break;
1.97 - case Gtk::RESPONSE_ACCEPT:
1.98 - double new_value = spin.get_value();
1.99 - (*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
1.100 - new_value;
1.101 - std::ostringstream ostr;
1.102 - ostr << new_value;
1.103 - nodetextmap[active_node]->property_text().set_value(ostr.str());
1.104 - //mapwin.updateNode(active_node);
1.105 - //mapwin.updateNode(Node(INVALID));
1.106 - propertyUpdate(Node(INVALID));
1.107 - }
1.108 - }
1.109 +// //create a dialog
1.110 +// Gtk::Dialog dialog("Edit value", true);
1.111 +// dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1.112 +// dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
1.113 +// Gtk::VBox* vbox = dialog.get_vbox();
1.114 +// Gtk::SpinButton spin(0.0, 4);
1.115 +// spin.set_increments(1.0, 10.0);
1.116 +// spin.set_range(-1000000.0, 1000000.0);
1.117 +// spin.set_numeric(true);
1.118 +// spin.set_value(atof(nodetextmap[active_node]->property_text().get_value().c_str()));
1.119 +// vbox->add(spin);
1.120 +// spin.show();
1.121 +// switch (dialog.run())
1.122 +// {
1.123 +// case Gtk::RESPONSE_NONE:
1.124 +// case Gtk::RESPONSE_CANCEL:
1.125 +// break;
1.126 +// case Gtk::RESPONSE_ACCEPT:
1.127 +// double new_value = spin.get_value();
1.128 +// (*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
1.129 +// new_value;
1.130 +// std::ostringstream ostr;
1.131 +// ostr << new_value;
1.132 +// nodetextmap[active_node]->property_text().set_value(ostr.str());
1.133 +// //mapwin.updateNode(active_node);
1.134 +// //mapwin.updateNode(Node(INVALID));
1.135 +// propertyUpdate(Node(INVALID));
1.136 +// }
1.137 +// }
1.138 }
1.139 else
1.140 //if it was really an edge...
1.141 @@ -733,41 +733,41 @@
1.142 if (edgemap_to_edit == "label") return 0;
1.143
1.144 //and there is activated map
1.145 - if(edgetextmap[clicked_edge]->property_text().get_value()!="")
1.146 - {
1.147 - //activate the general variable for it
1.148 - active_edge=clicked_edge;
1.149 +// if(edgetextmap[clicked_edge]->property_text().get_value()!="")
1.150 +// {
1.151 +// //activate the general variable for it
1.152 +// active_edge=clicked_edge;
1.153
1.154 - //create a dialog
1.155 - Gtk::Dialog dialog("Edit value", true);
1.156 - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1.157 - dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
1.158 - Gtk::VBox* vbox = dialog.get_vbox();
1.159 - Gtk::SpinButton spin(0.0, 4);
1.160 - spin.set_increments(1.0, 10.0);
1.161 - spin.set_range(-1000000.0, 1000000.0);
1.162 - spin.set_numeric(true);
1.163 - spin.set_value(atof(edgetextmap[active_edge]->property_text().get_value().c_str()));
1.164 - vbox->add(spin);
1.165 - spin.show();
1.166 - switch (dialog.run())
1.167 - {
1.168 - case Gtk::RESPONSE_NONE:
1.169 - case Gtk::RESPONSE_CANCEL:
1.170 - break;
1.171 - case Gtk::RESPONSE_ACCEPT:
1.172 - double new_value = spin.get_value();
1.173 - (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
1.174 - new_value;
1.175 - std::ostringstream ostr;
1.176 - ostr << new_value;
1.177 - edgetextmap[active_edge]->property_text().set_value(
1.178 - ostr.str());
1.179 - //mapwin.updateEdge(active_edge);
1.180 - // mapwin.updateEdge(Edge(INVALID));
1.181 - propertyUpdate(Edge(INVALID));
1.182 - }
1.183 - }
1.184 +// //create a dialog
1.185 +// Gtk::Dialog dialog("Edit value", true);
1.186 +// dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
1.187 +// dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
1.188 +// Gtk::VBox* vbox = dialog.get_vbox();
1.189 +// Gtk::SpinButton spin(0.0, 4);
1.190 +// spin.set_increments(1.0, 10.0);
1.191 +// spin.set_range(-1000000.0, 1000000.0);
1.192 +// spin.set_numeric(true);
1.193 +// spin.set_value(atof(edgetextmap[active_edge]->property_text().get_value().c_str()));
1.194 +// vbox->add(spin);
1.195 +// spin.show();
1.196 +// switch (dialog.run())
1.197 +// {
1.198 +// case Gtk::RESPONSE_NONE:
1.199 +// case Gtk::RESPONSE_CANCEL:
1.200 +// break;
1.201 +// case Gtk::RESPONSE_ACCEPT:
1.202 +// double new_value = spin.get_value();
1.203 +// (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
1.204 +// new_value;
1.205 +// std::ostringstream ostr;
1.206 +// ostr << new_value;
1.207 +// edgetextmap[active_edge]->property_text().set_value(
1.208 +// ostr.str());
1.209 +// //mapwin.updateEdge(active_edge);
1.210 +// // mapwin.updateEdge(Edge(INVALID));
1.211 +// propertyUpdate(Edge(INVALID));
1.212 +// }
1.213 +// }
1.214 }
1.215 break;
1.216 }
1.217 @@ -780,14 +780,14 @@
1.218
1.219 void GraphDisplayerCanvas::deleteItem(Node node_to_delete)
1.220 {
1.221 - delete(nodetextmap[node_to_delete]);
1.222 + // delete(nodetextmap[node_to_delete]);
1.223 delete(nodesmap[node_to_delete]);
1.224 (mytab.mapstorage).graph.erase(node_to_delete);
1.225 }
1.226
1.227 void GraphDisplayerCanvas::deleteItem(Edge edge_to_delete)
1.228 {
1.229 - delete(edgetextmap[edge_to_delete]);
1.230 + // delete(edgetextmap[edge_to_delete]);
1.231 delete(edgesmap[edge_to_delete]);
1.232 (mytab.mapstorage).graph.erase(edge_to_delete);
1.233 }
1.234 @@ -795,8 +795,8 @@
1.235 void GraphDisplayerCanvas::textReposition(XY new_place)
1.236 {
1.237 new_place+=(XY(10,10));
1.238 - edgetextmap[forming_edge]->property_x().set_value(new_place.x);
1.239 - edgetextmap[forming_edge]->property_y().set_value(new_place.y);
1.240 +// edgetextmap[forming_edge]->property_x().set_value(new_place.x);
1.241 +// edgetextmap[forming_edge]->property_y().set_value(new_place.y);
1.242 }
1.243
1.244 void GraphDisplayerCanvas::toggleEdgeActivity(EdgeBase* active_bre, bool on)
1.245 @@ -848,7 +848,7 @@
1.246
1.247 //repositioning node and its text
1.248 moved_item->move(dx, dy);
1.249 - nodetextmap[moved_node]->move(dx, dy);
1.250 + // nodetextmap[moved_node]->move(dx, dy);
1.251
1.252 // the new coordinates of the centre of the node
1.253 double coord_x = dx + (mytab.mapstorage).coords[moved_node].x;
1.254 @@ -884,8 +884,8 @@
1.255 //reposition of edgetext
1.256 XY text_pos=mytab.mapstorage.arrow_pos[ei];
1.257 text_pos+=(XY(10,10));
1.258 - edgetextmap[ei]->property_x().set_value(text_pos.x);
1.259 - edgetextmap[ei]->property_y().set_value(text_pos.y);
1.260 +// edgetextmap[ei]->property_x().set_value(text_pos.x);
1.261 +// edgetextmap[ei]->property_y().set_value(text_pos.y);
1.262 }
1.263
1.264 for(InEdgeIt ei((mytab.mapstorage).graph,moved_node);ei!=INVALID;++ei)
1.265 @@ -908,8 +908,8 @@
1.266 //reposition of edgetext
1.267 XY text_pos=mytab.mapstorage.arrow_pos[ei];
1.268 text_pos+=(XY(10,10));
1.269 - edgetextmap[ei]->property_x().set_value(text_pos.x);
1.270 - edgetextmap[ei]->property_y().set_value(text_pos.y);
1.271 +// edgetextmap[ei]->property_x().set_value(text_pos.x);
1.272 +// edgetextmap[ei]->property_y().set_value(text_pos.y);
1.273 }
1.274 }
1.275 }