Changeset 1646:2dd083dded66 in lemon-0.x for gui/graph_displayer_canvas-event.cc

Timestamp:

08/23/05 17:57:12 (19 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

• handle the case when there is no id map in the edgeset section
• do not use ListGraph?.id() to determine the id of a new node/edge

File:

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

gui/graph_displayer_canvas-event.cc

@@ -241 +241 @@
       mapstorage.coords.set(active_node, xy<double>(clicked_x, clicked_y));
 
-      // update id map
-      (*mapstorage.nodemap_storage["id"])[active_node] =
-        mapstorage.graph.id(active_node);
-
       // update all other maps
       for (std::map<std::string, Graph::NodeMap<double>*>::const_iterator it =
@@ -250 +246 @@
           mapstorage.nodemap_storage.end(); ++it)
       {
-        if ((it->first != "id") &&
-            (it->first != "coordinates_x") &&
-            (it->first != "coordiantes_y"))
+        if ((it->first != "coordinates_x") &&
+            (it->first != "coordinates_y"))
         {
           (*(it->second))[active_node] =
@@ -258 +253 @@
         }
       }
+      // increment the id map's default value
+      mapstorage.nodemap_default["id"] += 1.0;
 
       nodesmap[active_node]=new Gnome::Canvas::Ellipse(displayed_graph,
@@ -357 +354 @@
                   target_node);
 
-              // update id map
-              (*mapstorage.edgemap_storage["id"])[active_edge] = 
-                mapstorage.graph.id(active_edge);
- 
-              // update all other maps
+              // update maps
               for (std::map<std::string,
                   Graph::EdgeMap<double>*>::const_iterator it =
@@ -367 +360 @@
                   mapstorage.edgemap_storage.end(); ++it)
               {
-                if (it->first != "id")
-                {
-                  (*(it->second))[active_edge] =
-                    mapstorage.edgemap_default[it->first];
-                }
+                (*(it->second))[active_edge] =
+                  mapstorage.edgemap_default[it->first];
               }
+              // increment the id map's default value
+              mapstorage.edgemap_default["id"] += 1.0;
 
               //calculating coordinates of new edge