Changeset 151:72f1c33f89d4 in glemon-0.x for mapstorage.cc

Timestamp:

09/25/06 09:54:00 (18 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@2953

Message:

LoopEdge? improvements.

File:

• mapstorage.cc (modified) (2 diffs)

mapstorage.cc

@@ -320 +320 @@
     for (EdgeIt e(graph); e != INVALID; ++e)
     {
-      arrow_pos.set(e, (coords[graph.source(e)] + coords[graph.target(e)]) / 2.0);
+      if (graph.source(e) == graph.target(e))
+      {
+        arrow_pos.set(e, coords[graph.source(e)] + XY(0.0, 80.0));
+      }
+      else
+      {
+        arrow_pos.set(e, (coords[graph.source(e)] + coords[graph.target(e)]) / 2.0);
+      }
     }
   }
@@ -365 +372 @@
       else
         edgemap_default["label"] = 1.0;
-    }
-  }
-
-  // filter loop edges
-  for (EdgeIt e(graph); e != INVALID; ++e)
-  {
-    if (graph.source(e) == graph.target(e))
-    {
-      std::cerr << "Removed loop edge " << (*edgemap_storage["label"])[e]
-        << " (from " << (*nodemap_storage["label"])[graph.source(e)]
-        << ", to " << (*nodemap_storage["label"])[graph.target(e)] << ")."
-        << std::endl;
-
-      graph.erase(e);
     }
   }