-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#ifndef LIBR2C2_LAYOUT_H_
#define LIBR2C2_LAYOUT_H_
#include <set>
#include <sigc++/sigc++.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
#include <msp/time/timestamp.h>
+#include "block.h"
namespace R2C2 {
class ArticleNumber;
-class Block;
class Catalogue;
class Driver;
class Route;
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;
sigc::signal<void, Vehicle &> signal_vehicle_added;
sigc::signal<void, Vehicle &> signal_vehicle_removed;
sigc::signal<void, Block &, Train *> signal_block_reserved;
+ sigc::signal<void, Block &, Block::State> signal_block_state_changed;
sigc::signal<void, const std::string &> signal_emergency;
private:
void add_track(Track &);
const std::set<Track *> &get_tracks() const { return tracks; }
+ Track *pick_track(const Vector &, const Vector &);
void remove_track(Track &);
unsigned allocate_turnout_id();
void save(const std::string &) const;
void save_dynamic(const std::string &) const;
private:
- void sensor_event(unsigned, bool);
+ void block_state_changed(Block &, Block::State);
};
} // namespace R2C2