mapstorage.cc
changeset 7 f227a74db59d
parent 1 67188bd752db
     1.1 --- a/mapstorage.cc	Wed Aug 13 17:24:25 2008 +0100
     1.2 +++ b/mapstorage.cc	Fri Oct 10 13:36:20 2008 +0100
     1.3 @@ -722,7 +722,7 @@
     1.4  
     1.5    // write .lgf file
     1.6    {
     1.7 -    DigraphWriter<Digraph> gwriter(filename, digraph);
     1.8 +    DigraphWriter<Digraph> gwriter(digraph, filename);
     1.9  
    1.10      gwriter.nodeMap("label", node_label);
    1.11      gwriter.arcMap("label", arc_label);
    1.12 @@ -826,7 +826,7 @@
    1.13    // write .conf file
    1.14    if (gui_sect_save_dest == CONF_FILE)
    1.15    {
    1.16 -    DigraphWriter<Digraph> lwriter(filename + ".conf", digraph);
    1.17 +    DigraphWriter<Digraph> lwriter(digraph, filename + ".conf");
    1.18      GuiWriter gui_writer(this);
    1.19      gui_writer.write(lwriter.ostream());
    1.20      lwriter.run();
    1.21 @@ -1337,7 +1337,7 @@
    1.22    using std::map;
    1.23    using std::string;
    1.24  
    1.25 -  DigraphReader<Digraph> greader(filename, digraph);
    1.26 +  DigraphReader<Digraph> greader(digraph, filename);
    1.27  
    1.28    // read the label maps
    1.29    greader.nodeMap("label", node_label);
    1.30 @@ -1460,7 +1460,10 @@
    1.31      {
    1.32        if(active_nodemaps[N_RADIUS]!="")
    1.33  	{
    1.34 -	  _nodeSizes=getNumericNodeMap(active_nodemaps[N_RADIUS]);
    1.35 +	  const  Digraph::NodeMap<double> &temp = 
    1.36 +	    getNumericNodeMap(active_nodemaps[N_RADIUS]);
    1.37 +	  for(NodeIt n(digraph);n!=INVALID;++n)
    1.38 +	    _nodeSizes[n]= temp[n];
    1.39  	}
    1.40        if(active_nodemaps[N_COLOR]!="")
    1.41  	{
    1.42 @@ -1483,7 +1486,10 @@
    1.43      {
    1.44        if(active_arcmaps[E_WIDTH]!="")
    1.45  	{
    1.46 -	  _arcWidths=getNumericArcMap(active_arcmaps[E_WIDTH]);
    1.47 +	  const  Digraph::ArcMap<double> &temp = 
    1.48 +	    getNumericArcMap(active_arcmaps[E_WIDTH]);
    1.49 +	  for(ArcIt a(digraph);a!=INVALID;++a)
    1.50 +	    _arcWidths[a]=temp[a];
    1.51  	}
    1.52        if(active_arcmaps[E_COLOR]!="")
    1.53  	{