diff -r 56eb90299693 -r adfdc2f70548 graph_displayer_canvas-node.cc --- a/graph_displayer_canvas-node.cc Wed Nov 23 16:24:59 2005 +0000 +++ b/graph_displayer_canvas-node.cc Tue Nov 29 19:31:58 2005 +0000 @@ -6,13 +6,13 @@ { Graph::NodeMap * actual_map; double min, max; - min=mapstorage.minOfNodeMap(mapname); - max=mapstorage.maxOfNodeMap(mapname); - actual_map=(mapstorage.nodemap_storage)[mapname]; + min=(mainwin.mapstorage).minOfNodeMap(mapname); + max=(mainwin.mapstorage).maxOfNodeMap(mapname); + actual_map=((mainwin.mapstorage).nodemap_storage)[mapname]; if(node==INVALID) { - for (NodeIt i(mapstorage.graph); i!=INVALID; ++i) + for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { double v=fabs((*actual_map)[i]); int w; @@ -64,11 +64,11 @@ double min, max; min=node_property_defaults[N_RADIUS]; max=node_property_defaults[N_RADIUS]; - Graph::NodeMap actual_map(mapstorage.graph,node_property_defaults[N_RADIUS]); + Graph::NodeMap actual_map((mainwin.mapstorage).graph,node_property_defaults[N_RADIUS]); if(node==INVALID) { - for (NodeIt i(mapstorage.graph); i!=INVALID; ++i) + for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { double v=fabs(actual_map[i]); int w; @@ -123,17 +123,17 @@ //green in RGB Graph::NodeMap * actual_map; - actual_map=(mapstorage.nodemap_storage)[mapname]; + actual_map=((mainwin.mapstorage).nodemap_storage)[mapname]; double max, min; - max=mapstorage.maxOfNodeMap(mapname); - min=mapstorage.minOfNodeMap(mapname); + max=(mainwin.mapstorage).maxOfNodeMap(mapname); + min=(mainwin.mapstorage).minOfNodeMap(mapname); if(node==INVALID) { - for (NodeIt i(mapstorage.graph); i!=INVALID; ++i) + for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { Gdk::Color color; @@ -178,7 +178,7 @@ //the minimum of the nodemap to the range of //green in RGB - Graph::NodeMap actual_map(mapstorage.graph,node_property_defaults[N_COLOR]); + Graph::NodeMap actual_map((mainwin.mapstorage).graph,node_property_defaults[N_COLOR]); double max, min; @@ -188,7 +188,7 @@ if(node==INVALID) { - for (NodeIt i(mapstorage.graph); i!=INVALID; ++i) + for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { Gdk::Color color; @@ -235,11 +235,11 @@ //that is the deleter map Graph::NodeMap * actual_map=NULL; - actual_map=(mapstorage.nodemap_storage)[mapname]; + actual_map=((mainwin.mapstorage).nodemap_storage)[mapname]; if(node==INVALID) { - for (NodeIt i(mapstorage.graph); i!=INVALID; ++i) + for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { nodemap_to_edit=mapname; double number=(*actual_map)[i]; @@ -272,7 +272,7 @@ if(node==INVALID) { - for (NodeIt i(mapstorage.graph); i!=INVALID; ++i) + for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i) { nodemap_to_edit=""; nodetextmap[i]->property_text().set_value("");