1.1 --- a/nbtab.cc Mon Oct 30 13:08:04 2006 +0000
1.2 +++ b/nbtab.cc Mon Oct 30 14:57:48 2006 +0000
1.3 @@ -235,16 +235,18 @@
1.4 {
1.5 double attraction, propulsation;
1.6 int iterations;
1.7 - gd_canvas->get_design_data(attraction, propulsation, iterations);
1.8 + mapstorage.get_design_data(attraction, propulsation, iterations);
1.9 designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations, *this);
1.10
1.11 - designwin->signal_attraction().connect(sigc::mem_fun(*this, &NoteBookTab::attraction_ch));
1.12 - designwin->signal_propulsation().connect(sigc::mem_fun(*this, &NoteBookTab::propulsation_ch));
1.13 - designwin->signal_iteration().connect(sigc::mem_fun(*gd_canvas, &GraphDisplayerCanvas::set_iteration));
1.14 + designwin->signal_attraction().connect(sigc::mem_fun(mapstorage, &MapStorage::set_attraction));
1.15 + designwin->signal_propulsation().connect(sigc::mem_fun(mapstorage, &MapStorage::set_propulsation));
1.16 + designwin->signal_iteration().connect(sigc::mem_fun(mapstorage, &MapStorage::set_iteration));
1.17 designwin->close_run().connect(sigc::mem_fun(*gd_canvas, &GraphDisplayerCanvas::reDesignGraph));
1.18
1.19 designwin->signal_delete_event().connect(sigc::mem_fun(*this, &NoteBookTab::closeDesignWin));
1.20
1.21 + mapst2designwin=mapstorage.signal_design_win_ch().connect(sigc::mem_fun(*designwin, &DesignWin::set_data));
1.22 +
1.23 designwin->show();
1.24 designwinexists=true;
1.25 }
1.26 @@ -262,6 +264,7 @@
1.27 if(e->type==GDK_DELETE)
1.28 {
1.29 designwinexists=false;
1.30 + mapst2designwin.disconnect();
1.31 delete designwin;
1.32 }
1.33 }
1.34 @@ -286,21 +289,6 @@
1.35 gd_canvas->reDesignGraph();
1.36 }
1.37
1.38 -void NoteBookTab::attraction_ch(double v)
1.39 -{
1.40 - gd_canvas->set_attraction(v);
1.41 -}
1.42 -
1.43 -void NoteBookTab::propulsation_ch(double v)
1.44 -{
1.45 - gd_canvas->set_propulsation(v);
1.46 -}
1.47 -
1.48 -void NoteBookTab::iteration_ch(int v)
1.49 -{
1.50 - gd_canvas->set_iteration(v);
1.51 -}
1.52 -
1.53 void NoteBookTab::active_maps_needed()
1.54 {
1.55 mapstorage.broadcastActiveMaps();