Changeset 7:f227a74db59d in glemon for mapstorage.cc

Timestamp:

10/10/08 14:36:20 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Tags:

tip

Message:

Update to compile with the latest LEMON (version 1.0 or [5e12d7734036])

File:

• mapstorage.cc (modified) (5 diffs)

mapstorage.cc

@@ -723 +723 @@
   // write .lgf file
   {
-    DigraphWriter<Digraph> gwriter(filename, digraph);
+    DigraphWriter<Digraph> gwriter(digraph, filename);
 
     gwriter.nodeMap("label", node_label);
@@ -827 +827 @@
   if (gui_sect_save_dest == CONF_FILE)
   {
-    DigraphWriter<Digraph> lwriter(filename + ".conf", digraph);
+    DigraphWriter<Digraph> lwriter(digraph, filename + ".conf");
     GuiWriter gui_writer(this);
     gui_writer.write(lwriter.ostream());
@@ -1338 +1338 @@
   using std::string;
 
-  DigraphReader<Digraph> greader(filename, digraph);
+  DigraphReader<Digraph> greader(digraph, filename);
 
   // read the label maps
@@ -1461 +1461 @@
       if(active_nodemaps[N_RADIUS]!="")
         {
-          _nodeSizes=getNumericNodeMap(active_nodemaps[N_RADIUS]);
+          const  Digraph::NodeMap<double> &temp = 
+            getNumericNodeMap(active_nodemaps[N_RADIUS]);
+          for(NodeIt n(digraph);n!=INVALID;++n)
+            _nodeSizes[n]= temp[n];
         }
       if(active_nodemaps[N_COLOR]!="")
@@ -1484 +1487 @@
       if(active_arcmaps[E_WIDTH]!="")
         {
-          _arcWidths=getNumericArcMap(active_arcmaps[E_WIDTH]);
+          const  Digraph::ArcMap<double> &temp = 
+            getNumericArcMap(active_arcmaps[E_WIDTH]);
+          for(ArcIt a(digraph);a!=INVALID;++a)
+            _arcWidths[a]=temp[a];
         }
       if(active_arcmaps[E_COLOR]!="")