diff -r 56eb90299693 -r adfdc2f70548 graph_displayer_canvas-edge.cc --- a/graph_displayer_canvas-edge.cc Wed Nov 23 16:24:59 2005 +0000 +++ b/graph_displayer_canvas-edge.cc Tue Nov 29 19:31:58 2005 +0000 @@ -8,11 +8,11 @@ min=edge_property_defaults[E_WIDTH]; max=edge_property_defaults[E_WIDTH]; - Graph::EdgeMap actual_map(mapstorage.graph,edge_property_defaults[E_WIDTH]); + Graph::EdgeMap actual_map((mainwin.mapstorage).graph,edge_property_defaults[E_WIDTH]); if(edge==INVALID) { - for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i) + for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { double v=fabs(actual_map[i]); int w; @@ -44,13 +44,13 @@ Graph::EdgeMap * actual_map; double min, max; - min=mapstorage.minOfEdgeMap(mapname); - max=mapstorage.maxOfEdgeMap(mapname); - actual_map=(mapstorage.edgemap_storage)[mapname]; + min=(mainwin.mapstorage).minOfEdgeMap(mapname); + max=(mainwin.mapstorage).maxOfEdgeMap(mapname); + actual_map=((mainwin.mapstorage).edgemap_storage)[mapname]; if(edge==INVALID) { - for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i) + for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { double v=fabs((*actual_map)[i]); int w; @@ -83,16 +83,16 @@ //the minimum of the nodemap to the range of //green in RGB Graph::EdgeMap * actual_map; - actual_map=(mapstorage.edgemap_storage)[mapname]; + actual_map=((mainwin.mapstorage).edgemap_storage)[mapname]; double max, min; - max=mapstorage.maxOfEdgeMap(mapname); - min=mapstorage.minOfEdgeMap(mapname); + max=(mainwin.mapstorage).maxOfEdgeMap(mapname); + min=(mainwin.mapstorage).minOfEdgeMap(mapname); if(edge==INVALID) { - for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i) + for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { double w=(*actual_map)[i]; @@ -134,7 +134,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(mapstorage.graph,edge_property_defaults[E_COLOR]); + Graph::EdgeMap actual_map((mainwin.mapstorage).graph,edge_property_defaults[E_COLOR]); double max, min; @@ -143,7 +143,7 @@ if(edge==INVALID) { - for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i) + for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { double w=actual_map[i]; @@ -188,10 +188,10 @@ if(edge==INVALID) { - for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i) + for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { edgemap_to_edit=mapname; - double number=(*(mapstorage.edgemap_storage)[mapname])[i]; + double number=(*((mainwin.mapstorage).edgemap_storage)[mapname])[i]; std::ostringstream ostr; ostr << number; @@ -202,7 +202,7 @@ } else { - double number=(*(mapstorage.edgemap_storage)[mapname])[edge]; + double number=(*((mainwin.mapstorage).edgemap_storage)[mapname])[edge]; std::ostringstream ostr; ostr << number; @@ -223,7 +223,7 @@ if(edge==INVALID) { - for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i) + for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { edgemap_to_edit=""; edgetextmap[i]->property_text().set_value("");