diff -r 2a9a5d7f1a16 -r 6b2b718420eb graph_displayer_canvas-node.cc --- a/graph_displayer_canvas-node.cc Wed Feb 28 15:19:20 2007 +0000 +++ b/graph_displayer_canvas-node.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_node_radius=5; @@ -25,13 +27,13 @@ { Graph::NodeMap * actual_map; double min, max; - min=(mytab.mapstorage).minOfNodeMap(mapname); - max=(mytab.mapstorage).maxOfNodeMap(mapname); - actual_map=((mytab.mapstorage).nodemap_storage)[mapname]; + min=(mytab.mapstorage)->minOfNodeMap(mapname); + max=(mytab.mapstorage)->maxOfNodeMap(mapname); + actual_map=((mytab.mapstorage)->nodemap_storage)[mapname]; if(node==INVALID) { - for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { double v=fabs((*actual_map)[i]); int w; @@ -103,11 +105,11 @@ double min, max; min=node_property_defaults[N_RADIUS]; max=node_property_defaults[N_RADIUS]; - Graph::NodeMap actual_map((mytab.mapstorage).graph,node_property_defaults[N_RADIUS]); + Graph::NodeMap actual_map((mytab.mapstorage)->graph,node_property_defaults[N_RADIUS]); if(node==INVALID) { - for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { double v=fabs(actual_map[i]); int w; @@ -167,17 +169,17 @@ //green in RGB Graph::NodeMap * actual_map; - actual_map=((mytab.mapstorage).nodemap_storage)[mapname]; + actual_map=((mytab.mapstorage)->nodemap_storage)[mapname]; double max, min; - max=(mytab.mapstorage).maxOfNodeMap(mapname); - min=(mytab.mapstorage).minOfNodeMap(mapname); + max=(mytab.mapstorage)->maxOfNodeMap(mapname); + min=(mytab.mapstorage)->minOfNodeMap(mapname); if(node==INVALID) { - for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { Gdk::Color color; @@ -222,7 +224,7 @@ //the minimum of the nodemap to the range of //green in RGB - Graph::NodeMap actual_map((mytab.mapstorage).graph,node_property_defaults[N_COLOR]); + Graph::NodeMap actual_map((mytab.mapstorage)->graph,node_property_defaults[N_COLOR]); double max, min; @@ -232,7 +234,7 @@ if(node==INVALID) { - for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { Gdk::Color color; @@ -279,11 +281,11 @@ //that is the deleter map Graph::NodeMap * actual_map=NULL; - actual_map=((mytab.mapstorage).nodemap_storage)[mapname]; + actual_map=((mytab.mapstorage)->nodemap_storage)[mapname]; if(node==INVALID) { - for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { nodemap_to_edit=mapname; double number=(*actual_map)[i]; @@ -316,7 +318,7 @@ if(node==INVALID) { - for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i) + for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i) { nodemap_to_edit=""; nodetextmap[i]->property_text().set_value("");