diff -r 2a9a5d7f1a16 -r 6b2b718420eb graph_displayer_canvas-edge.cc --- a/graph_displayer_canvas-edge.cc Wed Feb 28 15:19:20 2007 +0000 +++ b/graph_displayer_canvas-edge.cc Wed Feb 28 18:20:28 2007 +0000 @@ -16,7 +16,9 @@ * */ -#include "graph_displayer_canvas.h" +#include +#include +#include #include const int minimum_edge_width=0; @@ -27,11 +29,11 @@ min=edge_property_defaults[E_WIDTH]; max=edge_property_defaults[E_WIDTH]; - Graph::EdgeMap actual_map((mytab.mapstorage).graph,edge_property_defaults[E_WIDTH]); + Graph::EdgeMap actual_map((mytab.mapstorage)->graph,edge_property_defaults[E_WIDTH]); if(edge==INVALID) { - for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { double v=fabs(actual_map[i]); int w; @@ -68,13 +70,13 @@ Graph::EdgeMap * actual_map; double min, max; - min=(mytab.mapstorage).minOfEdgeMap(mapname); - max=(mytab.mapstorage).maxOfEdgeMap(mapname); - actual_map=((mytab.mapstorage).edgemap_storage)[mapname]; + min=(mytab.mapstorage)->minOfEdgeMap(mapname); + max=(mytab.mapstorage)->maxOfEdgeMap(mapname); + actual_map=((mytab.mapstorage)->edgemap_storage)[mapname]; if(edge==INVALID) { - for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { double v=(*actual_map)[i]; int w; @@ -131,16 +133,16 @@ //the minimum of the nodemap to the range of //green in RGB Graph::EdgeMap * actual_map; - actual_map=((mytab.mapstorage).edgemap_storage)[mapname]; + actual_map=((mytab.mapstorage)->edgemap_storage)[mapname]; double max, min; - max=(mytab.mapstorage).maxOfEdgeMap(mapname); - min=(mytab.mapstorage).minOfEdgeMap(mapname); + max=(mytab.mapstorage)->maxOfEdgeMap(mapname); + min=(mytab.mapstorage)->minOfEdgeMap(mapname); if(edge==INVALID) { - for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { double w=(*actual_map)[i]; @@ -182,7 +184,7 @@ //function maps the range of the maximum and //the minimum of the nodemap to the range of //green in RGB - Graph::EdgeMap actual_map((mytab.mapstorage).graph,edge_property_defaults[E_COLOR]); + Graph::EdgeMap actual_map((mytab.mapstorage)->graph,edge_property_defaults[E_COLOR]); double max, min; @@ -191,7 +193,7 @@ if(edge==INVALID) { - for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { double w=actual_map[i]; @@ -236,10 +238,10 @@ if(edge==INVALID) { - for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { edgemap_to_edit=mapname; - double number=(*((mytab.mapstorage).edgemap_storage)[mapname])[i]; + double number=(*((mytab.mapstorage)->edgemap_storage)[mapname])[i]; std::ostringstream ostr; ostr << number; @@ -250,7 +252,7 @@ } else { - double number=(*((mytab.mapstorage).edgemap_storage)[mapname])[edge]; + double number=(*((mytab.mapstorage)->edgemap_storage)[mapname])[edge]; std::ostringstream ostr; ostr << number; @@ -271,7 +273,7 @@ if(edge==INVALID) { - for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { edgemap_to_edit=""; edgetextmap[i]->property_text().set_value("");