diff -r 56eb90299693 -r adfdc2f70548 graph_displayer_canvas.h --- a/graph_displayer_canvas.h Wed Nov 23 16:24:59 2005 +0000 +++ b/graph_displayer_canvas.h Tue Nov 29 19:31:58 2005 +0000 @@ -6,8 +6,7 @@ class GraphDisplayerCanvas; #include "all_include.h" -#include "mapstorage.h" -#include "map_win.h" +#include "main_win.h" #include #include #include @@ -40,7 +39,7 @@ typedef Gnome::Canvas::CanvasAA Parent; public: - GraphDisplayerCanvas(MapStorage &, MapWin &, Gtk::Window *); + GraphDisplayerCanvas(MainWin &); virtual ~GraphDisplayerCanvas(); ///Changes the linewidth attribute according to the given map. @@ -73,6 +72,13 @@ int changeNodeText (std::string mapname, Node new_item=INVALID); int resetNodeText (Node new_item=INVALID); + void propertyChange(bool, int); + void propertyUpdate(Edge, int, int dummy=0); + void propertyUpdate(Node, int, int dummy=0); + + void propertyUpdate(Edge); + void propertyUpdate(Node); + ///Callback for 'ViewZoomIn' action. virtual void zoomIn(); ///Callback for 'ViewZoomOut' action. @@ -165,10 +171,6 @@ ///Group of graphical elements of displayed_graph Gnome::Canvas::Group displayed_graph; -public: - ///Here we store the maps that can be displayed through properties. - MapStorage & mapstorage; - private: ///Indicates whether the button of mouse is pressed or not int isbutton; @@ -193,14 +195,10 @@ static const int zoom_step = 5; -public: - ///We need to store mapwin, to be able to ask the appropriate values for properties of new items. - MapWin & mapwin; - private: - ///pointer to the parent window - Gtk::Window * parentwin; + ///reference to the parent window + MainWin & mainwin; };