1.1 --- a/gui/graph_displayer_canvas-edge.cc	Tue Nov 29 08:43:50 2005 +0000
     1.2 +++ b/gui/graph_displayer_canvas-edge.cc	Tue Nov 29 19:31:58 2005 +0000
     1.3 @@ -8,11 +8,11 @@
     1.4  
     1.5    min=edge_property_defaults[E_WIDTH];
     1.6    max=edge_property_defaults[E_WIDTH];
     1.7 -  Graph::EdgeMap<double> actual_map(mapstorage.graph,edge_property_defaults[E_WIDTH]);
     1.8 +  Graph::EdgeMap<double> actual_map((mainwin.mapstorage).graph,edge_property_defaults[E_WIDTH]);
     1.9    
    1.10    if(edge==INVALID)
    1.11      {
    1.12 -      for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.13 +      for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.14  	{
    1.15  	  double v=fabs(actual_map[i]);
    1.16  	  int w;
    1.17 @@ -44,13 +44,13 @@
    1.18    Graph::EdgeMap<double> * actual_map;
    1.19    double min, max;
    1.20  
    1.21 -  min=mapstorage.minOfEdgeMap(mapname);
    1.22 -  max=mapstorage.maxOfEdgeMap(mapname);
    1.23 -  actual_map=(mapstorage.edgemap_storage)[mapname];
    1.24 +  min=(mainwin.mapstorage).minOfEdgeMap(mapname);
    1.25 +  max=(mainwin.mapstorage).maxOfEdgeMap(mapname);
    1.26 +  actual_map=((mainwin.mapstorage).edgemap_storage)[mapname];
    1.27  
    1.28    if(edge==INVALID)
    1.29      {
    1.30 -      for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.31 +      for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.32  	{
    1.33  	  double v=fabs((*actual_map)[i]);
    1.34  	  int w;
    1.35 @@ -83,16 +83,16 @@
    1.36    //the minimum of the nodemap to the range of
    1.37    //green in RGB
    1.38    Graph::EdgeMap<double> * actual_map;
    1.39 -  actual_map=(mapstorage.edgemap_storage)[mapname];
    1.40 +  actual_map=((mainwin.mapstorage).edgemap_storage)[mapname];
    1.41  
    1.42    double max, min;
    1.43  
    1.44 -  max=mapstorage.maxOfEdgeMap(mapname);
    1.45 -  min=mapstorage.minOfEdgeMap(mapname);
    1.46 +  max=(mainwin.mapstorage).maxOfEdgeMap(mapname);
    1.47 +  min=(mainwin.mapstorage).minOfEdgeMap(mapname);
    1.48  
    1.49    if(edge==INVALID)
    1.50      {
    1.51 -      for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.52 +      for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.53  	{
    1.54  	  double w=(*actual_map)[i];
    1.55  
    1.56 @@ -134,7 +134,7 @@
    1.57    //function maps the range of the maximum and
    1.58    //the minimum of the nodemap to the range of
    1.59    //green in RGB
    1.60 -  Graph::EdgeMap<double> actual_map(mapstorage.graph,edge_property_defaults[E_COLOR]);
    1.61 +  Graph::EdgeMap<double> actual_map((mainwin.mapstorage).graph,edge_property_defaults[E_COLOR]);
    1.62  
    1.63    double max, min;
    1.64  
    1.65 @@ -143,7 +143,7 @@
    1.66  
    1.67    if(edge==INVALID)
    1.68      {
    1.69 -      for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.70 +      for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.71  	{
    1.72  	  double w=actual_map[i];
    1.73  
    1.74 @@ -188,10 +188,10 @@
    1.75    
    1.76    if(edge==INVALID)
    1.77      {
    1.78 -      for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.79 +      for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
    1.80  	{
    1.81  	  edgemap_to_edit=mapname;
    1.82 -	  double number=(*(mapstorage.edgemap_storage)[mapname])[i];
    1.83 +	  double number=(*((mainwin.mapstorage).edgemap_storage)[mapname])[i];
    1.84  	  
    1.85  	  std::ostringstream ostr;
    1.86  	  ostr << number;
    1.87 @@ -202,7 +202,7 @@
    1.88      }
    1.89    else
    1.90      {
    1.91 -	  double number=(*(mapstorage.edgemap_storage)[mapname])[edge];
    1.92 +	  double number=(*((mainwin.mapstorage).edgemap_storage)[mapname])[edge];
    1.93  
    1.94  	  std::ostringstream ostr;
    1.95  	  ostr << number;
    1.96 @@ -223,7 +223,7 @@
    1.97    
    1.98    if(edge==INVALID)
    1.99      {
   1.100 -      for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
   1.101 +      for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
   1.102  	{
   1.103  	  edgemap_to_edit="";
   1.104  	  edgetextmap[i]->property_text().set_value("");