1.1 --- a/graph_displayer_canvas-node.cc	Wed Nov 23 16:24:59 2005 +0000
     1.2 +++ b/graph_displayer_canvas-node.cc	Tue Nov 29 19:31:58 2005 +0000
     1.3 @@ -6,13 +6,13 @@
     1.4  {
     1.5    Graph::NodeMap<double> * actual_map;
     1.6    double min, max;
     1.7 -  min=mapstorage.minOfNodeMap(mapname);
     1.8 -  max=mapstorage.maxOfNodeMap(mapname);
     1.9 -  actual_map=(mapstorage.nodemap_storage)[mapname];
    1.10 +  min=(mainwin.mapstorage).minOfNodeMap(mapname);
    1.11 +  max=(mainwin.mapstorage).maxOfNodeMap(mapname);
    1.12 +  actual_map=((mainwin.mapstorage).nodemap_storage)[mapname];
    1.13  
    1.14    if(node==INVALID)
    1.15      {
    1.16 -      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.17 +      for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.18  	{
    1.19  	  double v=fabs((*actual_map)[i]);
    1.20  	  int w;
    1.21 @@ -64,11 +64,11 @@
    1.22    double min, max;
    1.23    min=node_property_defaults[N_RADIUS];
    1.24    max=node_property_defaults[N_RADIUS];
    1.25 -  Graph::NodeMap<double> actual_map(mapstorage.graph,node_property_defaults[N_RADIUS]);
    1.26 +  Graph::NodeMap<double> actual_map((mainwin.mapstorage).graph,node_property_defaults[N_RADIUS]);
    1.27    
    1.28    if(node==INVALID)
    1.29      {
    1.30 -      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.31 +      for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.32  	{
    1.33  	  double v=fabs(actual_map[i]);
    1.34  	  int w;
    1.35 @@ -123,17 +123,17 @@
    1.36    //green in RGB
    1.37  
    1.38    Graph::NodeMap<double> * actual_map;
    1.39 -  actual_map=(mapstorage.nodemap_storage)[mapname];
    1.40 +  actual_map=((mainwin.mapstorage).nodemap_storage)[mapname];
    1.41  
    1.42    double max, min;
    1.43  
    1.44 -  max=mapstorage.maxOfNodeMap(mapname);
    1.45 -  min=mapstorage.minOfNodeMap(mapname);
    1.46 +  max=(mainwin.mapstorage).maxOfNodeMap(mapname);
    1.47 +  min=(mainwin.mapstorage).minOfNodeMap(mapname);
    1.48  
    1.49    if(node==INVALID)
    1.50      {
    1.51  
    1.52 -      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.53 +      for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.54  	{
    1.55  	  Gdk::Color color;
    1.56  
    1.57 @@ -178,7 +178,7 @@
    1.58    //the minimum of the nodemap to the range of
    1.59    //green in RGB
    1.60  
    1.61 -  Graph::NodeMap<double> actual_map(mapstorage.graph,node_property_defaults[N_COLOR]);
    1.62 +  Graph::NodeMap<double> actual_map((mainwin.mapstorage).graph,node_property_defaults[N_COLOR]);
    1.63  
    1.64    double max, min;
    1.65  
    1.66 @@ -188,7 +188,7 @@
    1.67    if(node==INVALID)
    1.68      {
    1.69  
    1.70 -      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.71 +      for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.72  	{
    1.73  	  Gdk::Color color;
    1.74  
    1.75 @@ -235,11 +235,11 @@
    1.76    //that is the deleter map
    1.77  
    1.78    Graph::NodeMap<double> * actual_map=NULL;
    1.79 -  actual_map=(mapstorage.nodemap_storage)[mapname];
    1.80 +  actual_map=((mainwin.mapstorage).nodemap_storage)[mapname];
    1.81  
    1.82    if(node==INVALID)
    1.83      {
    1.84 -      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.85 +      for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.86  	{
    1.87  	  nodemap_to_edit=mapname;
    1.88  	  double number=(*actual_map)[i];
    1.89 @@ -272,7 +272,7 @@
    1.90  
    1.91    if(node==INVALID)
    1.92      {
    1.93 -      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.94 +      for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.95  	{
    1.96  	  nodemap_to_edit="";
    1.97  	  nodetextmap[i]->property_text().set_value("");