Attempt to estimate the exact positions of trains from measured speed data

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 43ee84dc5cd6c590e7d7a69a16dfe0eb0f3cf982..6a7d2dea949dfe728a698155bcfd4adc7bace723 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -38,9 +38,18 @@ private:
        unsigned target_speed;
        Msp::Time::TimeStamp try_reserve;
        std::string status;
+
        Msp::Time::TimeStamp last_entry_time;
        float travel_dist;
-       unsigned real_speed;
+       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:
        sigc::signal<void, const std::string &> signal_name_changed;
@@ -53,13 +62,16 @@ public:
        const std::string &get_name() const { return name; }
        Locomotive &get_locomotive() const { return loco; }
        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 &);
 private:
        void sensor_event(bool, Sensor *);
        unsigned reserve_more();
+       void update_speed();
        void set_status(const std::string &);
+       void set_position(const Block::Endpoint &);
 };
 
 } // namespace Marklin