#include <sigc++/signal.h>
#include <sigc++/trackable.h>
#include <msp/datafile/objectloader.h>
-#include <msp/time/timestamp.h>
-#include "block.h"
+#include <msp/time/timedelta.h>
#include "blockallocator.h"
#include "controller.h"
+#include "sensor.h"
#include "trainai.h"
namespace R2C2 {
class ArticleNumber;
+class Block;
class SpeedQuantizer;
class Vehicle;
class VehicleType;
void name(const std::string &);
void quantized_speed();
void router();
- void timetable();
void vehicle(ArticleNumber);
};
sigc::signal<void, unsigned, bool> signal_function_changed;
sigc::signal<void, TrainAI &, const TrainAI::Message &> signal_ai_event;
sigc::signal<void, Block &> signal_advanced;
+ sigc::signal<void, unsigned, Vehicle &> signal_vehicle_added;
+ sigc::signal<void, unsigned, Vehicle &> signal_vehicle_removed;
private:
Layout &layout;
const VehicleType &loco_type;
unsigned address;
std::string protocol;
+ unsigned loco_id;
std::string name;
const Train *preceding_train;
std::vector<Vehicle *> vehicles;
bool advancing;
Controller *controller;
std::list<TrainAI *> ais;
- bool active;
unsigned current_speed_step;
bool speed_changing;
bool reverse;
- Msp::Time::TimeStamp stop_timeout;
+ Msp::Time::TimeDelta stop_timeout;
unsigned functions;
- Msp::Time::TimeStamp last_entry_time;
- float travel_dist;
+ BlockIter last_entry_block;
+ Msp::Time::TimeDelta travel_time;
bool pure_speed;
SpeedQuantizer *speed_quantizer;
bool accurate_position;
const Vehicle &get_vehicle(unsigned) const;
void set_control(const std::string &, float);
- void set_active(bool);
void set_function(unsigned, bool);
float get_control(const std::string &) const;
float get_speed() const;
float get_quantized_speed() const;
unsigned get_speed_step() const { return current_speed_step; }
- bool is_active() const { return active; }
bool get_function(unsigned) const;
unsigned get_functions() const { return functions; }
return 0;
}
- void place(const BlockIter &);
+ bool place(const BlockIter &);
void unplace();
bool is_placed() const { return !allocator.empty(); }
void stop_at(Block *);
- bool free_block(Block &);
- void free_noncritical_blocks();
- void reserve_more();
+ bool is_block_critical(const Block &) const;
+ BlockIter get_first_noncritical_block() const;
+ void refresh_blocks_from(Block &);
const BlockAllocator &get_block_allocator() const { return allocator; }
float get_reserved_distance() const;
- void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+ void tick(const Msp::Time::TimeDelta &);
void save(std::list<Msp::DataFile::Statement> &) const;
private:
void control_changed(const Controller::Control &);
void loco_speed_event(unsigned, unsigned, bool);
void loco_func_event(unsigned, unsigned, bool);
- void block_state_changed(Block &, Block::State);
+ void sensor_state_changed(Sensor &, Sensor::State);
void halt_event(bool);
void block_reserved(const Block &, const Train *);
- float get_reserved_distance_until(const Block *, bool) const;
+ float get_reserved_distance_until(const Block *) const;
};
} // namespace R2C2