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 96f487066fb7e6ef5affa1228d8502c2fe35e5fb..9b6344c2fa104066bbb782f0dc6e87bfa3fcd832 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -1,44 +1,92 @@
+/* $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_
 
+#include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <msp/time/timestamp.h>
 #include "block.h"
 
 namespace Marklin {
 
 class Locomotive;
+class Sensor;
 class TrafficManager;
 
 class Train: public sigc::trackable
 {
 public:
-       Train(TrafficManager &, Locomotive &);
-       const std::string &get_name() const { return name; }
-       void set_speed(unsigned);
-       void place(Block *, const Block::Endpoint *);
-       bool free_block(Block *);
-       void tick();
+       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
        {
                Block *block;
-               const Block::Endpoint *entry;
+               unsigned entry;
 
-               BlockRef(Block *s, const Block::Endpoint *e): block(s), entry(e) { }
+               BlockRef(Block *s, unsigned e): block(s), entry(e) { }
        };
-       typedef std::list<BlockRef> BlockRefSeq;
 
        TrafficManager &trfc_mgr;
        std::string name;
        Locomotive &loco;
-       BlockRefSeq cur_blocks;
-       BlockRefSeq rsv_blocks;
+       std::list<BlockRef> cur_blocks;
+       std::list<BlockRef> rsv_blocks;
        unsigned target_speed;
+       Msp::Time::TimeStamp try_reserve;
+       std::string status;
 
-       void sensor_event(unsigned, bool);
-       bool reserve_more();
+       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 &, const Msp::Time::TimeDelta &);
+       void save(std::list<Msp::DataFile::Statement> &) const;
+private:
+       void locomotive_reverse_changed(bool);
+       void sensor_event(bool, Sensor *);
+       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 &);
 };
-typedef std::list<Train *> TrainSeq;
 
 } // namespace Marklin