1.1 --- a/graph_displayer_canvas-event.cc	Wed Aug 17 15:20:18 2005 +0000
     1.2 +++ b/graph_displayer_canvas-event.cc	Thu Aug 18 13:33:49 2005 +0000
     1.3 @@ -225,7 +225,7 @@
     1.4  
     1.5        isbutton=1;
     1.6  
     1.7 -      active_node=NodeIt(mapstorage.graph,mapstorage.graph.addNode());
     1.8 +      active_node=mapstorage.graph.addNode();
     1.9  
    1.10        //initiating values corresponding to new node in maps
    1.11  
    1.12 @@ -339,7 +339,7 @@
    1.13  	    {
    1.14  	      window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
    1.15  	      target_item=(get_item_at(clicked_x, clicked_y));
    1.16 -	      Graph::NodeIt target_node=INVALID;
    1.17 +	      Node target_node=INVALID;
    1.18  	      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
    1.19  		{
    1.20  		  if(nodesmap[i]==target_item)
    1.21 @@ -354,14 +354,17 @@
    1.22  		    {
    1.23            mapstorage.modified = true;
    1.24  
    1.25 -		      *(nodesmap[target_node]) << Gnome::Canvas::Properties::fill_color("red");
    1.26 +		      *(nodesmap[target_node]) <<
    1.27 +			Gnome::Canvas::Properties::fill_color("red");
    1.28  
    1.29  		      //creating new edge
    1.30 -		      active_edge=EdgeIt(mapstorage.graph,mapstorage.graph.addEdge(active_node, target_node));
    1.31 +		      active_edge=mapstorage.graph.addEdge(active_node,
    1.32 +							   target_node);
    1.33  
    1.34  		      //initiating values corresponding to new edge in maps
    1.35  		      mapstorage.initMapsForEdge(active_edge);
    1.36 -                      (*mapstorage.edgemap_storage["id"])[active_edge] = mapstorage.graph.id(active_edge);
    1.37 +                      (*mapstorage.edgemap_storage["id"])[active_edge] = 
    1.38 +			mapstorage.graph.id(active_edge);
    1.39  	  
    1.40  		      //calculating coordinates of new edge
    1.41  		      Gnome::Canvas::Points coos;
    1.42 @@ -555,7 +558,7 @@
    1.43  	  //If the click happened on an edge we place the entrywidget there and fill in the value of the activated map at that edge.
    1.44  	  {
    1.45  	    //for determine, whether it was an edge
    1.46 -	    Graph::EdgeIt clicked_edge=INVALID;
    1.47 +	    Edge clicked_edge=INVALID;
    1.48  
    1.49  	    //find the activated item between texts
    1.50  	    active_item=(get_item_at(e->button.x, e->button.y));
    1.51 @@ -677,7 +680,7 @@
    1.52  	  //If the click happened on an edge we place the entrywidget there and fill in the value of the activated map at that edge.
    1.53  	  {
    1.54  	    //for determine, whether it was a node
    1.55 -	    Graph::NodeIt clicked_node=INVALID;
    1.56 +	    Node clicked_node=INVALID;
    1.57  
    1.58  	    //find the activated item between texts
    1.59  	    active_item=(get_item_at(e->button.x, e->button.y));
    1.60 @@ -849,21 +852,14 @@
    1.61    return false;
    1.62  }
    1.63  
    1.64 -void GraphDisplayerCanvas::deleteItem(NodeIt node_to_delete)
    1.65 +void GraphDisplayerCanvas::deleteItem(Node node_to_delete)
    1.66  {
    1.67    delete(nodetextmap[node_to_delete]);
    1.68    delete(nodesmap[node_to_delete]);
    1.69    mapstorage.graph.erase(node_to_delete);
    1.70  }
    1.71  
    1.72 -void GraphDisplayerCanvas::deleteItem(EdgeIt edge_to_delete)
    1.73 -{
    1.74 -  delete(edgetextmap[edge_to_delete]);
    1.75 -  delete(edgesmap[edge_to_delete]);
    1.76 -  mapstorage.graph.erase(edge_to_delete);
    1.77 -}
    1.78 -
    1.79 -void GraphDisplayerCanvas::deleteItem(Graph::Edge edge_to_delete)
    1.80 +void GraphDisplayerCanvas::deleteItem(Edge edge_to_delete)
    1.81  {
    1.82    delete(edgetextmap[edge_to_delete]);
    1.83    delete(edgesmap[edge_to_delete]);