matteo/sgpemv2
matteo/sgpemv2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- updated simulation_widget

Browse source 
- now hinerith from SimulationObserver and HistoryObserver
- updated gui_builder and test-simulation_widget accordling



git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@925 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
paolo 2006-08-21 17:50:44 +00:00
parent 2a408b82af
commit ba00eac7f0
4 changed files with 61 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/testsuite/test-simulation_widget.cc
View file

@ -405,7 +405,7 @@ TestWidget::change_scaling_mode()
class MainWindow : public Gtk::Window
{
public:
MainWindow();
MainWindow(Simulation& simulation);
virtual ~MainWindow();
protected:
@ -416,7 +416,7 @@ protected:
virtual bool on_timer_timeout();
// TestWidget _test_widget;
SimulationWidget _simulation_widget;
SimulationWidget _simulation_widget;
Gtk::Button _start_button;
Gtk::Button _stop_button;
Gtk::Button _pause_button;
@ -428,10 +428,14 @@ protected:
};
MainWindow::MainWindow() : _start_button("Start"), _stop_button("Stop"),
_pause_button("Pause"), _runmode_button("Continue")
MainWindow::MainWindow(Simulation& simulation)
: _start_button("Start"),
_stop_button("Stop"),
_pause_button("Pause"),
_runmode_button("Continue"),
_simulation_widget(simulation),
_sim_state(Simulation::state_stopped)
{
_sim_state = Simulation::state_stopped;
// This just sets the title of our new window.
set_title("Simulation Widget Test");
add(_main_box);
@ -608,7 +612,7 @@ main(int argc, char** argv)
info << "END environment dump \n";
info << "simulation state: " << get_simulation_state_name(simu.get_state()) << endl;
MainWindow win;
MainWindow win(simu);
win.set_border_width(10);
win.resize (400, 200);
@ -671,7 +675,25 @@ void fillHistory(History &hist)
Request& req1 = hist.add_request(p1_t1, 3);
// add a sub request - Request, resource_key, duration, places
SubRequest& req1_sub1 = hist.add_subrequest(req1, respair.first, 5);
SubRequest& req1_sub1 = hist.add_subrequest(req1, respair.first, 6);
// add a request - Thread, time
Request& req2 = hist.add_request(p2_t1, 1);
// add a sub request - Request, resource_key, duration, places
SubRequest& req2_sub1 = hist.add_subrequest(req2, respair.first, 4);
// add a request - Thread, time
Request& req3 = hist.add_request(p3_t1, 0);
// add a sub request - Request, resource_key, duration, places
SubRequest& req3_sub1 = hist.add_subrequest(req3, respair.first, 5);
// add a request - Thread, time
Request& req3bis = hist.add_request(p3_t1, 7);
// add a sub request - Request, resource_key, duration, places
SubRequest& req3bis_sub1 = hist.add_subrequest(req3bis, respair.first, 5);
}