X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=302f13a55e1d7f8d4b6d7e5f58097092fe19d075;hb=54392d65e2053d1eacb4cfcc435f1013993f2973;hp=df8ce74e62b01ba1d52a178469903992afb78a83;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp index df8ce74..302f13a 100644 --- a/source/libr2c2/layout.cpp +++ b/source/libr2c2/layout.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -9,6 +10,8 @@ #include "driver.h" #include "layout.h" #include "route.h" +#include "signal.h" +#include "signaltype.h" #include "track.h" #include "tracktype.h" #include "train.h" @@ -47,6 +50,8 @@ Layout::~Layout() delete *routes.begin(); while(!zones.empty()) delete *zones.begin(); + while(!signals.empty()) + delete *signals.begin(); while(!tracks.empty()) delete *tracks.begin(); while(!blocks.empty()) @@ -56,7 +61,7 @@ Layout::~Layout() Driver &Layout::get_driver() const { if(!driver) - throw InvalidState("No driver"); + throw logic_error("!driver"); return *driver; } @@ -69,6 +74,11 @@ void Layout::add_track(Track &t) } } +Track *Layout::pick_track(const Ray &ray) +{ + return pick(tracks, ray); +} + void Layout::remove_track(Track &t) { if(tracks.erase(&t)) @@ -78,15 +88,6 @@ void Layout::remove_track(Track &t) } } -Track *Layout::pick_track(const Vector &start, const Vector &ray) -{ - for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) - if((*i)->collide_ray(start, ray)) - return *i; - - return 0; -} - unsigned Layout::allocate_turnout_id() { set used_ids; @@ -102,6 +103,42 @@ unsigned Layout::allocate_turnout_id() return result; } +void Layout::add_signal(Signal &s) +{ + if(signals.insert(&s).second) + signal_signal_added.emit(s); +} + +Signal *Layout::pick_signal(const Ray &ray) +{ + return pick(signals, ray); +} + +void Layout::remove_signal(Signal &s) +{ + if(signals.erase(&s)) + signal_signal_removed.emit(s); +} + +Object *Layout::pick_object(const Ray &ray) +{ + if(Object *obj = pick_track(ray)) + return obj; + else if((obj = pick_signal(ray))) + return obj; + return 0; +} + +template +T *Layout::pick(const set &objs, const Ray &ray) +{ + for(typename set::const_iterator i=objs.begin(); i!=objs.end(); ++i) + if((*i)->collide_ray(ray)) + return *i; + + return 0; +} + void Layout::add_block(Block &b) { blocks.insert(&b); @@ -119,7 +156,7 @@ Block &Layout::get_block(unsigned id) const if((*i)->get_id()==id) return **i; - throw KeyError("Unknown block", lexical_cast(id)); + throw key_error(id); } void Layout::create_blocks() @@ -179,7 +216,7 @@ Route &Layout::get_route(const string &name) const for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i) if((*i)->get_name()==name) return **i; - throw KeyError("Unknown route", name); + throw key_error(name); } void Layout::update_routes() @@ -218,7 +255,7 @@ Zone &Layout::get_zone(const string &group, unsigned num) const if((*i)->get_group()==group && (*i)->get_number()==num) return **i; - throw KeyError("Unknown zone", format("%s %d", group, num)); + throw key_error(format("%s %d", group, num)); } void Layout::remove_zone(Zone &z) @@ -229,19 +266,13 @@ void Layout::remove_zone(Zone &z) void Layout::add_train(Train &t) { - if(trains.count(t.get_address())) - throw KeyError("Duplicate train address", lexical_cast(t.get_address())); - - trains[t.get_address()] = &t; + insert_unique(trains, t.get_address(), &t); signal_train_added.emit(t); } Train &Layout::get_train(unsigned addr) const { - map::const_iterator i = trains.find(addr); - if(i==trains.end()) - throw KeyError("Unknown train", lexical_cast(addr)); - return *i->second; + return *get_item(trains, addr); } void Layout::remove_train(Train &t) @@ -275,6 +306,8 @@ void Layout::tick() for(set::iterator i=blocks.begin(); i!=blocks.end(); ++i) (*i)->tick(dt); + for(set::iterator i=signals.begin(); i!=signals.end(); ++i) + (*i)->tick(dt); for(map::iterator i=trains.begin(); i!=trains.end(); ++i) i->second->tick(t, dt); } @@ -303,6 +336,14 @@ void Layout::save(const string &fn) const writer.write(st); } + for(set::const_iterator i=signals.begin(); i!=signals.end(); ++i) + { + DataFile::Statement st("signal"); + st.append((*i)->get_type().get_article_number()); + (*i)->save(st.sub); + writer.write(st); + } + for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i) { if((*i)->is_temporary()) @@ -349,11 +390,12 @@ void Layout::block_state_changed(Block &block, Block::State state) Layout::Loader::Loader(Layout &l): - DataFile::BasicLoader(l), + DataFile::ObjectLoader(l), new_tracks(false) { add("base", &Layout::base); add("route", static_cast(&Loader::route)); + add("signal", &Loader::signal); add("track", static_cast(&Loader::track)); add("train", static_cast(&Loader::train)); add("turnout", &Loader::turnout); @@ -365,12 +407,6 @@ Layout::Loader::Loader(Layout &l): add("train", static_cast(&Loader::train)); } -void Layout::Loader::finish() -{ - for(set::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i) - (*i)->check_slope(); -} - void Layout::Loader::route() { Route *rte = new Route(obj); @@ -384,6 +420,12 @@ void Layout::Loader::route(const string &n) load_sub(*rte); } +void Layout::Loader::signal(ArticleNumber art_nr) +{ + Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr)); + load_sub(*sig); +} + void Layout::Loader::track(unsigned art_nr) { track(ArticleNumber(art_nr)); @@ -396,7 +438,7 @@ void Layout::Loader::track(ArticleNumber art_nr) new_tracks = true; for(set::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i) if(*i!=trk) - trk->snap_to(**i, true); + trk->link_to(**i); } void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)