Changeset 1651:e40c41eae31f in lemon-0.x

Timestamp:

08/26/05 13:37:41 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

No comment.

Location:

gui

Files:

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

gui/all_include.h

@@ -43 +43 @@
 typedef Graph::Edge Edge;
 typedef Graph::EdgeIt EdgeIt;
+typedef Graph::InEdgeIt InEdgeIt;
+typedef Graph::OutEdgeIt OutEdgeIt;
 typedef Graph::NodeIt NodeIt;
 

gui/graph_displayer_canvas-event.cc

@@ -142 +142 @@
         clicked_y=new_y;
 
-        //all the edges connected to the moved point has to be redrawn
-        EdgeIt ei;
-
-        mapstorage.graph.firstOut(ei,active_node);
-
-        for(;ei!=INVALID;mapstorage.graph.nextOut(ei))
+
+        for(OutEdgeIt ei(mapstorage.graph,active_node);ei!=INVALID;++ei)
         {
             Gnome::Canvas::Points coos;
@@ -174 +170 @@
         }
 
-        mapstorage.graph.firstIn(ei,active_node);
-        for(;ei!=INVALID;mapstorage.graph.nextIn(ei))
+        for(InEdgeIt ei(mapstorage.graph,active_node);ei!=INVALID;++ei)
         {
             Gnome::Canvas::Points coos;
@@ -484 +479 @@
                   mapstorage.modified = true;
 
-                  //collecting edges to delete
-                  EdgeIt e;
                   std::set<Graph::Edge> edges_to_delete;
 
-                  mapstorage.graph.firstOut(e,active_node);
-                  for(;e!=INVALID;mapstorage.graph.nextOut(e))
+                  for(OutEdgeIt e(mapstorage.graph,active_node);e!=INVALID;++e)
                     {
                       edges_to_delete.insert(e);
                     }
-
-                  mapstorage.graph.firstIn(e,active_node);
-                  for(;e!=INVALID;mapstorage.graph.nextIn(e))
+                  
+                  for(InEdgeIt e(mapstorage.graph,active_node);e!=INVALID;++e)
                     {
                       edges_to_delete.insert(e);
                     }
-
+                  
                   //deleting collected edges
-                  for(std::set<Graph::Edge>::iterator edge_set_it=edges_to_delete.begin();edge_set_it!=edges_to_delete.end();edge_set_it++)
+                  for(std::set<Graph::Edge>::iterator
+                        edge_set_it=edges_to_delete.begin();
+                      edge_set_it!=edges_to_delete.end();
+                      ++edge_set_it)
                     {
                       deleteItem(*edge_set_it);