Signal::~Signal()
{
+ if(layout.has_driver() && address)
+ layout.get_driver().remove_sensor(address);
layout.remove(*this);
}
void Signal::set_address(unsigned a)
{
+ Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
+
+ if(driver && address)
+ driver->remove_signal(address);
address = a;
-
- if(layout.has_driver() && address)
- layout.get_driver().add_signal(address, type);
+ if(driver && address)
+ driver->add_signal(address, type);
}
void Signal::set_position(const Vector &p)
BlockIter iter = block.next();
while(iter && iter->get_train()==train)
{
- if(iter->get_sensor_id())
+ if(iter->get_sensor_address())
++n_blocks;
iter=iter.next();
}
{
if(&b==block.block())
passing = true;
- else if(passing && b.get_sensor_id())
+ else if(passing && b.get_sensor_address())
{
layout.get_driver().set_signal(address, type.get_indications().back().aspect);
reset();