Changeset 1597:15b51d278bf0 in lemon-0.x for gui/graph_displayer_canvas-event.cc

Timestamp:

07/27/05 13:35:13 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

No maps with the same name can be added.

File:

• gui/graph_displayer_canvas-event.cc (modified) (3 diffs)

gui/graph_displayer_canvas-event.cc

@@ -855 +855 @@
 }
 
-void GraphDisplayerCanvas::addNewEdgeMap(double default_value, std::string mapname)
+int GraphDisplayerCanvas::addNewEdgeMap(double default_value, std::string mapname)
 {
   //create the new map
   Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (g,default_value);
-  mapstorage.addEdgeMap(mapname,emptr);
+
+  //if addition was not successful addEdgeMap returns one.
+  //cause can be that there is already a map named like the new one
+  if(mapstorage.addEdgeMap(mapname,emptr))
+    {
+      return 1;
+    }
+
 
   //add it to the list of the displayable maps
@@ -866 +873 @@
   //display it
   changeEdgeText(mapname);
-}
-
-void GraphDisplayerCanvas::addNewNodeMap(double default_value, std::string mapname)
+
+  return 0;
+}
+
+int GraphDisplayerCanvas::addNewNodeMap(double default_value, std::string mapname)
 {
   //create the new map
   Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (g,default_value);
-  mapstorage.addNodeMap(mapname,emptr);
+
+  //if addition was not successful addNodeMap returns one.
+  //cause can be that there is already a map named like the new one
+  if(mapstorage.addNodeMap(mapname,emptr))
+    {
+      return 1;
+    }
 
   //add it to the list of the displayable maps
@@ -879 +894 @@
   //display it
   changeNodeText(mapname);
-}
-
+
+  return 0;
+}
+