X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=e992f418ed4cc324a4ff84d900ded8ac37700a0d;hb=80dcfa55c913037066e43fa115ae56fa51b974f2;hp=8f8ee490fe2fa67cf5f33113d2efd0efea03c7c5;hpb=93ca5f1774e218c313edd88024f82c80714d8e7c;p=r2c2.git diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp index 8f8ee49..e992f41 100644 --- a/source/libmarklin/train.cpp +++ b/source/libmarklin/train.cpp @@ -11,6 +11,7 @@ Distributed under the GPL #include #include "control.h" #include "except.h" +#include "layout.h" #include "route.h" #include "tracktype.h" #include "trafficmanager.h" @@ -67,7 +68,7 @@ void Train::set_speed(unsigned speed) if(!target_speed) { trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect( - sigc::bind_return(sigc::mem_fun(this, &Train::release_reserved_blocks), false)); + sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Train::release_blocks), sigc::ref(rsv_blocks)), false)); } else reserve_more(); @@ -89,46 +90,38 @@ void Train::set_route(const Route *r) signal_route_changed.emit(route); } -void Train::place(Block *block, unsigned entry) +void Train::place(Block &block, unsigned entry) { - for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();) - { - i->block->reserve(0); - i = rsv_blocks.erase(i); - } + if(target_speed) + set_speed(0); - for(list::iterator i=cur_blocks.begin(); i!=cur_blocks.end();) - { - i->block->reserve(0); - i = cur_blocks.erase(i); - } + release_blocks(rsv_blocks); + release_blocks(cur_blocks); - if(!block->reserve(this)) + if(!block.reserve(this)) { set_status("Unplaced"); return; } - cur_blocks.push_back(BlockRef(block, entry)); - set_position(block->get_endpoints()[entry]); + cur_blocks.push_back(BlockRef(&block, entry)); + set_position(block.get_endpoints()[entry]); set_status("Stopped"); } -bool Train::free_block(Block *block) +bool Train::free_block(Block &block) { unsigned nsens = 0; for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) { - if(i->block==block) + if(i->block==&block) { if(nsens<1) return false; - while(i!=rsv_blocks.end()) - { - i->block->reserve(0); - i = rsv_blocks.erase(i); - } + for(list::iterator j=i; j!=rsv_blocks.end(); ++j) + j->block->reserve(0); + rsv_blocks.erase(i, rsv_blocks.end()); update_speed(); return true; } @@ -139,13 +132,13 @@ bool Train::free_block(Block *block) return false; } -int Train::get_entry_to_block(Block *block) const +int Train::get_entry_to_block(Block &block) const { for(list::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) - if(i->block==block) + if(i->block==&block) return i->entry; for(list::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - if(i->block==block) + if(i->block==&block) return i->entry; return -1; } @@ -162,19 +155,25 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path(); offset += get_real_speed(loco.get_speed())*(dt/Time::sec); - if(offset>cur_track->get_type().get_path_length(path)) + float path_len = cur_track->get_type().get_path_length(path); + if(offset>path_len) { - int out = cur_track->traverse(cur_track_ep, path); - if(out>=0) + unsigned out = cur_track->traverse(cur_track_ep, path); + Track *next = cur_track->get_link(out); + + bool ok = false; + for(list::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i) + ok = i->block->get_tracks().count(next); + + if(ok) { - Track *next = cur_track->get_link(out); if(next) cur_track_ep = next->get_endpoint_by_link(*cur_track); cur_track = next; offset = 0; } else - cur_track = 0; + offset = path_len-0.001; } if(cur_track) @@ -188,6 +187,21 @@ void Train::save(list &st) const for(unsigned i=0; i<=14; ++i) if(real_speed[i].weight) st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight)); + if(route) + st.push_back((DataFile::Statement("route"), route->get_name())); + + if(!cur_blocks.empty()) + { + list blocks = cur_blocks; + if(loco.get_reverse()) + reverse_blocks(blocks); + + Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link; + st.push_back((DataFile::Statement("block_hint"), prev->get_id())); + + for(list::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + st.push_back((DataFile::Statement("block"), i->block->get_id())); + } } void Train::locomotive_reverse_changed(bool) @@ -195,9 +209,7 @@ void Train::locomotive_reverse_changed(bool) for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) i->block->reserve(0); rsv_blocks.clear(); - cur_blocks.reverse(); - for(list::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) - i->entry = i->block->traverse(i->entry); + reverse_blocks(cur_blocks); reserve_more(); if(cur_track) @@ -216,6 +228,7 @@ void Train::sensor_event(bool state, Sensor *sensor) if(state) { + // Find the first sensor block from our reserved blocks that isn't this sensor list::iterator i; for(i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) if(i->block->get_sensor_id() && i->block->get_sensor_id()!=addr) @@ -223,6 +236,7 @@ void Train::sensor_event(bool state, Sensor *sensor) if(i!=rsv_blocks.begin()) { + // Compute speed and update related state float travel_time_secs = (Time::now()-last_entry_time)/Time::sec; travel_speed = static_cast(round(travel_dist/travel_time_secs*87*3.6/5))*5; @@ -238,35 +252,44 @@ void Train::sensor_event(bool state, Sensor *sensor) { j->block->traverse(j->entry, &block_len); travel_dist += block_len; + + if(j->block->get_sensor_id()==addr) + set_position(j->block->get_endpoints()[j->entry]); } last_entry_time = Time::now(); pure_speed = true; + // Move blocks up to the next sensor to our current blocks cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i); - } - - for(i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) - if(i->block->get_sensor_id()==addr) - set_position(i->block->get_endpoints()[i->entry]); - if(target_speed && reserve_more()<2) - update_speed(); + // Try to get more blocks if we're moving + if(target_speed && reserve_more()<2) + update_speed(); + } } else { + // Find the first sensor in our current blocks that's still active + list::iterator end = cur_blocks.begin(); for(list::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) - if(unsigned b_addr = i->block->get_sensor_id()) + if(i->block->get_sensor_id()) { - if(b_addr==addr) - { - ++i; - for(list::iterator j=cur_blocks.begin(); j!=i; ++j) - j->block->reserve(0); - cur_blocks.erase(cur_blocks.begin(), i); - } - break; + if(trfc_mgr.get_control().get_sensor(i->block->get_sensor_id()).get_state()) + break; + else + end = i; } + + if(end!=cur_blocks.begin()) + { + // Free blocks up to the last inactive sensor + ++end; + for(list::iterator i=cur_blocks.begin(); i!=end; ++i) + i->block->reserve(0); + cur_blocks.erase(cur_blocks.begin(), end); + } + // XXX Should watch for trfc_mgr.signal_block_reserved rather than sensors if(target_speed && pending_block && addr==pending_block->get_sensor_id()) reserve_more(); } @@ -345,7 +368,7 @@ unsigned Train::reserve_more() if(!link->reserve(this)) { // If we found another train going in the same direction as us, we can keep the blocks we got - int other_entry = link->get_train()->get_entry_to_block(link); + int other_entry = link->get_train()->get_entry_to_block(*link); if(other_entry==entry || link->traverse(entry)==link->traverse(other_entry)) { good = last; @@ -525,11 +548,18 @@ void Train::set_position(const Block::Endpoint &bep) pos = cur_track->get_endpoint_position(cur_track_ep); } -void Train::release_reserved_blocks() +void Train::release_blocks(list &blocks) { - for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) + for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) i->block->reserve(0); - rsv_blocks.clear(); + blocks.clear(); +} + +void Train::reverse_blocks(list &blocks) const +{ + blocks.reverse(); + for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) + i->entry = i->block->traverse(i->entry); } @@ -546,10 +576,36 @@ void Train::RealSpeed::add(float s, float w) Train::Loader::Loader(Train &t): - DataFile::BasicLoader(t) + DataFile::BasicLoader(t), + prev_block(0) { + add("block", &Loader::block); + add("block_hint", &Loader::block_hint); add("name", &Train::name); add("real_speed", &Loader::real_speed); + add("route", &Loader::route); +} + +void Train::Loader::block(unsigned id) +{ + Block &blk = obj.trfc_mgr.get_block(id); + int entry = -1; + if(prev_block) + entry = blk.get_endpoint_by_link(*prev_block); + if(entry<0) + entry = 0; + + blk.reserve(&obj); + obj.cur_blocks.push_back(BlockRef(&blk, entry)); + obj.status = "Stopped"; + obj.set_position(blk.get_endpoints()[entry]); + + prev_block = &blk; +} + +void Train::Loader::block_hint(unsigned id) +{ + prev_block = &obj.trfc_mgr.get_block(id); } void Train::Loader::real_speed(unsigned i, float speed, float weight) @@ -558,4 +614,9 @@ void Train::Loader::real_speed(unsigned i, float speed, float weight) obj.real_speed[i].weight = weight; } +void Train::Loader::route(const string &n) +{ + obj.route = &obj.trfc_mgr.get_layout().get_route(n); +} + } // namespace Marklin