Changeset 1860:27a9a75b957b in lemon-0.x for gui/mapstorage.cc

Timestamp:

12/17/05 21:55:41 (18 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2432

Message:

Save and load the coordinates of the arrows on the edges.

File:

• gui/mapstorage.cc (modified) (8 diffs)

gui/mapstorage.cc

@@ -1 +1 @@
 #include "mapstorage.h"
+#include "gui_writer.h"
+#include "gui_reader.h"
 #include <gtkmm.h>
 #include <cmath>
@@ -5 +7 @@
 #include <cmath>
 
-MapStorage::MapStorage() : modified(false), file_name("")
+MapStorage::MapStorage() : modified(false), file_name(""), arrow_pos_read_ok(false)
 {
   nodemap_storage["coordinates_x"] = new Graph::NodeMap<double>(graph);
@@ -11 +13 @@
   nodemap_storage["coordinates_y"] = new Graph::NodeMap<double>(graph);
   coords.setYMap(*nodemap_storage["coordinates_y"]);
+
+  edgemap_storage["arrow_pos_x"] = new Graph::EdgeMap<double>(graph);
+  arrow_pos.setXMap(*edgemap_storage["arrow_pos_x"]);
+  edgemap_storage["arrow_pos_y"] = new Graph::EdgeMap<double>(graph);
+  arrow_pos.setYMap(*edgemap_storage["arrow_pos_y"]);
 
   nodemap_storage["id"] = new Graph::NodeMap<double>(graph);
@@ -248 +255 @@
       greader.readEdgeMap(*it, *edgemap_storage[*it]);
     }
+    GuiReader gui_reader(greader, this);
     greader.run();
   } catch (DataFormatError& error) {
@@ -284 +292 @@
   }
 
+  if (!arrow_pos_read_ok)
+  {
+    arrow_pos_read_ok = false;
+    for (EdgeIt e(graph); e != INVALID; ++e)
+    {
+      arrow_pos.set(e, (coords[graph.source(e)] + coords[graph.target(e)]) / 2.0);
+    }
+  }
+
   // fill in the default values for the maps
   for (std::map<std::string, Graph::NodeMap<double>*>::const_iterator it =
@@ -339 +356 @@
   {
     gwriter.writeNodeMap(it->first, *(it->second));
-    //std::cout << "wrote " << it->first << " nodemap" << std::endl;
   }
   for (std::map<std::string, Graph::EdgeMap<double>*>::const_iterator it =
       edgemap_storage.begin(); it != edgemap_storage.end(); ++it)
   {
-    gwriter.writeEdgeMap(it->first, *(it->second));
-    //std::cout << "wrote " << it->first << " edgemap" << std::endl;
-  }
+    if ((it->first != "arrow_pos_x") &&
+        (it->first != "arrow_pos_y"))
+    {
+      gwriter.writeEdgeMap(it->first, *(it->second));
+    }
+  }
+
+  GuiWriter gui_writer(gwriter, this);
+
   gwriter.run();
 }
@@ -366 +388 @@
       edgemap_storage.begin(); it != edgemap_storage.end(); ++it)
   {
-    if (it->first != "id")
+    if ((it->first != "id") &&
+        (it->first != "arrow_pos_x") &&
+        (it->first != "arrow_pos_y"))
     {
       delete it->second;
@@ -388 +412 @@
   modified = false;
 }
+
+void MapStorage::ArrowPosReadOK()
+{
+  arrow_pos_read_ok = true;
+}