X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.cpp;h=5f590dbb9a762473c9daa279356ddafe49061ffe;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=e67fbc26ebc0443440900293bd72555184e439f0;hpb=e39a3bb041867d6b469bb26278ea0b05ebea0277;p=r2c2.git diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp index e67fbc2..5f590db 100644 --- a/source/libmarklin/layout.cpp +++ b/source/libmarklin/layout.cpp @@ -9,16 +9,17 @@ 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" +#include "vehicletype.h" using namespace std; using namespace Msp; @@ -27,7 +28,8 @@ namespace Marklin { Layout::Layout(Catalogue &c, Driver *d): catalogue(c), - driver(d) + driver(d), + next_turnout_id(0x800) { if(driver) driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event)); @@ -39,7 +41,7 @@ Layout::~Layout() while(!trains.empty()) delete trains.begin()->second; while(!routes.empty()) - delete routes.begin()->second; + delete *routes.begin(); while(!tracks.empty()) delete *tracks.begin(); while(!blocks.empty()) @@ -71,6 +73,21 @@ void Layout::remove_track(Track &t) } } +unsigned Layout::allocate_turnout_id(bool dbl) +{ + set used_ids; + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + if((*i)->get_turnout_id()) + used_ids.insert((*i)->get_turnout_id()); + + unsigned result = next_turnout_id; + while(used_ids.count(result) || (dbl && used_ids.count(result+1))) + ++result; + next_turnout_id = result+1+dbl; + + return result; +} + void Layout::add_block(Block &b) { blocks.insert(&b); @@ -85,15 +102,6 @@ Block &Layout::get_block(unsigned id) const 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; @@ -116,20 +124,21 @@ void Layout::create_blocks() (*i)->check_link(**j); } -void Layout::create_blocks(const Track &track) +void Layout::create_blocks(Track &track) { + /* Must collect the blocks in a set first while all tracks are still + guaranteed to have blocks and to avoid duplicate deletes */ + set del_blocks; + + del_blocks.insert(&track.get_block()); + 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; - } + for(vector::const_iterator i=links.begin(); i!=links.end(); ++i) + if(*i) + del_blocks.insert(&(*i)->get_block()); + + for(set::iterator i=del_blocks.begin(); i!=del_blocks.end(); ++i) + delete *i; create_blocks(); } @@ -141,24 +150,27 @@ void Layout::remove_block(Block &b) void Layout::add_route(Route &r) { - if(routes.count(r.get_name())) - throw KeyError("Duplicate route name", r.get_name()); - - routes[r.get_name()] = &r; - signal_route_added.emit(r); + if(routes.insert(&r).second) + signal_route_added.emit(r); } Route &Layout::get_route(const string &name) const { - map::const_iterator i = routes.find(name); - if(i==routes.end()) - throw KeyError("Unknown route", name); - return *i->second; + for(set::const_iterator i=routes.begin(); i!=routes.end(); ++i) + if((*i)->get_name()==name) + return **i; + throw KeyError("Unknown route", name); +} + +void Layout::update_routes() +{ + for(set::iterator i=routes.begin(); i!=routes.end(); ++i) + (*i)->update_turnouts(); } void Layout::remove_route(Route &r) { - if(routes.erase(r.get_name())) + if(routes.erase(&r)) signal_route_removed.emit(r); } @@ -216,6 +228,7 @@ void Layout::emergency(const string &msg) { if(driver) driver->halt(true); + IO::print("Emergency: %s\n", msg); signal_emergency.emit(msg); } @@ -235,14 +248,13 @@ void Layout::save(const string &fn) writer.write(st); } - for(map::iterator i=routes.begin(); i!=routes.end(); ++i) + for(set::iterator i=routes.begin(); i!=routes.end(); ++i) { - if(i->second->is_temporary()) + if((*i)->is_temporary()) continue; DataFile::Statement st("route"); - st.append(i->first); - i->second->save(st.sub); + (*i)->save(st.sub); writer.write(st); } } @@ -257,111 +269,12 @@ void Layout::save_trains(const string &fn) DataFile::Statement st("train"); st.append(i->second->get_locomotive_type().get_article_number()); st.append(i->second->get_address()); + st.append(i->second->get_protocol()); i->second->save(st.sub); writer.write(st); } } -void Layout::check_links() -{ - for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) - (*i)->break_links(); - - list flext; - for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) - { - if((*i)->get_flex()) - flext.push_back(*i); - else - { - for(set::iterator j=i; j!=tracks.end(); ++j) - if(j!=i) - (*i)->snap_to(**j, true); - } - } - - for(list::iterator i=flext.begin(); i!=flext.end(); ++i) - for(set::iterator j=tracks.begin(); j!=tracks.end(); ++j) - if(*j!=*i) - (*i)->snap_to(**j, true); -} - -void Layout::check_routes() -{ - for(map::iterator i=routes.begin(); i!=routes.end(); ++i) - { - if(i->second->is_temporary()) - continue; - - /* We must copy the turnout map, since adding tracks to the route will - (temporarily) mess it up */ - const map turnouts = i->second->get_turnouts(); - - // Find any turnout in the route - Track *track = 0; - unsigned trk_path = 0; - for(set::const_iterator j=tracks.begin(); j!=tracks.end(); ++j) - { - map::const_iterator k = turnouts.find((*j)->get_turnout_id()); - if(k!=turnouts.end()) - { - track = *j; - trk_path = k->second; - break; - } - } - - if(!track) - continue; - - // Find an applicable endpoint - const vector &eps = track->get_type().get_endpoints(); - unsigned ep = 0; - for(unsigned j=0; jget_type().get_endpoints().size()<2) - break; - unsigned out_ep = track->traverse(ep, trk_path); - Track *next = track->get_links()[out_ep]; - if(!next || next == start) - break; - - ep = next->get_endpoint_by_link(*track); - 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()); - if(j==turnouts.end()) - break; - trk_path = j->second; - } - else - { - trk_path = 0; - - /* Start adding tracks when we find the first non-turnout. This - prevents the occurrence of ambiguities while adding the tracks */ - if(!start) - start = next; - } - - if(start) - i->second->add_track(*next); - - track = next; - } - } -} - void Layout::sensor_event(unsigned addr, bool state) { if(state) @@ -370,7 +283,7 @@ void Layout::sensor_event(unsigned addr, bool state) if((*i)->get_sensor_id()==addr) { if(!(*i)->get_train()) - emergency("Unreserved sensor triggered"); + emergency(format("Unreserved sensor %d triggered", addr)); break; } } @@ -382,37 +295,56 @@ Layout::Loader::Loader(Layout &l): new_tracks(false) { add("base", &Layout::base); - add("route", &Loader::route); - add("track", &Loader::track); - add("train", &Loader::train); + add("route", static_cast(&Loader::route)); + 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() { - if(new_tracks) - obj.check_links(); - obj.check_routes(); - for(set::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i) (*i)->check_slope(); } +void Layout::Loader::route() +{ + Route *rte = new Route(obj); + load_sub(*rte); +} + void Layout::Loader::route(const string &n) { - Route *rte = new Route(obj, n); + Route *rte = new Route(obj); + rte->set_name(n); load_sub(*rte); } void Layout::Loader::track(unsigned art_nr) +{ + track(ArticleNumber(art_nr)); +} + +void Layout::Loader::track(ArticleNumber art_nr) { Track *trk = new Track(obj, obj.catalogue.get_track(art_nr)); load_sub(*trk); new_tracks = true; + for(set::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i) + if(*i!=trk) + trk->snap_to(**i, true); +} + +void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto) +{ + train(ArticleNumber(art_nr), addr, proto); } -void Layout::Loader::train(unsigned art_nr, unsigned addr) +void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto) { - Train *trn = new Train(obj, obj.catalogue.get_locomotive(art_nr), addr); + Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto); load_sub(*trn); }