1.1 --- a/graph_displayer_canvas-node.cc	Wed Feb 28 15:19:20 2007 +0000
     1.2 +++ b/graph_displayer_canvas-node.cc	Wed Feb 28 18:20:28 2007 +0000
     1.3 @@ -16,7 +16,9 @@
     1.4   *
     1.5   */
     1.6  
     1.7 -#include "graph_displayer_canvas.h"
     1.8 +#include <graph_displayer_canvas.h>
     1.9 +#include <mapstorage.h>
    1.10 +#include <nbtab.h>
    1.11  #include <cmath>
    1.12  
    1.13  const int minimum_node_radius=5;
    1.14 @@ -25,13 +27,13 @@
    1.15  {
    1.16    Graph::NodeMap<double> * actual_map;
    1.17    double min, max;
    1.18 -  min=(mytab.mapstorage).minOfNodeMap(mapname);
    1.19 -  max=(mytab.mapstorage).maxOfNodeMap(mapname);
    1.20 -  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
    1.21 +  min=(mytab.mapstorage)->minOfNodeMap(mapname);
    1.22 +  max=(mytab.mapstorage)->maxOfNodeMap(mapname);
    1.23 +  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
    1.24  
    1.25    if(node==INVALID)
    1.26      {
    1.27 -      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
    1.28 +      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
    1.29  	{
    1.30  	  double v=fabs((*actual_map)[i]);
    1.31  	  int w;
    1.32 @@ -103,11 +105,11 @@
    1.33    double min, max;
    1.34    min=node_property_defaults[N_RADIUS];
    1.35    max=node_property_defaults[N_RADIUS];
    1.36 -  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_RADIUS]);
    1.37 +  Graph::NodeMap<double> actual_map((mytab.mapstorage)->graph,node_property_defaults[N_RADIUS]);
    1.38    
    1.39    if(node==INVALID)
    1.40      {
    1.41 -      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
    1.42 +      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
    1.43  	{
    1.44  	  double v=fabs(actual_map[i]);
    1.45  	  int w;
    1.46 @@ -167,17 +169,17 @@
    1.47    //green in RGB
    1.48  
    1.49    Graph::NodeMap<double> * actual_map;
    1.50 -  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
    1.51 +  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
    1.52  
    1.53    double max, min;
    1.54  
    1.55 -  max=(mytab.mapstorage).maxOfNodeMap(mapname);
    1.56 -  min=(mytab.mapstorage).minOfNodeMap(mapname);
    1.57 +  max=(mytab.mapstorage)->maxOfNodeMap(mapname);
    1.58 +  min=(mytab.mapstorage)->minOfNodeMap(mapname);
    1.59  
    1.60    if(node==INVALID)
    1.61      {
    1.62  
    1.63 -      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
    1.64 +      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
    1.65  	{
    1.66  	  Gdk::Color color;
    1.67  
    1.68 @@ -222,7 +224,7 @@
    1.69    //the minimum of the nodemap to the range of
    1.70    //green in RGB
    1.71  
    1.72 -  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_COLOR]);
    1.73 +  Graph::NodeMap<double> actual_map((mytab.mapstorage)->graph,node_property_defaults[N_COLOR]);
    1.74  
    1.75    double max, min;
    1.76  
    1.77 @@ -232,7 +234,7 @@
    1.78    if(node==INVALID)
    1.79      {
    1.80  
    1.81 -      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
    1.82 +      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
    1.83  	{
    1.84  	  Gdk::Color color;
    1.85  
    1.86 @@ -279,11 +281,11 @@
    1.87    //that is the deleter map
    1.88  
    1.89    Graph::NodeMap<double> * actual_map=NULL;
    1.90 -  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
    1.91 +  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
    1.92  
    1.93    if(node==INVALID)
    1.94      {
    1.95 -      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
    1.96 +      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
    1.97  	{
    1.98  	  nodemap_to_edit=mapname;
    1.99  	  double number=(*actual_map)[i];
   1.100 @@ -316,7 +318,7 @@
   1.101  
   1.102    if(node==INVALID)
   1.103      {
   1.104 -      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
   1.105 +      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
   1.106  	{
   1.107  	  nodemap_to_edit="";
   1.108  	  nodetextmap[i]->property_text().set_value("");