catalogue(c),
driver(d),
next_turnout_id(0x800)
-{
- if(driver)
- driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event));
-}
+{ }
Layout::~Layout()
{
delete driver;
+ driver = 0;
+
while(!trains.empty())
delete trains.begin()->second;
while(!routes.empty())
void Layout::add_block(Block &b)
{
blocks.insert(&b);
+ b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
+ if(b.get_sensor_id())
+ {
+ b.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_state_changed), sigc::ref(b)));
+ b.signal_state_changed.connect(sigc::bind<0>(signal_block_state_changed, sigc::ref(b)));
+ }
}
Block &Layout::get_block(unsigned id) const
dt = t-last_tick;
last_tick = t;
+ for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ (*i)->tick(dt);
for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
i->second->tick(t, dt);
}
}
}
-void Layout::sensor_event(unsigned addr, bool state)
+void Layout::block_state_changed(Block &block, Block::State state)
{
- if(state)
- {
- for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if((*i)->get_sensor_id()==addr)
- {
- if(!(*i)->get_train())
- emergency(format("Unreserved sensor %d triggered", addr));
- break;
- }
- }
+ if(state==Block::ACTIVE && !block.get_train())
+ emergency(format("Unreserved sensor %d triggered", block.get_sensor_id()));
}