Changeset 62:80eefca04b1e in glemon-0.x for graph_displayer_canvas-event.cc

Timestamp:

08/18/05 15:33:49 (19 years ago)

Author:

Alpar Juttner

Branch:

gui

Phase:

public

Convert:

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

Message:

• The number of gcc-4.0 warnings has significantly decreases.
• Some code clean-up in gui

File:

• graph_displayer_canvas-event.cc (modified) (8 diffs)

graph_displayer_canvas-event.cc

@@ -226 +226 @@
       isbutton=1;
 
-      active_node=NodeIt(mapstorage.graph,mapstorage.graph.addNode());
+      active_node=mapstorage.graph.addNode();
 
       //initiating values corresponding to new node in maps
@@ -340 +340 @@
               window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
               target_item=(get_item_at(clicked_x, clicked_y));
-              Graph::NodeIt target_node=INVALID;
+              Node target_node=INVALID;
               for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
                 {
@@ -355 +355 @@
           mapstorage.modified = true;
 
-                      *(nodesmap[target_node]) << Gnome::Canvas::Properties::fill_color("red");
+                      *(nodesmap[target_node]) <<
+                        Gnome::Canvas::Properties::fill_color("red");
 
                       //creating new edge
-                      active_edge=EdgeIt(mapstorage.graph,mapstorage.graph.addEdge(active_node, target_node));
+                      active_edge=mapstorage.graph.addEdge(active_node,
+                                                           target_node);
 
                       //initiating values corresponding to new edge in maps
                       mapstorage.initMapsForEdge(active_edge);
-                      (*mapstorage.edgemap_storage["id"])[active_edge] = mapstorage.graph.id(active_edge);
+                      (*mapstorage.edgemap_storage["id"])[active_edge] = 
+                        mapstorage.graph.id(active_edge);
           
                       //calculating coordinates of new edge
@@ -556 +559 @@
           {
             //for determine, whether it was an edge
-            Graph::EdgeIt clicked_edge=INVALID;
+            Edge clicked_edge=INVALID;
 
             //find the activated item between texts
@@ -678 +681 @@
           {
             //for determine, whether it was a node
-            Graph::NodeIt clicked_node=INVALID;
+            Node clicked_node=INVALID;
 
             //find the activated item between texts
@@ -850 +853 @@
 }
 
-void GraphDisplayerCanvas::deleteItem(NodeIt node_to_delete)
+void GraphDisplayerCanvas::deleteItem(Node node_to_delete)
 {
   delete(nodetextmap[node_to_delete]);
@@ -857 +860 @@
 }
 
-void GraphDisplayerCanvas::deleteItem(EdgeIt edge_to_delete)
+void GraphDisplayerCanvas::deleteItem(Edge edge_to_delete)
 {
   delete(edgetextmap[edge_to_delete]);
@@ -864 +867 @@
 }
 
-void GraphDisplayerCanvas::deleteItem(Graph::Edge edge_to_delete)
-{
-  delete(edgetextmap[edge_to_delete]);
-  delete(edgesmap[edge_to_delete]);
-  mapstorage.graph.erase(edge_to_delete);
-}
-
 void GraphDisplayerCanvas::textReposition(xy<double> new_place)
 {