1.1 --- a/mapstorage.cc	Mon Oct 30 13:08:04 2006 +0000
     1.2 +++ b/mapstorage.cc	Mon Oct 30 14:57:48 2006 +0000
     1.3 @@ -23,7 +23,11 @@
     1.4  #include <cmath>
     1.5  #include <gtkmm.h>
     1.6  
     1.7 -MapStorage::MapStorage() : modified(false), file_name(""), arrow_pos_read_ok(false)
     1.8 +const double i_d=20;
     1.9 +const double a_d=0.05;
    1.10 +const double p_d=40000;
    1.11 +
    1.12 +MapStorage::MapStorage() : modified(false), file_name(""), arrow_pos_read_ok(false), iterations(i_d), attraction(a_d), propulsation(p_d)
    1.13  {
    1.14    nodemap_storage["coordinates_x"] = new Graph::NodeMap<double>(graph);
    1.15    coords.setXMap(*nodemap_storage["coordinates_x"]);
    1.16 @@ -148,7 +152,7 @@
    1.17    return nml;
    1.18  }
    1.19  
    1.20 -MapStorage::Signal_Prop MapStorage::signal_prop_ch()
    1.21 +sigc::signal<void, bool, int> MapStorage::signal_prop_ch()
    1.22  {
    1.23    return signal_prop;
    1.24  }
    1.25 @@ -485,6 +489,12 @@
    1.26        changeActiveMap(true, i, "");
    1.27        signal_map_win.emit(true, i, "");
    1.28      }
    1.29 +
    1.30 +  attraction=a_d;
    1.31 +  propulsation=p_d;
    1.32 +  iterations=i_d;
    1.33 +
    1.34 +  signal_design_win.emit(attraction, propulsation, iterations);
    1.35  }
    1.36  
    1.37  void MapStorage::ArrowPosReadOK()
    1.38 @@ -515,3 +525,30 @@
    1.39  	}
    1.40      }
    1.41  }
    1.42 +
    1.43 +void MapStorage::get_design_data(double & attraction_p, double & propulsation_p, int & iterations_p)
    1.44 +{
    1.45 +  attraction_p=attraction;
    1.46 +  propulsation_p=propulsation;
    1.47 +  iterations_p=iterations;
    1.48 +}
    1.49 +
    1.50 +void MapStorage::set_attraction(double attraction_p)
    1.51 +{
    1.52 +  attraction=attraction_p;
    1.53 +}
    1.54 +
    1.55 +void MapStorage::set_propulsation(double propulsation_p)
    1.56 +{
    1.57 +  propulsation=propulsation_p;
    1.58 +}
    1.59 +
    1.60 +void MapStorage::set_iteration(int iterations_p)
    1.61 +{
    1.62 +  iterations=iterations_p;
    1.63 +}
    1.64 +
    1.65 +void MapStorage::redesign_data_changed()
    1.66 +{
    1.67 +  signal_design_win.emit(attraction, propulsation, iterations);
    1.68 +}