#include <msp/time/timestamp.h>
#include "geometry.h"
#include "sensor.h"
+#include "clock.h"
namespace R2C2 {
class ArticleNumber;
+class BeamGate;
class Block;
class Catalogue;
class Driver;
class Route;
class Signal;
class Track;
+class TrackChain;
class Train;
class Vehicle;
class Zone;
public:
class Loader: public Msp::DataFile::ObjectLoader<Layout>
{
- private:
- bool new_tracks;
-
public:
Loader(Layout &);
private:
+ void beamgate();
+ void clock();
void route();
- void route(const std::string &);
void signal(ArticleNumber);
- void track(unsigned);
+ void terrain(ArticleNumber);
void track(ArticleNumber);
- void train(unsigned, unsigned, const std::string &);
void train(ArticleNumber, unsigned, const std::string &);
void turnout(unsigned, unsigned);
void zone();
};
public:
- typedef std::set<Zone *> ZoneSet;
typedef std::vector<Zone *> ZoneArray;
sigc::signal<void, Object &> signal_object_added;
sigc::signal<void, Object &> signal_object_removed;
- sigc::signal<void, Route &> signal_route_added;
- sigc::signal<void, Route &> signal_route_removed;
- sigc::signal<void, Zone &> signal_zone_added;
- sigc::signal<void, Zone &> signal_zone_removed;
+ sigc::signal<void, TrackChain &> signal_track_chain_added;
+ sigc::signal<void, TrackChain &> signal_track_chain_removed;
sigc::signal<void, Train &> signal_train_added;
sigc::signal<void, Train &> signal_train_removed;
sigc::signal<void, Block &, Train *> signal_block_reserved;
private:
Catalogue &catalogue;
Driver *driver;
+ Clock clock;
std::string base;
Storage<Object> objects;
- std::set<Route *> routes;
- ZoneSet zones;
- std::set<Block *> blocks;
- std::set<Sensor *> sensors;
+ Storage<TrackChain> track_chains;
+ 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;
+ Clock &get_clock() { return clock; }
const std::string &get_base() const { return base; }
void add(Object &);
void add(Track &);
+ void add(TrackChain &);
+ void add(Block &);
+ void add(Sensor &);
+ void add(BeamGate &);
template<typename T>
const std::set<T *> &get_all() const;
void remove(Object &);
void remove(Track &);
+ void remove(TrackChain &);
+ void remove(Sensor &);
+ void remove(BeamGate &);
- unsigned allocate_turnout_id();
+ unsigned allocate_turnout_address();
- void add_block(Block &);
Block &get_block(unsigned) const;
- const std::set<Block *> &get_blocks() const { return blocks; }
void create_blocks();
void create_blocks(Track &);
- void remove_block(Block &);
- void add_route(Route &);
- const std::set<Route *> &get_routes() const { return routes; }
Route &get_route(const std::string &) const;
void update_routes();
- void remove_route(Route &);
- void add_zone(Zone &);
- const ZoneSet &get_zones() const { return zones; }
ZoneArray get_zones(const std::string &) const;
Zone &get_zone(const std::string &, unsigned) const;
- void remove_zone(Zone &);
void add_train(Train &);
Train &get_train(unsigned) const;
const std::map<unsigned, Train *> &get_trains() const { return trains; }
void remove_train(Train &);
- void add_sensor(Sensor &);
- void remove_sensor(Sensor &);
-
void tick();
void emergency(const std::string &);