public:
class Loader: public Msp::DataFile::ObjectLoader<Layout>
{
- private:
- bool new_tracks;
-
public:
Loader(Layout &);
private:
void beamgate();
+ void clock();
void route();
void signal(ArticleNumber);
+ void terrain(ArticleNumber);
void track(ArticleNumber);
void train(ArticleNumber, unsigned, const std::string &);
void turnout(unsigned, unsigned);
sigc::signal<void, Train &> signal_train_removed;
sigc::signal<void, Block &, Train *> signal_block_reserved;
sigc::signal<void, Sensor &, Sensor::State> signal_sensor_state_changed;
- sigc::signal<void, const std::string &> signal_emergency;
+ sigc::signal<void, Block *, const std::string &> signal_emergency;
private:
Catalogue &catalogue;
Storage<Sensor> sensors;
std::map<unsigned, Train *> trains;
Msp::Time::TimeStamp last_tick;
- unsigned next_turnout_id;
+ unsigned next_turnout_addr;
public:
Layout(Catalogue &, Driver * = 0);
Catalogue &get_catalogue() const { return catalogue; }
bool has_driver() const { return driver; }
Driver &get_driver() const;
- const Clock &get_clock() const { return clock; }
+ Clock &get_clock() { return clock; }
const std::string &get_base() const { return base; }
void add(Object &);
void remove(Sensor &);
void remove(BeamGate &);
- unsigned allocate_turnout_id();
+ unsigned allocate_turnout_address();
Block &get_block(unsigned) const;
void create_blocks();
void remove_train(Train &);
void tick();
- void emergency(const std::string &);
+ void emergency(Block *, const std::string &);
void save(const std::string &) const;
void save_dynamic(const std::string &) const;