diff -r 9fc3d5170b24 -r 40f3006fba2e mapstorage.h --- a/mapstorage.h Mon Oct 30 13:08:04 2006 +0000 +++ b/mapstorage.h Mon Oct 30 14:57:48 2006 +0000 @@ -82,14 +82,13 @@ bool arrow_pos_read_ok; protected: - /// type of the signal emitted if the visualization of the maps might have to be updated. + /// Signal emitted on any change made on map values + + /// Signal emitted if the visualization of the maps might have to be updated. /// bool shows us whether the changed map is edge or nodemap. /// int tells us the refreshed property - typedef sigc::signal Signal_Prop; - - /// Signal emitted on any change made on map values - Signal_Prop signal_prop; + sigc::signal signal_prop; /// Signal emitted in the case of nodemap addition @@ -106,6 +105,18 @@ /// Signal emitted, when entry in \ref MapWin should be changed. sigc::signal signal_map_win; + /// Signal emitted, when entry in \ref DesignWin should be changed. + sigc::signal signal_design_win; + + ///Iteration number during graph design + int iterations; + + ///Attraction factor during graph design + double attraction; + + ///Propulsation factor during graph design + double propulsation; + public: ///Constructor of MapStorage. @@ -152,7 +163,7 @@ std::vector getNodeMapList(); ///returns \ref signal_prop to be able to connect functions to it - Signal_Prop signal_prop_ch(); + sigc::signal signal_prop_ch(); ///returns \ref signal_node_map to be able to connect functions to it sigc::signal signal_node_map_ch(){return signal_node_map;}; @@ -163,6 +174,9 @@ ///returns \ref signal_map_win to be able to connect functions to it sigc::signal signal_map_win_ch(){return signal_map_win;}; + ///returns \ref signal_design_win to be able to connect functions to it + sigc::signal signal_design_win_ch(){return signal_design_win;}; + ///Adds given map to storage. ///A name and the map itself has to be provided. @@ -261,6 +275,13 @@ void clear(); void ArrowPosReadOK(); + + void get_design_data(double &, double &, int &); + void set_attraction(double); + void set_propulsation(double); + void set_iteration(int); + + void redesign_data_changed(); }; #endif //MAPSTORAGE_H