Index: graph_displayer_canvas-node.cc
===================================================================
--- graph_displayer_canvas-node.cc	(revision 201)
+++ graph_displayer_canvas-node.cc	(revision 204)
@@ -17,7 +17,5 @@
  */
 
-#include <graph_displayer_canvas.h>
-#include <mapstorage.h>
-#include <nbtab.h>
+#include "graph_displayer_canvas.h"
 #include <cmath>
 
@@ -26,25 +24,15 @@
 int GraphDisplayerCanvas::changeNodeRadius (std::string mapname, Node node)
 {
-  MapStorage& ms = *mytab.mapstorage;
-
+  Graph::NodeMap<double> * actual_map;
   double min, max;
-
-  {
-    NodeIt n(ms.graph);
-    min = max = ms.get(mapname, n);
-    for (; n != INVALID; ++n)
-    {
-      if (static_cast<double>(ms.get(mapname, n)) > max)
-        max = ms.get(mapname, n);
-      if (static_cast<double>(ms.get(mapname, n)) < min)
-        min = ms.get(mapname, n);
-    }
-  }
-
-  if(node==INVALID)
-    {
-      for (NodeIt i(ms.graph); i!=INVALID; ++i)
-	{
-	  double v=fabs(ms.get(mapname,i));
+  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)
+	{
+	  double v=fabs((*actual_map)[i]);
 	  int w;
 	  if(autoscale)
@@ -113,14 +101,12 @@
 int GraphDisplayerCanvas::resetNodeRadius (Node node)
 {
-  MapStorage& ms = *mytab.mapstorage;
-
   double min, max;
   min=node_property_defaults[N_RADIUS];
   max=node_property_defaults[N_RADIUS];
-  Graph::NodeMap<double> actual_map(ms.graph,node_property_defaults[N_RADIUS]);
+  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_RADIUS]);
   
   if(node==INVALID)
     {
-      for (NodeIt i(ms.graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
 	{
 	  double v=fabs(actual_map[i]);
@@ -176,5 +162,4 @@
 int GraphDisplayerCanvas::changeNodeColor (std::string mapname, Node node)
 {  
-  MapStorage& ms = *mytab.mapstorage;
 
   //function maps the range of the maximum and
@@ -182,26 +167,20 @@
   //green in RGB
 
+  Graph::NodeMap<double> * actual_map;
+  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
+
   double max, min;
 
-  {
-    NodeIt n(ms.graph);
-    min = max = ms.get(mapname, n);
-    for (; n != INVALID; ++n)
-    {
-      if (static_cast<double>(ms.get(mapname, n)) > max)
-        max = ms.get(mapname, n);
-      if (static_cast<double>(ms.get(mapname, n)) < min)
-        min = ms.get(mapname, n);
-    }
-  }
-
-  if(node==INVALID)
-    {
-
-      for (NodeIt i(ms.graph); i!=INVALID; ++i)
+  max=(mytab.mapstorage).maxOfNodeMap(mapname);
+  min=(mytab.mapstorage).minOfNodeMap(mapname);
+
+  if(node==INVALID)
+    {
+
+      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
 	{
 	  Gdk::Color color;
 
-	  double w=ms.get(mapname, i);
+	  double w=(*actual_map)[i];
 
 	  if(max!=min)
@@ -221,5 +200,5 @@
       Gdk::Color color;
 
-      double w=ms.get(mapname, node);
+      double w=(*actual_map)[node];
 
       if(max!=min)
@@ -239,5 +218,4 @@
 int GraphDisplayerCanvas::resetNodeColor (Node node)
 {  
-  MapStorage& ms = *mytab.mapstorage;
 
   //function maps the range of the maximum and
@@ -245,5 +223,5 @@
   //green in RGB
 
-  Graph::NodeMap<double> actual_map(ms.graph,node_property_defaults[N_COLOR]);
+  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_COLOR]);
 
   double max, min;
@@ -255,5 +233,5 @@
     {
 
-      for (NodeIt i(ms.graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
 	{
 	  Gdk::Color color;
@@ -295,5 +273,4 @@
 int GraphDisplayerCanvas::changeNodeText (std::string mapname, Node node)
 {
-  MapStorage& ms = *mytab.mapstorage;
 
   //the number in the map will be written on the node
@@ -302,18 +279,28 @@
   //that is the deleter map
 
-  if(node==INVALID)
-    {
-      for (NodeIt i(ms.graph); i!=INVALID; ++i)
+  Graph::NodeMap<double> * actual_map=NULL;
+  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
+
+  if(node==INVALID)
+    {
+      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
 	{
 	  nodemap_to_edit=mapname;
-
-	  nodetextmap[i]->property_text().set_value(
-              static_cast<std::string>(ms.get(mapname, i)));
-	}
-    }
-  else
-    {
-      nodetextmap[node]->property_text().set_value(
-          static_cast<std::string>(ms.get(mapname, node)));
+	  double number=(*actual_map)[i];
+
+	  std::ostringstream ostr;
+	  ostr << number;
+	      
+	  //	  nodetextmap[i]->property_text().set_value(ostr.str());
+	}
+    }
+  else
+    {
+      double number=(*actual_map)[node];
+
+      std::ostringstream ostr;
+      ostr << number;
+	      
+      //      nodetextmap[node]->property_text().set_value(ostr.str());
     }
   return 0;
@@ -322,5 +309,4 @@
 int GraphDisplayerCanvas::resetNodeText (Node node)
 {
-  MapStorage& ms = *mytab.mapstorage;
 
   //the number in the map will be written on the node
@@ -331,14 +317,14 @@
   if(node==INVALID)
     {
-      for (NodeIt i(ms.graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
 	{
 	  nodemap_to_edit="";
-	  nodetextmap[i]->property_text().set_value("");
-	}
-    }
-  else
-    {
-      nodetextmap[node]->property_text().set_value("");
-    }
-  return 0;
-};
+	  //	  nodetextmap[i]->property_text().set_value("");
+	}
+    }
+  else
+    {
+      //      nodetextmap[node]->property_text().set_value("");
+    }
+  return 0;
+};
