#include <set>
#include <sigc++/sigc++.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
#include <msp/time/timestamp.h>
#include "block.h"
+#include "geometry.h"
namespace R2C2 {
class Catalogue;
class Driver;
class Route;
+class Signal;
class Track;
class Train;
-class Vector;
class Vehicle;
class Zone;
class Layout
{
public:
- class Loader: public Msp::DataFile::BasicLoader<Layout>
+ class Loader: public Msp::DataFile::ObjectLoader<Layout>
{
private:
bool new_tracks;
public:
Loader(Layout &);
private:
- virtual void finish();
void route();
void route(const std::string &);
+ void signal(ArticleNumber);
void track(unsigned);
void track(ArticleNumber);
void train(unsigned, unsigned, const std::string &);
sigc::signal<void, Track &> signal_track_added;
sigc::signal<void, Track &> signal_track_removed;
+ sigc::signal<void, Signal &> signal_signal_added;
+ sigc::signal<void, Signal &> signal_signal_removed;
sigc::signal<void, Route &> signal_route_added;
sigc::signal<void, Route &> signal_route_removed;
sigc::signal<void, Zone &> signal_zone_added;
Driver *driver;
std::string base;
std::set<Track *> tracks;
+ std::set<Signal *> signals;
std::set<Route *> routes;
ZoneSet zones;
std::set<Block *> blocks;
void add_track(Track &);
const std::set<Track *> &get_tracks() const { return tracks; }
- Track *pick_track(const Vector &, const Vector &);
+ Track *pick_track(const Ray &);
void remove_track(Track &);
unsigned allocate_turnout_id();
+ void add_signal(Signal &);
+ const std::set<Signal *> &get_signals() const { return signals; }
+ Signal *pick_signal(const Ray &);
+ void remove_signal(Signal &);
+
+ Object *pick_object(const Ray &);
+
+private:
+ template<typename T>
+ static T *pick(const std::set<T *> &, const Ray &);
+
+public:
void add_block(Block &);
Block &get_block(unsigned) const;
const std::set<Block *> &get_blocks() const { return blocks; }