const set<Track *> &tracks = layout.get_all<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if((*i)->get_turnout_id())
+ {
+ (*i)->signal_path_changing.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changing), sigc::ref(**i))));
(*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changed), sigc::ref(**i))));
+ }
+}
+
+void BlockAllocator::set_active(bool a)
+{
+ active = a;
+ if(active)
+ reserve_more();
+ else
+ {
+ release_blocks_end(cur_blocks_end);
+ pending_block = 0;
+ }
}
void BlockAllocator::start_from(const BlockIter &block)
reserve_block(block);
}
+void BlockAllocator::rewind_to(const Block &block)
+{
+ if(!active)
+ return;
+
+ BlockList::iterator i = find_if(cur_blocks_end, blocks.end(), BlockMatch(block));
+ if(i!=blocks.end())
+ {
+ release_blocks_end(i);
+ reserve_more();
+ }
+}
+
void BlockAllocator::clear()
{
+ active = false;
release_blocks_begin(blocks.end());
pending_block = 0;
stop_at_block = 0;
void BlockAllocator::stop_at(const Block *block)
{
stop_at_block = block;
+ if(active && !block)
+ reserve_more();
}
const BlockIter &BlockAllocator::first() const
}
}
-bool BlockAllocator::release_from(const Block &block)
-{
- bool have_sensor = false;
- for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i)
- {
- if(i->block()==&block)
- {
- if(have_sensor)
- release_blocks_end(i);
- return have_sensor;
- }
- else if((*i)->get_sensor_id())
- have_sensor = true;
- }
-
- return false;
-}
-
-void BlockAllocator::release_noncurrent()
-{
- release_blocks_end(cur_blocks_end);
-}
-
void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
{
for(BlockList::iterator i=blocks.begin(); i!=end; )
void BlockAllocator::reverse()
{
- release_noncurrent();
+ release_blocks_end(cur_blocks_end);
blocks.reverse();
for(BlockList::iterator i=blocks.begin(); i!=blocks.end(); ++i)
*i = i->reverse();
+
+ if(active)
+ reserve_more();
+}
+
+void BlockAllocator::turnout_path_changing(Track &track)
+{
+ BlockList::iterator i = find_if(blocks.begin(), blocks.end(), BlockMatch(track.get_block()));
+ if(i!=blocks.end())
+ {
+ ++i;
+ release_blocks_end(i);
+ pending_block = &track.get_block();
+ }
}
void BlockAllocator::turnout_path_changed(Track &track)
for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
train.signal_advanced.emit(**j);
cur_blocks_end = end;
+
+ if(active)
+ reserve_more();
}
else if(result==3)
train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");