-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <algorithm>
+#include <msp/core/maputils.h>
#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include <msp/datafile/writer.h>
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())
Driver &Layout::get_driver() const
{
if(!driver)
- throw InvalidState("No driver");
+ throw logic_error("!driver");
return *driver;
}
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
if((*i)->get_id()==id)
return **i;
- throw KeyError("Unknown block", lexical_cast(id));
+ throw key_error(id);
}
void Layout::create_blocks()
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
if((*i)->get_name()==name)
return **i;
- throw KeyError("Unknown route", name);
+ throw key_error(name);
}
void Layout::update_routes()
if((*i)->get_group()==group && (*i)->get_number()==num)
return **i;
- throw KeyError("Unknown zone", format("%s %d", group, num));
+ throw key_error(format("%s %d", group, num));
}
void Layout::remove_zone(Zone &z)
void Layout::add_train(Train &t)
{
- if(trains.count(t.get_address()))
- throw KeyError("Duplicate train address", lexical_cast(t.get_address()));
-
- trains[t.get_address()] = &t;
+ insert_unique(trains, t.get_address(), &t);
signal_train_added.emit(t);
}
Train &Layout::get_train(unsigned addr) const
{
- map<unsigned, Train *>::const_iterator i = trains.find(addr);
- if(i==trains.end())
- throw KeyError("Unknown train", lexical_cast(addr));
- return *i->second;
+ return *get_item(trains, addr);
}
void Layout::remove_train(Train &t)
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()));
}