X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=6a35a06a3317992dae0075dece5eecfe72e43ddd;hb=e60fdcb9617f539b4d578d06ec46eb955c5e0624;hp=4b8ba70a1426940ecadffdd8d8c367959d2b5785;hpb=65cbaf88a03497df08243ac27354b0c0ea1f640b;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 4b8ba70..6a35a06 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -7,6 +7,7 @@ Distributed under the GPL #include #include +#include #include #include #include @@ -17,9 +18,11 @@ Distributed under the GPL #include #include #include +#include #include #include #include +#include #include "libmarklin/except.h" #include "libmarklin/tracktype.h" #include "engineer.h" @@ -37,18 +40,18 @@ Engineer::Engineer(int argc, char **argv): fullscreen(false), layout(catalogue), layout_3d(layout), - no_lighting(false), + server(0), placing_train(0), placing_block(0), placing_entry(0), - simulate(false), - train_prop(0), - train_prop_stale(false) + no_lighting(false), + simulate(false) { string res; - bool debug=false; - string device="/dev/ttyS0"; - unsigned quality=4; + bool debug = false; + string device = "/dev/ttyS0"; + unsigned quality = 4; + bool network = false; GetOpt getopt; getopt.add_option('r', "resolution", res, GetOpt::REQUIRED_ARG); @@ -57,6 +60,7 @@ Engineer::Engineer(int argc, char **argv): getopt.add_option('d', "device", device, GetOpt::REQUIRED_ARG); getopt.add_option('q', "quality", quality, GetOpt::REQUIRED_ARG); getopt.add_option('s', "simulate", simulate, GetOpt::NO_ARG); + getopt.add_option('n', "network", network, GetOpt::NO_ARG); getopt.add_option( "no-lighting", no_lighting, GetOpt::NO_ARG); getopt(argc, argv); @@ -64,8 +68,8 @@ Engineer::Engineer(int argc, char **argv): { if(RegMatch m=Regex("([1-9][0-9]*)x([1-9][0-9]*)").match(res)) { - screen_w=lexical_cast(m[1].str); - screen_h=lexical_cast(m[2].str); + screen_w = lexical_cast(m[1].str); + screen_h = lexical_cast(m[2].str); } else throw UsageError("Invalid resolution"); @@ -81,79 +85,72 @@ Engineer::Engineer(int argc, char **argv): DataFile::load(catalogue, "tracks.dat"); DataFile::load(catalogue, "locos.dat"); - const vector &args=getopt.get_args(); + const vector &args = getopt.get_args(); if(args.empty()) throw UsageError("No layout given"); DataFile::load(layout, args.front()); - trfc_mgr=new TrafficManager(control, layout); - trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved)); + trfc_mgr = new TrafficManager(control, layout); if(FS::exists("engineer.state")) DataFile::load(*trfc_mgr, "engineer.state"); + trfc_mgr->signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added)); + trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved)); + + if(network) + { + server = new Server(*trfc_mgr); + server->use_event_dispatcher(event_disp); + } - const map &sensors=control.get_sensors(); + const map &sensors = control.get_sensors(); for(map::const_iterator i=sensors.begin(); i!=sensors.end(); ++i) i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Engineer::sensor_event), i->second)); view_all(); + + catch_signal(SIGINT); + catch_signal(SIGTERM); + catch_signal(SIGSEGV); + catch_signal(SIGILL); + catch_signal(SIGFPE); + catch_signal(SIGABRT); } Engineer::~Engineer() { + const list &trains = trfc_mgr->get_trains(); + for(list::const_iterator i=trains.begin(); i!=trains.end(); ++i) + (*i)->set_speed(0); + + while(control.get_queue_length()) + control.tick(); + if(!simulate) trfc_mgr->save("engineer.state"); delete trfc_mgr; -} - -void Engineer::add_train() -{ - train_prop=new TrainProperties(*this, ui_res, 0); - root->add(*train_prop); - train_prop->signal_ok.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop)); - train_prop_stale=false; - train_prop->set_visible(true); -} - -Train *Engineer::add_train(const LocoType &type, unsigned addr) -{ - Locomotive *loco=new Locomotive(type, control, addr); - Train *train=new Train(*trfc_mgr, *loco); - train->set_name(format("Train %d", trfc_mgr->get_trains().size())); - - TrainPanel *tpanel=new TrainPanel(*this, ui_res, *train); - root->add(*tpanel); - int y=main_panel->get_geometry().y; - for(list::iterator i=train_panels.begin(); i!=train_panels.end(); ++i) - y-=(*i)->get_geometry().h; - tpanel->set_position(0, y-tpanel->get_geometry().h); - train_panels.push_back(tpanel); - tpanel->set_visible(true); - - place_train(*train); - - return train; + delete server; } void Engineer::place_train(Train &train) { - placing_train=&train; - placing_block=0; + placing_train = &train; + placing_block = 0; main_panel->set_status_text("Select location"); } int Engineer::main() { - dpy=new Graphics::Display; + dpy = new Graphics::Display; Graphics::WindowOptions wopt; - wopt.width=screen_w; - wopt.height=screen_h; - wopt.fullscreen=fullscreen; - wnd=new Graphics::Window(*dpy, wopt); + wopt.width = screen_w; + wopt.height = screen_h; + wopt.fullscreen = fullscreen; + wnd = new Graphics::Window(*dpy, wopt); Graphics::GLOptions glopt; - //glopt.multisample=4; - glc=new Graphics::GLContext(*wnd, glopt); + //glopt.multisample = 4; + glc = new Graphics::GLContext(*wnd, glopt); wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); wnd->signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press)); @@ -168,37 +165,42 @@ int Engineer::main() glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); DataFile::load(ui_res, "marklin.res"); - root=new GLtk::Root(ui_res, *wnd); + root = new GLtk::Root(ui_res, *wnd); root->set_visible(true); - list texs=ui_res.get_list(); + list texs = ui_res.get_list(); for(list::iterator i=texs.begin(); i!=texs.end(); ++i) { (*i)->set_min_filter(GL::NEAREST); (*i)->set_mag_filter(GL::NEAREST); } - main_panel=new MainPanel(*this, ui_res); + main_panel = new MainPanel(*this, ui_res); root->add(*main_panel); main_panel->set_position(0, screen_h-main_panel->get_geometry().h); main_panel->set_visible(true); - const list &trains=trfc_mgr->get_trains(); - int y=main_panel->get_geometry().y; + const list &trains = trfc_mgr->get_trains(); + int y = main_panel->get_geometry().y; for(list::const_iterator i=trains.begin(); i!=trains.end(); ++i) { - TrainPanel *tpanel=new TrainPanel(*this, ui_res, **i); + TrainPanel *tpanel = new TrainPanel(*this, ui_res, **i); root->add(*tpanel); tpanel->set_position(0, y-tpanel->get_geometry().h); train_panels.push_back(tpanel); tpanel->set_visible(true); - y-=tpanel->get_geometry().h; + y -= tpanel->get_geometry().h; } + const list &blocks = trfc_mgr->get_blocks(); + for(list::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + reset_block_color(**i); + wnd->show(); Application::main(); + delete root; delete glc; delete wnd; delete dpy; @@ -212,6 +214,7 @@ void Engineer::tick() control.tick(); trfc_mgr->tick(); + event_disp.tick(Time::zero); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); @@ -225,10 +228,10 @@ void Engineer::tick() glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); float params[4]; - params[0]=0; - params[1]=-0.2; - params[2]=1; - params[3]=0; + params[0] = 0; + params[1] = -0.2; + params[2] = 1; + params[3] = 0; glLightfv(GL_LIGHT0, GL_POSITION, params); } @@ -239,26 +242,26 @@ void Engineer::tick() glDisable(GL_LIGHTING); glColor4f(1, 1, 1, 1); - const list <racks=layout_3d.get_tracks(); + const list <racks = layout_3d.get_tracks(); for(list::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) { - Track &track=(*i)->get_track(); + Track &track = (*i)->get_track(); if(track.get_turnout_id()) { - Turnout &trnt=control.get_turnout(track.get_turnout_id()); - (*i)->render_route(trnt.get_route()); + Turnout &trnt = control.get_turnout(track.get_turnout_id()); + (*i)->render_path(trnt.get_path()); } else - (*i)->render_route(-1); + (*i)->render_path(-1); } if(placing_train && placing_block) { GL::push_matrix(); - const Marklin::Block::Endpoint &bep=placing_block->get_endpoints()[placing_entry]; - float rot=bep.track->get_endpoint_direction(bep.track_ep); - Point pos=bep.track->get_endpoint_position(bep.track_ep); + const Marklin::Block::Endpoint &bep = placing_block->get_endpoints()[placing_entry]; + float rot = bep.track->get_endpoint_direction(bep.track_ep); + Point pos = bep.track->get_endpoint_position(bep.track_ep); GL::translate(pos.x, pos.y, pos.z+0.03); GL::rotate(rot*180/M_PI+180, 0, 0, 1); @@ -267,25 +270,28 @@ void Engineer::tick() GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2)); imm.color(1.0f, 1.0f, 1.0f); imm.begin(GL::TRIANGLE_FAN); - imm.vertex(0.08, 0); - imm.vertex(0.05, 0.03); - imm.vertex(0.05, 0.01); - imm.vertex(0, 0.01); - imm.vertex(0, -0.01); - imm.vertex(0.05, -0.01); - imm.vertex(0.05, -0.03); + imm.vertex(0.08, 0); + imm.vertex(0.05, 0.03); + imm.vertex(0.05, 0.01); + imm.vertex(0, 0.01); + imm.vertex(0, -0.01); + imm.vertex(0.05, -0.01); + imm.vertex(0.05, -0.03); imm.end(); GL::pop_matrix(); } - const list &trains=trfc_mgr->get_trains(); + const list &trains = trfc_mgr->get_trains(); for(list::const_iterator i=trains.begin(); i!=trains.end(); ++i) { + if(!(*i)->is_placed()) + continue; + GL::PushMatrix _push; - const Point &tp=(*i)->get_position(); - GL::translate(tp.x, tp.y, 0.02); + const Point &tp = (*i)->get_position(); + GL::translate(tp.x, tp.y, tp.z+0.02); GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2)); imm.color(0.8f, 0.8f, 1.0f); imm.begin(GL::TRIANGLE_FAN); @@ -313,21 +319,9 @@ void Engineer::tick() root->render(); - if(train_prop_stale) - { - delete train_prop; - train_prop=0; - } - glc->swap_buffers(); } -void Engineer::key_press(unsigned key, unsigned mod, wchar_t ch) -{ - if(train_prop) - train_prop->key_press(key, mod, ch); -} - void Engineer::button_press(int x, int y, unsigned btn, unsigned) { if(placing_train) @@ -336,27 +330,27 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned) { set_block_color(*placing_block, GL::Color(1, 1, 1)); - placing_train->place(placing_block, placing_entry); - placing_train=0; + placing_train->place(*placing_block, placing_entry); + placing_train = 0; main_panel->set_status_text(string()); } else if(btn==3) { - const vector &endpoints=placing_block->get_endpoints(); - placing_entry=(placing_entry+1)%endpoints.size(); + const vector &endpoints = placing_block->get_endpoints(); + placing_entry = (placing_entry+1)%endpoints.size(); } } else { - Track3D *track=pick_track(x, screen_h-y-1); + Track3D *track = pick_track(x, screen_h-y-1); if(track) { if(unsigned tid=track->get_track().get_turnout_id()) { - Turnout &turnout=control.get_turnout(tid); + Turnout &turnout = control.get_turnout(tid); try { - turnout.set_route((turnout.get_route()+1)%track->get_track().get_type().get_n_routes()); + turnout.set_path((turnout.get_path()+1)%track->get_track().get_type().get_n_paths()); main_panel->set_status_text(format("Turnout %d switched", turnout.get_address())); } catch(const TurnoutBusy &e) @@ -368,7 +362,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned) { if(unsigned sid=track->get_track().get_sensor_id()) { - Sensor &sensor=control.get_sensor(sid); + Sensor &sensor = control.get_sensor(sid); control.signal_sensor_event.emit(sid, !sensor.get_state()); } } @@ -384,16 +378,16 @@ void Engineer::pointer_motion(int x, int y) { if(placing_train) { - Track3D *track=pick_track(x, screen_h-y-1); + Track3D *track = pick_track(x, screen_h-y-1); if(track && placing_train) { - Block &block=trfc_mgr->get_block_by_track(track->get_track()); + Block &block = trfc_mgr->get_block_by_track(track->get_track()); if(&block!=placing_block) { if(placing_block) reset_block_color(*placing_block); - placing_block=█ - placing_entry=0; + placing_block = █ + placing_entry = 0; set_block_color(*placing_block, GL::Color(0.5, 1, 0.7)); } } @@ -406,51 +400,51 @@ void Engineer::pointer_motion(int x, int y) void Engineer::view_all() { - const list &tracks=layout_3d.get_tracks(); + const list &tracks = layout_3d.get_tracks(); - cam_rot=0; - float best_height=-1; - float mid_x=0; - float mid_y=0; + cam_rot = 0; + float best_height = -1; + float mid_x = 0; + float mid_y = 0; for(float angle=0; angle::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { Point minp, maxp; (*i)->get_bounds(angle, minp, maxp); - min_x=min(min_x, minp.x); - max_x=max(max_x, maxp.x); - min_y=min(min_y, minp.y); - max_y=max(max_y, maxp.y); + min_x = min(min_x, minp.x); + max_x = max(max_x, maxp.x); + min_y = min(min_y, minp.y); + max_y = max(max_y, maxp.y); } - float width=max_x-min_x; - float height=max_y-min_y; - height=max(height, width); + float width = max_x-min_x; + float height = max_y-min_y; + height = max(height, width); if(height &tracks=block.get_tracks(); + const set &tracks = block.get_tracks(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) layout_3d.get_track(**i).set_color(color); } @@ -459,7 +453,7 @@ void Engineer::reset_block_color(const Block &block) { if(unsigned sid=block.get_sensor_id()) { - Sensor &sensor=control.get_sensor(sid); + Sensor &sensor = control.get_sensor(sid); if(sensor.get_state()) { set_block_color(block, GL::Color(1, 0.5, 0.3)); @@ -475,7 +469,7 @@ void Engineer::reset_block_color(const Block &block) void Engineer::sensor_event(bool, Sensor *sensor) { - const list &blocks=trfc_mgr->get_blocks(); + const list &blocks = trfc_mgr->get_blocks(); for(list::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) if((*i)->get_sensor_id()==sensor->get_address()) reset_block_color(**i); @@ -490,16 +484,16 @@ void Engineer::project_3d() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - float offset=200.0/screen_w*0.055228; + float offset = 200.0/screen_w*0.055228; glFrustum(-0.055228-offset, 0.055228-offset, -0.041421, 0.041421, 0.1, 10); glMatrixMode(GL_MODELVIEW); } Track3D *Engineer::pick_track(int x, int y) { - float xx=(static_cast(x-static_cast(screen_w)/2-100)/screen_h)*0.82843; - float yy=(static_cast(y)/screen_h-0.5)*0.82843; - float size=4.0/screen_h*0.82843; + float xx = (static_cast(x-static_cast(screen_w)/2-100)/screen_h)*0.82843; + float yy = (static_cast(y)/screen_h-0.5)*0.82843; + float size = 4.0/screen_h*0.82843; project_3d(); glLoadIdentity(); @@ -509,9 +503,34 @@ Track3D *Engineer::pick_track(int x, int y) return layout_3d.pick_track(xx, yy, size); } -void Engineer::dismiss_train_prop() +void Engineer::train_added(Train &train) { - train_prop_stale=true; + TrainPanel *tpanel = new TrainPanel(*this, ui_res, train); + root->add(*tpanel); + int y = main_panel->get_geometry().y; + for(list::iterator i=train_panels.begin(); i!=train_panels.end(); ++i) + y -= (*i)->get_geometry().h; + tpanel->set_position(0, y-tpanel->get_geometry().h); + train_panels.push_back(tpanel); + tpanel->set_visible(true); + + place_train(train); +} + +void Engineer::sighandler(int sig) +{ + if(sig==SIGSEGV || sig==SIGILL || sig==SIGFPE || sig==SIGABRT) + { + signal(sig, SIG_DFL); + IO::print(IO::cerr, "Fatal signal received, terminating\n"); + const map &locos = control.get_locomotives(); + for(map::const_iterator i=locos.begin(); i!=locos.end(); ++i) + i->second->set_speed(0); + control.flush(); + raise(sig); + } + else if(sig==SIGTERM || sig==SIGINT) + exit(0); } Application::RegApp Engineer::reg;