Measure and display train speeds

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 21f1382c8c7ba5704797cfae4cf9b248dd1afd62..0b88d8ac6af6fef6f5fee5af9da7cd51be8d52b7 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <msp/time/timestamp.h>
 #include "block.h"
 
 namespace Marklin {
@@ -28,23 +29,31 @@ private:
        std::list<BlockRef> cur_blocks;
        std::list<BlockRef> rsv_blocks;
        unsigned target_speed;
+       Msp::Time::TimeStamp try_reserve;
+       std::string status;
+       Msp::Time::TimeStamp last_entry_time;
+       float travel_dist;
+       unsigned real_speed;
 
 public:
        sigc::signal<void, const std::string &> signal_name_changed;
+       sigc::signal<void, const std::string &> signal_status_changed;
 
        Train(TrafficManager &, Locomotive &);
+
        void set_name(const std::string &);
        void set_speed(unsigned);
        const std::string &get_name() const { return name; }
        Locomotive &get_locomotive() const { return loco; }
+       const std::string &get_status() const { return status; }
        void place(Block *, unsigned);
        bool free_block(Block *);
-       void tick();
+       void tick(const Msp::Time::TimeStamp &);
 private:
        void sensor_event(bool, Sensor *);
        bool reserve_more();
+       void set_status(const std::string &);
 };
-typedef std::list<Train *> TrainSeq;
 
 } // namespace Marklin