1.1 --- a/graph_displayer_canvas.h	Thu Jul 28 19:09:39 2005 +0000
     1.2 +++ b/graph_displayer_canvas.h	Fri Jul 29 12:01:37 2005 +0000
     1.3 @@ -5,10 +5,10 @@
     1.4  
     1.5  class GraphDisplayerCanvas;
     1.6  
     1.7 -#include <all_include.h>
     1.8 -#include <map_win.h>
     1.9 -#include <mapstorage.h>
    1.10 -#include <broken_edge.h>
    1.11 +#include "all_include.h"
    1.12 +#include "mapstorage.h"
    1.13 +#include "broken_edge.h"
    1.14 +#include "map_win.h"
    1.15  #include <libgnomecanvasmm.h>
    1.16  #include <libgnomecanvasmm/polygon.h>
    1.17  
    1.18 @@ -18,7 +18,7 @@
    1.19    typedef Gnome::Canvas::CanvasAA Parent;
    1.20  
    1.21  public:
    1.22 -  GraphDisplayerCanvas(Graph &, CoordinatesMap &, MapStorage &, MapWin *);
    1.23 +  GraphDisplayerCanvas(MapStorage &, MapWin &);
    1.24    virtual ~GraphDisplayerCanvas();
    1.25  
    1.26    ///Changes the linewidth attribute according to the given map.
    1.27 @@ -109,6 +109,9 @@
    1.28    ///\return the actual tool in hand
    1.29    int getActualTool();
    1.30  
    1.31 +  void drawGraph();
    1.32 +  void clear();
    1.33 +
    1.34    ///creates a new Nodemap
    1.35    int addNewNodeMap(double,std::string);
    1.36    ///creates a new Edgemap
    1.37 @@ -124,9 +127,6 @@
    1.38  
    1.39  private:
    1.40  
    1.41 -  ///The graph, on which we work
    1.42 -  Graph & g;
    1.43 -
    1.44    ///Map of nodes of graph
    1.45    Graph::NodeMap<Gnome::Canvas::Ellipse *> nodesmap;
    1.46  
    1.47 @@ -175,7 +175,7 @@
    1.48    static const int zoom_step = 5;
    1.49  
    1.50    ///We need to store mapwin, to be able to ask the appropriate values for properties of new items.
    1.51 -  MapWin * mapwin;
    1.52 +  MapWin & mapwin;
    1.53  
    1.54  };
    1.55