1.1 --- a/mapstorage.h Mon Oct 30 13:08:04 2006 +0000
1.2 +++ b/mapstorage.h Mon Oct 30 14:57:48 2006 +0000
1.3 @@ -82,14 +82,13 @@
1.4 bool arrow_pos_read_ok;
1.5
1.6 protected:
1.7 - /// type of the signal emitted if the visualization of the maps might have to be updated.
1.8
1.9 + /// Signal emitted on any change made on map values
1.10 +
1.11 + /// Signal emitted if the visualization of the maps might have to be updated.
1.12 /// bool shows us whether the changed map is edge or nodemap.
1.13 /// int tells us the refreshed property
1.14 - typedef sigc::signal<void, bool, int> Signal_Prop;
1.15 -
1.16 - /// Signal emitted on any change made on map values
1.17 - Signal_Prop signal_prop;
1.18 + sigc::signal<void, bool, int> signal_prop;
1.19
1.20 /// Signal emitted in the case of nodemap addition
1.21
1.22 @@ -106,6 +105,18 @@
1.23 /// Signal emitted, when entry in \ref MapWin should be changed.
1.24 sigc::signal<void, bool, int, std::string> signal_map_win;
1.25
1.26 + /// Signal emitted, when entry in \ref DesignWin should be changed.
1.27 + sigc::signal<void, double, double, int> signal_design_win;
1.28 +
1.29 + ///Iteration number during graph design
1.30 + int iterations;
1.31 +
1.32 + ///Attraction factor during graph design
1.33 + double attraction;
1.34 +
1.35 + ///Propulsation factor during graph design
1.36 + double propulsation;
1.37 +
1.38 public:
1.39 ///Constructor of MapStorage.
1.40
1.41 @@ -152,7 +163,7 @@
1.42 std::vector<std::string> getNodeMapList();
1.43
1.44 ///returns \ref signal_prop to be able to connect functions to it
1.45 - Signal_Prop signal_prop_ch();
1.46 + sigc::signal<void, bool, int> signal_prop_ch();
1.47
1.48 ///returns \ref signal_node_map to be able to connect functions to it
1.49 sigc::signal<void, std::string> signal_node_map_ch(){return signal_node_map;};
1.50 @@ -163,6 +174,9 @@
1.51 ///returns \ref signal_map_win to be able to connect functions to it
1.52 sigc::signal<void, bool, int, std::string> signal_map_win_ch(){return signal_map_win;};
1.53
1.54 + ///returns \ref signal_design_win to be able to connect functions to it
1.55 + sigc::signal<void, double, double, int> signal_design_win_ch(){return signal_design_win;};
1.56 +
1.57 ///Adds given map to storage.
1.58
1.59 ///A name and the map itself has to be provided.
1.60 @@ -261,6 +275,13 @@
1.61 void clear();
1.62
1.63 void ArrowPosReadOK();
1.64 +
1.65 + void get_design_data(double &, double &, int &);
1.66 + void set_attraction(double);
1.67 + void set_propulsation(double);
1.68 + void set_iteration(int);
1.69 +
1.70 + void redesign_data_changed();
1.71 };
1.72
1.73 #endif //MAPSTORAGE_H