Changeset 46:121452cc4096 in glemon-0.x

Timestamp:

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

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

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

Message:

No maps with the same name can be added.

Files:

• graph_displayer_canvas-event.cc (modified) (3 diffs)
• graph_displayer_canvas.h (modified) (1 diff)
• mapstorage.cc (modified) (1 diff)
• new_map_win.cc (modified) (1 diff)

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;
+}
+

graph_displayer_canvas.h

@@ -111 +111 @@
 
   ///creates a new Nodemap
-  void addNewNodeMap(double,std::string);
+  int addNewNodeMap(double,std::string);
   ///creates a new Edgemap
-  void addNewEdgeMap(double,std::string);
+  int addNewEdgeMap(double,std::string);
 
 private:

mapstorage.cc

@@ -7 +7 @@
 int MapStorage::addNodeMap(const std::string & name, Graph::NodeMap<double> *nodemap)
 {
-  nodemap_storage[name]=nodemap;
-  return 0;
+  if( nodemap_storage.find(name) == nodemap_storage.end() )
+    {
+      nodemap_storage[name]=nodemap;
+      return 0;
+    }
+  return 1;
 }
 
 int MapStorage::addEdgeMap(const std::string & name, Graph::EdgeMap<double> *edgemap)
 {
-  edgemap_storage[name]=edgemap;
-  return 0;
+  if( edgemap_storage.find(name) == edgemap_storage.end() )
+    {
+      edgemap_storage[name]=edgemap;
+      return 0;
+    }
+  return 1;
 }
 

new_map_win.cc

@@ -90 +90 @@
   if((point_num<=1)&&(valid_double)&&(!mapname.empty()))
     {
+      int abortion=0;
       if(edge.get_active())
         {
-          gdc.addNewEdgeMap(def_val,mapname);
+          abortion=gdc.addNewEdgeMap(def_val,mapname);
         }
       else
         {
-          gdc.addNewNodeMap(def_val,mapname);
+          abortion=gdc.addNewNodeMap(def_val,mapname);
         }
-      name.set_text("");
-      default_value.set_text("0");
-      hide();
+      if(!abortion)
+        {
+          name.set_text("");
+          default_value.set_text("0");
+          hide();
+        }
     }
 }