Changeset 1645:4a04bb856ac7 in lemon-0.x for gui/mapstorage.cc

Timestamp:

08/23/05 09:36:09 (19 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

• id maps are not editable
• handle exceptions thrown by the file reader
• texts are always above the edges
• store a default value for all maps, so that edges and nodes created after adding a new map receive the default value too
• create node on button release, not on click (fixes a few oddities)

File:

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

gui/mapstorage.cc

@@ -1 +1 @@
 #include "mapstorage.h"
+#include <gtkmm.h>
 #include <cmath>
 
@@ -27 +28 @@
 }
 
-int MapStorage::addNodeMap(const std::string & name, Graph::NodeMap<double> *nodemap)
+int MapStorage::addNodeMap(const std::string & name, Graph::NodeMap<double> *nodemap, double default_value = 0.0)
 {
   if( nodemap_storage.find(name) == nodemap_storage.end() )
     {
       nodemap_storage[name]=nodemap;
+      // set the maps default value
+      nodemap_default[name] = default_value;
       return 0;
     }
@@ -37 +40 @@
 }
 
-int MapStorage::addEdgeMap(const std::string & name, Graph::EdgeMap<double> *edgemap)
+int MapStorage::addEdgeMap(const std::string & name, Graph::EdgeMap<double> *edgemap, double default_value = 0.0)
 {
   if( edgemap_storage.find(name) == edgemap_storage.end() )
     {
       edgemap_storage[name]=edgemap;
+      // set the maps default value
+      edgemap_default[name] = default_value;
       return 0;
     }
@@ -117 +122 @@
 }
 
-void MapStorage::initMapsForEdge(Edge e)
-{
-  std::map< std::string,Graph::EdgeMap<double> * >::iterator ems_it;
-  for(ems_it=edgemap_storage.begin();ems_it!=edgemap_storage.end();ems_it++)
-    {
-      (*((*ems_it).second))[e]=5;
-    }
-}
-
-void MapStorage::readFromFile(const std::string &filename)
+int MapStorage::readFromFile(const std::string &filename)
 {
   bool read_x = false;
@@ -180 +176 @@
     greader.run();
   } catch (DataFormatError& error) {
-    /*
     Gtk::MessageDialog mdialog("Read Error");
     mdialog.set_message(error.what());
     mdialog.run();
-    */
-    // reset graph and mapstorage ?
-    return;
+    clear();
+    return 1;
   }
 
@@ -206 +200 @@
     }
   }
+
+  // fill in the default values for the maps
+  for (std::map<std::string, Graph::NodeMap<double>*>::const_iterator it =
+      nodemap_storage.begin(); it != nodemap_storage.end(); ++it)
+  {
+    if ((it->first != "id") &&
+        (it->first != "coordiantes_x") &&
+        (it->first != "coordinates_y"))
+    {
+      nodemap_default[it->first] = 0.0;
+    }
+  }
+  for (std::map<std::string, Graph::EdgeMap<double>*>::const_iterator it =
+      edgemap_storage.begin(); it != edgemap_storage.end(); ++it)
+  {
+    if (it->first != "id")
+    {
+      edgemap_default[it->first] = 0.0;
+    }
+  }
+
+  return 0;
 }
 
@@ -249 +265 @@
     }
   }
+  for (std::map<std::string, double>::iterator it =
+      nodemap_default.begin(); it != nodemap_default.end(); ++it)
+  {
+    nodemap_default.erase(it);
+  }
+  for (std::map<std::string, double>::iterator it =
+      edgemap_default.begin(); it != edgemap_default.end(); ++it)
+  {
+    edgemap_default.erase(it);
+  }
   graph.clear();
   file_name = "";