Add basic support for signals

[r2c2.git] / source / libr2c2 / train.h

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index b72fbf635c1d613c8e7f4aab07333dc4fb29eed3..e16f726c5bebf78bbb56b091c82f11739cca1108 100644 (file)
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -1,26 +1,20 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_TRAIN_H_
 #define LIBR2C2_TRAIN_H_
 
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
 #include "blockiter.h"
 #include "controller.h"
+#include "trainai.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
 class Route;
 class SpeedQuantizer;
-class Timetable;
 class Vehicle;
 class VehicleType;
 class Zone;
@@ -28,7 +22,7 @@ class Zone;
 class Train: public sigc::trackable
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Train>
+       class Loader: public Msp::DataFile::ObjectLoader<Train>
        {
        private:
                Block *prev_block;
@@ -50,6 +44,7 @@ public:
        sigc::signal<void, const std::string &> signal_name_changed;
        sigc::signal<void, const std::string &, float> signal_control_changed;
        sigc::signal<void, unsigned, bool> signal_function_changed;
+       sigc::signal<void, TrainAI &, const TrainAI::Message &> signal_ai_event;
        sigc::signal<void, const Route *> signal_route_changed;
        sigc::signal<void, Block &> signal_advanced;
        sigc::signal<void> signal_arrived;
@@ -82,7 +77,7 @@ private:
        bool reserving;
        bool advancing;
        Controller *controller;
-       Timetable *timetable;
+       std::list<TrainAI *> ais;
        bool active;
        unsigned current_speed_step;
        bool speed_changing;
@@ -91,7 +86,6 @@ private:
        unsigned functions;
        std::list<RouteRef> routes;
        bool end_of_route;
-       std::string status;
 
        Msp::Time::TimeStamp last_entry_time;
        float travel_dist;
@@ -127,12 +121,16 @@ public:
        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; }
 
-       void set_timetable(Timetable *);
-       Timetable *get_timetable() { return timetable; }
+       void add_ai(TrainAI &);
+       void remove_ai(TrainAI &);
+       TrainAI *get_tagged_ai(const std::string &) const;
+       void ai_message(const TrainAI::Message &);
 
        bool set_route(const Route *);
        bool go_to(Track &);
@@ -144,11 +142,9 @@ public:
        bool is_placed() const { return !blocks.empty(); }
        bool free_block(Block &);
        void free_noncritical_blocks();
-       int get_entry_to_block(Block &) const;
+       int get_entry_to_block(const Block &) const;
        float get_reserved_distance() const;
 
-       const std::string &get_status() const { return status; }
-
        void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 
        void save(std::list<Msp::DataFile::Statement> &) const;
@@ -156,17 +152,13 @@ private:
        void control_changed(const Controller::Control &);
        void loco_speed_event(unsigned, unsigned, bool);
        void loco_func_event(unsigned, unsigned, bool);
-       void sensor_event(unsigned, bool);
+       void block_state_changed(Block &, Block::State);
        void turnout_path_changed(Track &);
        void halt_event(bool);
        void block_reserved(const Block &, const Train *);
        void reserve_more();
        void check_turnout_paths(bool);
        float get_reserved_distance_until(const Block *, bool) const;
-       float get_real_speed(unsigned) const;
-       unsigned find_speed_step(float) const;
-       float get_travel_speed() const;
-       void set_status(const std::string &);
        void release_blocks();
        void release_blocks(BlockList::iterator, BlockList::iterator);
        void reverse_blocks(BlockList &) const;