Add networking library and a remote control program

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 815a9e9305f2baab23a506f98a886ccb497c51d5..9b6344c2fa104066bbb782f0dc6e87bfa3fcd832 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_TRAIN_H_
 #define LIBMARKLIN_TRAIN_H_
 
@@ -14,6 +21,17 @@ class TrafficManager;
 
 class Train: public sigc::trackable
 {
+public:
+       class Loader: public Msp::DataFile::BasicLoader<Train>
+       {
+       public:
+               Loader(Train &);
+       };
+
+       sigc::signal<void, const std::string &> signal_name_changed;
+       sigc::signal<void, unsigned> signal_target_speed_changed;
+       sigc::signal<void, const std::string &> signal_status_changed;
+
 private:
        struct BlockRef
        {
@@ -30,22 +48,44 @@ private:
        std::list<BlockRef> rsv_blocks;
        unsigned target_speed;
        Msp::Time::TimeStamp try_reserve;
+       std::string status;
 
-public:
-       sigc::signal<void, const std::string &> signal_name_changed;
+       Msp::Time::TimeStamp last_entry_time;
+       float travel_dist;
+       unsigned travel_speed;
+       bool pure_speed;
+       float speed_scale;
+       float speed_scale_weight;
+
+       Track *cur_track;
+       unsigned cur_track_ep;
+       float offset;
+       Point pos;
 
+public:
        Train(TrafficManager &, Locomotive &);
 
        void set_name(const std::string &);
        void set_speed(unsigned);
+       void set_reverse(bool);
        const std::string &get_name() const { return name; }
        Locomotive &get_locomotive() const { return loco; }
+       unsigned get_target_speed() const { return target_speed; }
+       const std::string &get_status() const { return status; }
+       const Point &get_position() const { return pos; }
        void place(Block *, unsigned);
        bool free_block(Block *);
-       void tick(const Msp::Time::TimeStamp &);
+       void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+       void save(std::list<Msp::DataFile::Statement> &) const;
 private:
+       void locomotive_reverse_changed(bool);
        void sensor_event(bool, Sensor *);
-       bool reserve_more();
+       void turnout_route_changing(unsigned, Turnout *);
+       void turnout_route_changed(unsigned, Turnout *);
+       unsigned reserve_more();
+       void update_speed();
+       void set_status(const std::string &);
+       void set_position(const Block::Endpoint &);
 };
 
 } // namespace Marklin