X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=18258090c7755213f8cec76226418fd32e33ce27;hb=abed4a255060d5a233ec0ac2dd60af9132e29201;hp=fc93cf66b6076555a76129c745b1900f6dd78eff;hpb=b86f4adf319881697e6ecb46aaeaffe01d7b0a0a;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index fc93cf6..1825809 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -12,24 +12,19 @@ #include #include #include -#include #include #include -#include #include #include "libr2c2/driver.h" #include "libr2c2/trackcircuit.h" #include "libr2c2/tracktype.h" +#include "libr2c2/zone.h" #include "3d/allocation.h" #include "3d/path.h" #include "3d/track.h" #include "3d/trackcircuit.h" #include "3d/vehicle.h" #include "engineer.h" -#include "mainwindow.h" -#include "newtraindialog.h" -#include "traindialog.h" -#include "trainview.h" using namespace std; using namespace R2C2; @@ -40,33 +35,21 @@ Engineer::Engineer(int argc, char **argv): window(options.screen_w, options.screen_h, options.fullscreen), keyboard(window), mouse(window), - ui_res("data/r2c2.res"), - import_active(false), layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))), layout_3d(layout), server(0), main_view(layout_3d, window.get_width(), window.get_height()), + ui(*this, window, keyboard, mouse), emergency_blink_state(0) { // Setup GUI window.set_title("Railroad Engineer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); - root = new GLtk::Root(ui_res, &window, &keyboard, &mouse); - GLtk::Layout *root_layout = new GLtk::Layout; - root->set_layout(root_layout); - root_layout->set_margin(GLtk::Sides()); - root_arrangement = new GLtk::FloatingArrangement(*root_layout); mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::button_press), false)); mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::axis_motion), false)); - root->set_visible(true); - main_wnd = new MainWindow(*this); - root->add(*main_wnd); - main_wnd->autosize(); - main_wnd->set_position(0, window.get_height()-main_wnd->get_geometry().h); - - overlay = new Overlay3D(ui_res.get_default_font()); + overlay = new Overlay3D(ui.get_resources().get_default_font()); // Setup railroad control catalogue.add_source("data/Märklin/H0"); @@ -75,7 +58,6 @@ Engineer::Engineer(int argc, char **argv): if(layout.has_driver()) { Driver &driver = layout.get_driver(); - driver.signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected)); driver.signal_halt.connect(sigc::mem_fun(this, &Engineer::halt_event)); } layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added)); @@ -93,6 +75,9 @@ Engineer::Engineer(int argc, char **argv): if(FS::exists(options.state_fn)) DataFile::load(layout, options.state_fn); + if(FS::exists(options.uistate_fn)) + DataFile::load(ui, options.uistate_fn); + if(options.network) { server = new Server(layout); @@ -129,32 +114,16 @@ Engineer::~Engineer() FS::rename(options.state_fn+".tmp", options.state_fn); } + ui.save_state(options.uistate_fn); + layout.get_driver().halt(true); layout.get_driver().flush(); delete overlay; - delete root_arrangement; - delete root; delete server; } -void Engineer::set_status(const string &text) -{ - main_wnd->set_status_text(text); - status_timeout = Time::now()+10*Time::sec; -} - -void Engineer::add_train_view(TrainView &tv) -{ - train_views.push_back(&tv); -} - -void Engineer::remove_train_view(TrainView &tv) -{ - train_views.erase(remove(train_views.begin(), train_views.end(), &tv), train_views.end()); -} - int Engineer::main() { window.show(); @@ -170,19 +139,13 @@ void Engineer::tick() process_new_train(**i); new_trains.clear(); - layout.tick(); + layout.tick(options.sim_speed); layout_3d.tick(); event_disp.tick(Time::zero); - for(list::iterator i=train_views.begin(); i!=train_views.end(); ++i) - (*i)->prepare(); + ui.tick(); Time::TimeStamp t = Time::now(); - if(status_timeout && t>status_timeout) - { - main_wnd->set_status_text(string()); - status_timeout = Time::TimeStamp(); - } if(!emergencies.empty() && t>emergency_blink_timeout) { emergency_blink_state = (emergency_blink_state+1)%2; @@ -196,7 +159,7 @@ void Engineer::tick() main_view.render(); - root->render(); + ui.render(); window.swap_buffers(); } @@ -212,7 +175,7 @@ void Engineer::button_press(unsigned btn) { Block &block = track->get_block(); if(block.get_train() && block.get_train()->is_block_critical(block)) - set_status("Turnout is busy"); + ui.set_status("Turnout is busy"); else { unsigned paths = track->get_type().get_paths(); @@ -225,22 +188,28 @@ void Engineer::button_press(unsigned btn) ++i; } track->set_active_path(i); - set_status(format("Turnout %d", track->get_turnout_address())); + ui.set_status(format("Turnout %d", track->get_turnout_address())); } } - if(unsigned saddr = track->get_sensor_address()) + else if(unsigned saddr = track->get_sensor_address()) { if(options.simulate) layout.get_driver().set_sensor(saddr, !layout.get_driver().get_sensor(saddr)); - set_status(format("Sensor %d", saddr)); + ui.set_status(format("Sensor %d", saddr)); + } + else + { + const set &zones = layout.get_all(); + for(set::const_iterator i=zones.begin(); i!=zones.end(); ++i) + if((*i)->has_track(*track)) + { + ui.show_zone(**i); + break; + } } } else if(Vehicle *veh = dynamic_cast(obj)) - { - TrainDialog *dlg = new TrainDialog(*this, *veh->get_train()); - root->add(*dlg); - dlg->autosize(); - } + ui.show_train(*veh->get_train()); } } @@ -311,13 +280,15 @@ Object *Engineer::pick_object(const Vector &p) return layout.pick(Ray(start, ray.slice<3>(0))); } -void Engineer::emergency(Block *block, const string &msg) +void Engineer::emergency(Block *block, const string &) { - set_status(msg); - TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block); - tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f)); - tch3d->set_layer(2); - emergencies.push_back(tch3d); + if(block) + { + TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block); + tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f)); + tch3d->set_layer(2); + emergencies.push_back(tch3d); + } } void Engineer::halt_event(bool h) @@ -330,23 +301,6 @@ void Engineer::halt_event(bool h) } } -void Engineer::locomotive_detected(const Driver::DetectedLocomotive &loco) -{ - if(!import_active) - { - NewTrainDialog *dlg = new NewTrainDialog(*this); - dlg->prefill(loco); - dlg->signal_response.connect(sigc::mem_fun(this, &Engineer::import_finished)); - root->add(*dlg); - import_active = true; - } -} - -void Engineer::import_finished(int) -{ - import_active = false; -} - void Engineer::process_new_train(Train &train) { Vehicle3D &loco3d = layout_3d.get_3d(train.get_vehicle(0));