i->second->signal_path_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changing), i->second));
i->second->signal_path_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), i->second));
}
+
+ trfc_mgr.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
}
void Train::set_name(const string &n)
target_speed = speed;
if(!target_speed)
{
+ pending_block = 0;
trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect(
- sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Train::release_blocks), sigc::ref(rsv_blocks)), false));
+ sigc::bind_return(sigc::bind(
+ sigc::mem_fun(this, static_cast<void (Train::*)(list<BlockRef> &)>(&Train::release_blocks)),
+ sigc::ref(rsv_blocks)), false));
}
else
reserve_more();
{
if(nsens<1)
return false;
- for(list<BlockRef>::iterator j=i; j!=rsv_blocks.end(); ++j)
- j->block->reserve(0);
- rsv_blocks.erase(i, rsv_blocks.end());
+ release_blocks(rsv_blocks, i, rsv_blocks.end());
update_speed();
return true;
}
return -1;
}
-void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
+void Train::tick(const Time::TimeStamp &, const Time::TimeDelta &dt)
{
- if(try_reserve && t>try_reserve)
- reserve_more();
-
if(cur_track)
{
unsigned path = 0;
void Train::locomotive_reverse_changed(bool)
{
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- i->block->reserve(0);
- rsv_blocks.clear();
+ release_blocks(rsv_blocks);
reverse_blocks(cur_blocks);
reserve_more();
{
// Free blocks up to the last inactive sensor
++end;
- for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=end; ++i)
- i->block->reserve(0);
- cur_blocks.erase(cur_blocks.begin(), end);
+ release_blocks(cur_blocks, 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();
}
}
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block->get_turnout_id()==tid)
{
- while(i!=rsv_blocks.end())
- {
- i->block->reserve(0);
- i = rsv_blocks.erase(i);
- }
+ release_blocks(rsv_blocks, i, rsv_blocks.end());
reserve_more();
return;
}
reserve_more();
}
+void Train::block_reserved(const Block &block, const Train *train)
+{
+ if(&block==pending_block && !train)
+ reserve_more();
+}
+
unsigned Train::reserve_more()
{
BlockRef *last = 0;
break;
int entry = link->get_endpoint_by_link(*last->block);
+ if(entry<0)
+ throw LogicError("Block links are inconsistent!");
if(!link->reserve(this))
{
- // If we found another train going in the same direction as us, we can keep the blocks we got
+ // If we found another train and it's not headed straight for us, we can keep the blocks we got
int other_entry = link->get_train()->get_entry_to_block(*link);
- if(other_entry==entry || link->traverse(entry)==link->traverse(other_entry))
+ if(other_entry<0)
+ throw LogicError("Block reservation inconsistency");
+ if(static_cast<unsigned>(entry)!=link->traverse(other_entry))
{
good = last;
good_sens = nsens;
const Block::Endpoint &ep = link->get_endpoints()[entry];
const Endpoint &track_ep = ep.track->get_type().get_endpoints()[ep.track_ep];
- if(track_ep.paths&(track_ep.paths-1))
- {
- // We're facing the points - keep the blocks reserved so far
- good = last;
- good_sens = nsens;
- }
+ // Keep the blocks reserved so far, as either us or the other train can diverge
+ good = last;
+ good_sens = nsens;
Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id());
if(!target_speed)
{
loco.set_speed(0);
- try_reserve = Time::TimeStamp();
set_status("Stopped");
}
else
{
loco.set_speed(0);
pure_speed = false;
- try_reserve = Time::now()+2*Time::sec;
set_status("Blocked");
}
else if(nsens==1 && target_speed>slow_speed)
{
loco.set_speed(slow_speed);
pure_speed = false;
- try_reserve = Time::now()+2*Time::sec;
set_status("Slow");
}
else
{
loco.set_speed(target_speed);
- try_reserve = Time::TimeStamp();
set_status(format("Traveling %d kmh", travel_speed));
}
}
void Train::release_blocks(list<BlockRef> &blocks)
{
- for(list<BlockRef>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- i->block->reserve(0);
- blocks.clear();
+ release_blocks(blocks, blocks.begin(), blocks.end());
+}
+
+void Train::release_blocks(list<BlockRef> &blocks, list<BlockRef>::iterator begin, list<BlockRef>::iterator end)
+{
+ while(begin!=end)
+ {
+ Block *block = begin->block;
+ blocks.erase(begin++);
+ block->reserve(0);
+ }
}
void Train::reverse_blocks(list<BlockRef> &blocks) const
{
add("block", &Loader::block);
add("block_hint", &Loader::block_hint);
- add("name", &Train::name);
+ add("name", &Loader::name);
add("real_speed", &Loader::real_speed);
add("route", &Loader::route);
}
blk.reserve(&obj);
obj.cur_blocks.push_back(BlockRef(&blk, entry));
- obj.status = "Stopped";
+ obj.set_status("Stopped");
obj.set_position(blk.get_endpoints()[entry]);
prev_block = &blk;
prev_block = &obj.trfc_mgr.get_block(id);
}
+void Train::Loader::name(const string &n)
+{
+ obj.set_name(n);
+}
+
void Train::Loader::real_speed(unsigned i, float speed, float weight)
{
obj.real_speed[i].speed = speed;
void Train::Loader::route(const string &n)
{
- obj.route = &obj.trfc_mgr.get_layout().get_route(n);
+ obj.set_route(&obj.trfc_mgr.get_layout().get_route(n));
}
} // namespace Marklin