diff -r 3a44a2bb6da8 -r f227a74db59d mapstorage.cc --- a/mapstorage.cc Wed Aug 13 17:24:25 2008 +0100 +++ b/mapstorage.cc Fri Oct 10 13:36:20 2008 +0100 @@ -722,7 +722,7 @@ // write .lgf file { - DigraphWriter gwriter(filename, digraph); + DigraphWriter gwriter(digraph, filename); gwriter.nodeMap("label", node_label); gwriter.arcMap("label", arc_label); @@ -826,7 +826,7 @@ // write .conf file if (gui_sect_save_dest == CONF_FILE) { - DigraphWriter lwriter(filename + ".conf", digraph); + DigraphWriter lwriter(digraph, filename + ".conf"); GuiWriter gui_writer(this); gui_writer.write(lwriter.ostream()); lwriter.run(); @@ -1337,7 +1337,7 @@ using std::map; using std::string; - DigraphReader greader(filename, digraph); + DigraphReader greader(digraph, filename); // read the label maps greader.nodeMap("label", node_label); @@ -1460,7 +1460,10 @@ { if(active_nodemaps[N_RADIUS]!="") { - _nodeSizes=getNumericNodeMap(active_nodemaps[N_RADIUS]); + const Digraph::NodeMap &temp = + getNumericNodeMap(active_nodemaps[N_RADIUS]); + for(NodeIt n(digraph);n!=INVALID;++n) + _nodeSizes[n]= temp[n]; } if(active_nodemaps[N_COLOR]!="") { @@ -1483,7 +1486,10 @@ { if(active_arcmaps[E_WIDTH]!="") { - _arcWidths=getNumericArcMap(active_arcmaps[E_WIDTH]); + const Digraph::ArcMap &temp = + getNumericArcMap(active_arcmaps[E_WIDTH]); + for(ArcIt a(digraph);a!=INVALID;++a) + _arcWidths[a]=temp[a]; } if(active_arcmaps[E_COLOR]!="") {