Changeset 2063:9535436aaa9f in lemon-0.x

Timestamp:

04/19/06 00:59:33 (19 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

id->label

Location:

gui

Files:

• graph_displayer_canvas-event.cc (modified) (4 diffs)
• gui_reader.cc (modified) (1 diff)
• gui_writer.cc (modified) (1 diff)
• mapstorage.cc (modified) (12 diffs)

gui/graph_displayer_canvas-event.cc

@@ -332 +332 @@
       }
       // increment the id map's default value
-      (mytab.mapstorage).nodemap_default["id"] += 1.0;
+      (mytab.mapstorage).nodemap_default["label"] += 1.0;
 
       nodesmap[active_node]=new Gnome::Canvas::Ellipse(displayed_graph,
@@ -442 +442 @@
               }
               // increment the id map's default value
-              (mytab.mapstorage).edgemap_default["id"] += 1.0;
+              (mytab.mapstorage).edgemap_default["label"] += 1.0;
 
               //calculating coordinates of new edge
@@ -674 +674 @@
           {
             // the id map is not editable
-            if (edgemap_to_edit == "id") return 0;
+            if (edgemap_to_edit == "label") return 0;
 
             //and there is activated map
@@ -762 +762 @@
           {
             // the id map is not editable
-            if (nodemap_to_edit == "id") return 0;
+            if (nodemap_to_edit == "label") return 0;
 
             //and there is activated map

gui/gui_reader.cc

@@ -23 +23 @@
   for (EdgeIt e(mapstorage->graph); e != INVALID; ++e)
   {
-    int edgeid = (int)(*mapstorage->edgemap_storage["id"])[e];
+    int edgeid = (int)(*mapstorage->edgemap_storage["label"])[e];
     mapstorage->arrow_pos.set(e, m[edgeid]);
   }

gui/gui_writer.cc

@@ -16 +16 @@
   for (EdgeIt e(mapstorage->graph); e != INVALID; ++e)
   {
-    int edgeid = (int)(*(mapstorage->edgemap_storage["id"]))[e];
+    int edgeid = (int)(*(mapstorage->edgemap_storage["label"]))[e];
     m[edgeid] = mapstorage->arrow_pos[e];
   }

gui/mapstorage.cc

@@ -18 +18 @@
   arrow_pos.setYMap(*edgemap_storage["arrow_pos_y"]);
 
-  nodemap_storage["id"] = new Graph::NodeMap<double>(graph);
-  edgemap_storage["id"] = new Graph::EdgeMap<double>(graph);
-
-  nodemap_default["id"] = 1.0;
-  edgemap_default["id"] = 1.0;
+  nodemap_storage["label"] = new Graph::NodeMap<double>(graph);
+  edgemap_storage["label"] = new Graph::EdgeMap<double>(graph);
+
+  nodemap_default["label"] = 1.0;
+  edgemap_default["label"] = 1.0;
 
   active_nodemaps.resize(NODE_PROPERTY_NUM);
@@ -252 +252 @@
         //std::cout << "read Y nodemap" << std::endl;
       }
-      else if (*it == "id")
+      else if (*it == "label")
       {
         //std::cout << "read id nodemap" << std::endl;
@@ -266 +266 @@
         it != edgeMapNames.end(); ++it)
     {
-      if (*it == "id")
+      if (*it == "label")
       {
         //std::cout << "read id edgemap" << std::endl;
@@ -288 +288 @@
   if (!read_edge_id)
   {
-    edgemap_storage["id"] = new Graph::EdgeMap<double>(graph);
+    edgemap_storage["label"] = new Graph::EdgeMap<double>(graph);
     int i = 1;
     for (EdgeIt e(graph); e != INVALID; ++e)
     {
-      (*edgemap_storage["id"])[e] = i++;
+      (*edgemap_storage["label"])[e] = i++;
     }
   }
@@ -327 +327 @@
       nodemap_storage.begin(); it != nodemap_storage.end(); ++it)
   {
-    if ((it->first != "id") &&
+    if ((it->first != "label") &&
         (it->first != "coordiantes_x") &&
         (it->first != "coordinates_y"))
@@ -333 +333 @@
       nodemap_default[it->first] = 0.0;
     }
-    else if (it->first == "id")
+    else if (it->first == "label")
     {
       NodeIt n(graph);
-      double max = (*nodemap_storage["id"])[n];
+      double max = (*nodemap_storage["label"])[n];
       for (; n != INVALID; ++n)
       {
-        if ((*nodemap_storage["id"])[n] > max)
-          max = (*nodemap_storage["id"])[n];
-      }
-      nodemap_default["id"] = max + 1.0;
+        if ((*nodemap_storage["label"])[n] > max)
+          max = (*nodemap_storage["label"])[n];
+      }
+      nodemap_default["label"] = max + 1.0;
     }
   }
@@ -348 +348 @@
       edgemap_storage.begin(); it != edgemap_storage.end(); ++it)
   {
-    if (it->first != "id")
+    if (it->first != "label")
     {
       edgemap_default[it->first] = 0.0;
@@ -357 +357 @@
       for (EdgeIt e(graph); e != INVALID; ++e)
       {
-        if ((*edgemap_storage["id"])[e] > max)
-          max = (*edgemap_storage["id"])[e];
+        if ((*edgemap_storage["label"])[e] > max)
+          max = (*edgemap_storage["label"])[e];
       }
       if (max > std::numeric_limits<double>::min())
-        edgemap_default["id"] = max + 1.0;
+        edgemap_default["label"] = max + 1.0;
       else
-        edgemap_default["id"] = 1.0;
+        edgemap_default["label"] = 1.0;
     }
   }
@@ -401 +401 @@
     if ((it->first != "coordinates_x") &&
         (it->first != "coordinates_y") &&
-        (it->first != "id"))
+        (it->first != "label"))
     {
       delete it->second;
@@ -410 +410 @@
       edgemap_storage.begin(); it != edgemap_storage.end(); ++it)
   {
-    if ((it->first != "id") &&
+    if ((it->first != "label") &&
         (it->first != "arrow_pos_x") &&
         (it->first != "arrow_pos_y"))
@@ -421 +421 @@
       nodemap_default.begin(); it != nodemap_default.end(); ++it)
   {
-    if (it->first != "id")
+    if (it->first != "label")
       nodemap_default.erase(it);
   }
@@ -427 +427 @@
       edgemap_default.begin(); it != edgemap_default.end(); ++it)
   {
-    if (it->first != "id")
+    if (it->first != "label")
       edgemap_default.erase(it);
   }