Full vehicle unification

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 5ef23537a4710b9f3e4e8832f9056d73c10e2813..e8785f5e5994deb4ae275e670a0187676dd03534 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -15,11 +15,11 @@ Distributed under the GPL
 
 namespace Marklin {
 
-class Locomotive;
+class ControlModel;
 class Route;
-class Sensor;
-class TrafficManager;
-class Turnout;
+class Timetable;
+class Vehicle;
+class VehicleType;
 
 class Train: public sigc::trackable
 {
@@ -28,19 +28,25 @@ public:
        {
        private:
                Block *prev_block;
+               bool blocks_valid;
 
        public:
                Loader(Train &);
        private:
                void block(unsigned);
                void block_hint(unsigned);
+               void name(const std::string &);
                void real_speed(unsigned, float, float);
                void route(const std::string &);
+               void timetable();
+               void vehicle(unsigned);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
-       sigc::signal<void, unsigned> signal_target_speed_changed;
+       sigc::signal<void, const std::string &, float> signal_control_changed;
+       sigc::signal<void, unsigned, bool> signal_function_changed;
        sigc::signal<void, const Route *> signal_route_changed;
+       sigc::signal<void> signal_arrived;
        sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
@@ -49,7 +55,8 @@ private:
                Block *block;
                unsigned entry;
 
-               BlockRef(Block *s, unsigned e): block(s), entry(e) { }
+               BlockRef(Block *, unsigned);
+               BlockRef next() const;
        };
 
        struct RealSpeed
@@ -61,59 +68,93 @@ private:
                void add(float, float);
        };
 
-       TrafficManager &trfc_mgr;
+       Layout &layout;
+       const VehicleType &loco_type;
+       unsigned address;
        std::string name;
-       Locomotive &loco;
+       int priority;
+       std::vector<Vehicle *> vehicles;
        std::list<BlockRef> cur_blocks;
        std::list<BlockRef> rsv_blocks;
        Block *pending_block;
-       unsigned target_speed;
+       ControlModel *control;
+       Timetable *timetable;
+       bool active;
+       unsigned current_speed;
+       bool speed_changing;
+       bool reverse;
+       Msp::Time::TimeStamp stop_timeout;
+       unsigned functions;
        const Route *route;
-       Msp::Time::TimeStamp try_reserve;
+       const Route *next_route;
+       bool end_of_route;
        std::string status;
 
        Msp::Time::TimeStamp last_entry_time;
        float travel_dist;
-       unsigned travel_speed;
        bool pure_speed;
        std::vector<RealSpeed> real_speed;
-
-       Track *cur_track;
-       unsigned cur_track_ep;
-       float offset;
-       Point pos;
+       bool accurate_position;
+       float overshoot_dist;
 
 public:
-       Train(TrafficManager &, Locomotive &);
+       Train(Layout &, const VehicleType &, unsigned);
+       ~Train();
 
+       Layout &get_layout() const { return layout; }
+       const VehicleType &get_locomotive_type() const { return loco_type; }
+       unsigned get_address() const { return address; }
        void set_name(const std::string &);
-       void set_speed(unsigned);
-       void set_reverse(bool);
-       void set_route(const Route *);
        const std::string &get_name() const { return name; }
-       Locomotive &get_locomotive() const { return loco; }
-       unsigned get_target_speed() const { return target_speed; }
+       void set_priority(int);
+       int get_priority() const { return priority; }
+       ControlModel &get_control() const { return *control; }
+
+       void add_vehicle(const VehicleType &);
+       void remove_vehicle(unsigned);
+       unsigned get_n_vehicles() const;
+       Vehicle &get_vehicle(unsigned);
+       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;
+       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 set_route(const Route *);
+       void go_to(const Track &);
        const Route *get_route() const { return route; }
-       const std::string &get_status() const { return status; }
-       const Point &get_position() const { return pos; }
        void place(Block &, unsigned);
        bool is_placed() const { return !cur_blocks.empty(); }
        bool free_block(Block &);
        int get_entry_to_block(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;
 private:
-       void locomotive_reverse_changed(bool);
-       void sensor_event(bool, Sensor *);
-       void turnout_path_changing(unsigned, Turnout *);
-       void turnout_path_changed(unsigned, Turnout *);
+       void loco_speed_event(unsigned, unsigned, bool);
+       void loco_func_event(unsigned, unsigned, bool);
+       void sensor_event(unsigned, bool);
+       void turnout_event(unsigned, bool);
+       void halt_event(bool);
+       void block_reserved(const Block &, const Train *);
        unsigned reserve_more();
-       void update_speed();
        float get_real_speed(unsigned) const;
        unsigned find_speed(float) const;
+       float get_travel_speed() const;
        void set_status(const std::string &);
-       void set_position(const Block::Endpoint &);
        void release_blocks(std::list<BlockRef> &);
+       void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);
        void reverse_blocks(std::list<BlockRef> &) const;
 };