X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=de61b1bca4d5eb7e7ed5593af108ee34a2709abb;hb=64340dad429ba4040538fc06b6882aabdb489925;hp=1c0d4cff76e125b2b8bb9525162e41f55f4d9c2b;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp index 1c0d4cf..de61b1b 100644 --- a/source/libr2c2/layout.cpp +++ b/source/libr2c2/layout.cpp @@ -1,11 +1,5 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #include +#include #include #include #include @@ -20,28 +14,40 @@ Distributed under the GPL #include "tracktype.h" #include "train.h" #include "vehicletype.h" +#include "zone.h" using namespace std; using namespace Msp; +namespace { + +bool zone_order(const R2C2::Zone *z1, const R2C2::Zone *z2) +{ + return z1->get_number()get_number(); +} + +} + + namespace R2C2 { Layout::Layout(Catalogue &c, Driver *d): catalogue(c), driver(d), next_turnout_id(0x800) -{ - if(driver) - driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event)); -} +{ } Layout::~Layout() { delete driver; + driver = 0; + while(!trains.empty()) delete trains.begin()->second; while(!routes.empty()) delete *routes.begin(); + while(!zones.empty()) + delete *zones.begin(); while(!tracks.empty()) delete *tracks.begin(); while(!blocks.empty()) @@ -51,7 +57,7 @@ Layout::~Layout() Driver &Layout::get_driver() const { if(!driver) - throw InvalidState("No driver"); + throw logic_error("!driver"); return *driver; } @@ -73,7 +79,16 @@ void Layout::remove_track(Track &t) } } -unsigned Layout::allocate_turnout_id(bool dbl) +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; for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) @@ -81,9 +96,9 @@ unsigned Layout::allocate_turnout_id(bool dbl) used_ids.insert((*i)->get_turnout_id()); unsigned result = next_turnout_id; - while(used_ids.count(result) || (dbl && used_ids.count(result+1))) + while(used_ids.count(result)) ++result; - next_turnout_id = result+1+dbl; + next_turnout_id = result+1; return result; } @@ -91,6 +106,12 @@ unsigned Layout::allocate_turnout_id(bool dbl) void Layout::add_block(Block &b) { blocks.insert(&b); + b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b))); + if(b.get_sensor_id()) + { + b.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_state_changed), sigc::ref(b))); + b.signal_state_changed.connect(sigc::bind<0>(signal_block_state_changed, sigc::ref(b))); + } } Block &Layout::get_block(unsigned id) const @@ -99,7 +120,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() @@ -159,7 +180,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() @@ -174,21 +195,48 @@ void Layout::remove_route(Route &r) signal_route_removed.emit(r); } -void Layout::add_train(Train &t) +void Layout::add_zone(Zone &z) +{ + if(zones.insert(&z).second) + signal_zone_added.emit(z); +} + +Layout::ZoneArray Layout::get_zones(const string &group) const { - if(trains.count(t.get_address())) - throw KeyError("Duplicate train address", lexical_cast(t.get_address())); + ZoneArray result; + for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i) + if((*i)->get_group()==group) + result.push_back(*i); - trains[t.get_address()] = &t; + sort(result.begin(), result.end(), zone_order); + + return result; +} + +Zone &Layout::get_zone(const string &group, unsigned num) const +{ + for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i) + if((*i)->get_group()==group && (*i)->get_number()==num) + return **i; + + throw key_error(format("%s %d", group, num)); +} + +void Layout::remove_zone(Zone &z) +{ + if(zones.erase(&z)) + signal_zone_removed.emit(z); +} + +void Layout::add_train(Train &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) @@ -220,6 +268,8 @@ void Layout::tick() dt = t-last_tick; last_tick = t; + for(set::iterator i=blocks.begin(); i!=blocks.end(); ++i) + (*i)->tick(dt); for(map::iterator i=trains.begin(); i!=trains.end(); ++i) i->second->tick(t, dt); } @@ -232,7 +282,7 @@ void Layout::emergency(const string &msg) signal_emergency.emit(msg); } -void Layout::save(const string &fn) +void Layout::save(const string &fn) const { IO::BufferedFile out(fn, IO::M_WRITE); DataFile::Writer writer(out); @@ -240,7 +290,7 @@ void Layout::save(const string &fn) if(!base.empty()) writer.write((DataFile::Statement("base"), base)); - for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { DataFile::Statement st("track"); st.append((*i)->get_type().get_article_number()); @@ -248,7 +298,7 @@ void Layout::save(const string &fn) writer.write(st); } - for(set::iterator i=routes.begin(); i!=routes.end(); ++i) + for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i) { if((*i)->is_temporary()) continue; @@ -257,13 +307,24 @@ void Layout::save(const string &fn) (*i)->save(st.sub); writer.write(st); } + + for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i) + { + DataFile::Statement st("zone"); + (*i)->save(st.sub); + writer.write(st); + } } -void Layout::save_trains(const string &fn) +void Layout::save_dynamic(const string &fn) const { IO::BufferedFile out(fn, IO::M_WRITE); DataFile::Writer writer(out); + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + if(unsigned tid = (*i)->get_turnout_id()) + writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path())); + for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) { DataFile::Statement st("train"); @@ -275,32 +336,28 @@ void Layout::save_trains(const string &fn) } } -void Layout::sensor_event(unsigned addr, bool state) +void Layout::block_state_changed(Block &block, Block::State state) { - if(state) - { - for(set::iterator i=blocks.begin(); i!=blocks.end(); ++i) - if((*i)->get_sensor_id()==addr) - { - if(!(*i)->get_train()) - emergency(format("Unreserved sensor %d triggered", addr)); - break; - } - } + if(state==Block::ACTIVE && !block.get_train()) + emergency(format("Unreserved sensor %d triggered", block.get_sensor_id())); } 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("track", static_cast(&Loader::track)); + add("train", static_cast(&Loader::train)); + add("turnout", &Loader::turnout); + add("zone", &Loader::zone); + + // Deprecated aliases add("route", static_cast(&Loader::route)); add("track", static_cast(&Loader::track)); - add("track", static_cast(&Loader::track)); add("train", static_cast(&Loader::train)); - add("train", static_cast(&Loader::train)); } void Layout::Loader::finish() @@ -348,4 +405,16 @@ void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::strin load_sub(*trn); } +void Layout::Loader::turnout(unsigned addr, unsigned path) +{ + if(obj.driver) + obj.driver->set_turnout(addr, path); +} + +void Layout::Loader::zone() +{ + Zone *zne = new Zone(obj); + load_sub(*zne); +} + } // namespace R2C2