X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.cpp;h=c0930352fb7d2b171f7279a55c0dd1fddffc454b;hb=651698847d5293cfb15b6fb23a394701388c0151;hp=b61522ba4d59bfdc2d45344f3487aa912d7d694b;hpb=dcfa1e9503b7e97b61396d7458f0b2e5896779cd;p=r2c2.git diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp index b61522b..c093035 100644 --- a/source/libmarklin/layout.cpp +++ b/source/libmarklin/layout.cpp @@ -1,50 +1,146 @@ /* $Id$ This file is part of the MSP Märklin suite -Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa +Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ +#include #include #include #include +#include +#include "block.h" #include "catalogue.h" +#include "driver.h" #include "layout.h" +#include "locotype.h" +#include "route.h" +#include "track.h" #include "tracktype.h" +#include "train.h" using namespace std; using namespace Msp; namespace Marklin { -Layout::Layout(Catalogue &c): - catalogue(c) +Layout::Layout(Catalogue &c, Driver *d): + catalogue(c), + driver(d) { } Layout::~Layout() { - for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) - delete *i; - for(map::iterator i=routes.begin(); i!=routes.end(); ++i) - delete i->second; + delete driver; + while(!trains.empty()) + delete trains.begin()->second; + while(!routes.empty()) + delete routes.begin()->second; + while(!tracks.empty()) + delete *tracks.begin(); + while(!blocks.empty()) + delete *blocks.begin(); +} + +Driver &Layout::get_driver() const +{ + if(!driver) + throw InvalidState("No driver"); + return *driver; } void Layout::add_track(Track &t) { if(tracks.insert(&t).second) + { + create_blocks(); signal_track_added.emit(t); + } } void Layout::remove_track(Track &t) { if(tracks.erase(&t)) + { + create_blocks(t); signal_track_removed.emit(t); + } +} + +void Layout::add_block(Block &b) +{ + blocks.insert(&b); +} + +Block &Layout::get_block(unsigned id) const +{ + for(set::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + if((*i)->get_id()==id) + return **i; + + throw KeyError("Unknown block", lexical_cast(id)); +} + +Block &Layout::get_block_by_track(const Track &t) const +{ + for(set::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + if((*i)->get_tracks().count(const_cast(&t))) + return **i; + + throw InvalidParameterValue("No block found for track"); +} + +void Layout::create_blocks() +{ + set used_tracks; + for(set::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + { + const set &btracks = (*i)->get_tracks(); + used_tracks.insert(btracks.begin(), btracks.end()); + } + + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + if(used_tracks.count(*i)==0) + { + Block *block = new Block(*this, **i); + used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end()); + } + + for(set::iterator i=blocks.begin(); i!=blocks.end(); ++i) + for(set::iterator j=i; j!=blocks.end(); ++j) + if(j!=i) + (*i)->check_link(**j); +} + +void Layout::create_blocks(const Track &track) +{ + const vector &links = track.get_links(); + for(set::iterator i=blocks.begin(); i!=blocks.end();) + { + bool del = (*i)->get_tracks().count(const_cast(&track)); + for(vector::const_iterator j=links.begin(); (!del && j!=links.end()); ++j) + del = (*i)->get_tracks().count(*j); + + if(del) + delete *i++; + else + ++i; + } + + create_blocks(); +} + +void Layout::remove_block(Block &b) +{ + blocks.erase(&b); } void Layout::add_route(Route &r) { if(routes.count(r.get_name())) - throw KeyError("Duplicate route name"); + throw KeyError("Duplicate route name", r.get_name()); + routes[r.get_name()] = &r; signal_route_added.emit(r); } @@ -63,6 +159,44 @@ void Layout::remove_route(Route &r) signal_route_removed.emit(r); } +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; + 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; +} + +void Layout::remove_train(Train &t) +{ + if(trains.erase(t.get_address())) + signal_train_removed.emit(t); +} + +void Layout::tick() +{ + if(driver) + driver->tick(); + + Time::TimeStamp t = Time::now(); + Time::TimeDelta dt; + if(last_tick) + dt = t-last_tick; + last_tick = t; + + for(map::iterator i=trains.begin(); i!=trains.end(); ++i) + i->second->tick(t, dt); +} + void Layout::save(const string &fn) { IO::BufferedFile out(fn, IO::M_WRITE); @@ -88,6 +222,21 @@ void Layout::save(const string &fn) } } +void Layout::save_trains(const string &fn) +{ + IO::BufferedFile out(fn, IO::M_WRITE); + DataFile::Writer writer(out); + + for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) + { + DataFile::Statement st("train"); + st.append(i->second->get_locomotive_type().get_article_number()); + st.append(i->second->get_address()); + i->second->save(st.sub); + writer.write(st); + } +} + void Layout::check_links() { for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) @@ -157,7 +306,7 @@ void Layout::check_routes() break; ep = next->get_endpoint_by_link(*track); - if(next->get_type().get_n_paths()>1) + if(next->get_type().is_turnout()) { // Select correct path across the turnout, or break if we hit an unknown turnout map::const_iterator j = turnouts.find(next->get_turnout_id()); @@ -185,16 +334,19 @@ void Layout::check_routes() Layout::Loader::Loader(Layout &l): - DataFile::BasicLoader(l) + DataFile::BasicLoader(l), + new_tracks(false) { add("base", &Layout::base); add("route", &Loader::route); add("track", &Loader::track); + add("train", &Loader::train); } void Layout::Loader::finish() { - obj.check_links(); + if(new_tracks) + obj.check_links(); obj.check_routes(); for(set::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i) @@ -203,18 +355,21 @@ void Layout::Loader::finish() void Layout::Loader::route(const string &n) { - RefPtr rte = new Route(obj, n); + Route *rte = new Route(obj, n); load_sub(*rte); - obj.add_route(*rte.release()); } void Layout::Loader::track(unsigned art_nr) { - const TrackType &type = obj.catalogue.get_track(art_nr); - - RefPtr trk = new Track(type); + Track *trk = new Track(obj, obj.catalogue.get_track(art_nr)); load_sub(*trk); - obj.add_track(*trk.release()); + new_tracks = true; +} + +void Layout::Loader::train(unsigned art_nr, unsigned addr) +{ + Train *trn = new Train(obj, obj.catalogue.get_locomotive(art_nr), addr); + load_sub(*trn); } } // namespace Marklin