Add a utility function to get path length from Track

[r2c2.git] / source / libr2c2 / track.h

diff --git a/source/libr2c2/track.h b/source/libr2c2/track.h
index 7dfa7528081593a8982dd3975a25ab4d5fcef801..79365afbcceb04c8d1e291ab7b37fee54d85c9a9 100644 (file)
--- a/source/libr2c2/track.h
+++ b/source/libr2c2/track.h
@@ -13,6 +13,7 @@ namespace R2C2 {
 
 class Block;
 class Layout;
+class TrackAttachment;
 
 class Track: public Object, public sigc::trackable
 {
@@ -25,10 +26,15 @@ public:
                void position(float, float, float);
                void rotation(float);
                void sensor_id(unsigned);
+               void slope(float);
+               void tilt(float);
                void turnout_id(unsigned);
        };
 
+       typedef std::list<TrackAttachment *> AttachmentList;
+
        sigc::signal<void, unsigned, Track *> signal_link_changed;
+       sigc::signal<void, unsigned> signal_path_changing;
        sigc::signal<void, unsigned> signal_path_changed;
 
 private:
@@ -41,6 +47,7 @@ private:
        std::vector<Track *> links;
        unsigned active_path;
        bool path_changing;
+       AttachmentList attachments;
 
        Track(const Track &);
        Track &operator=(const Track &);
@@ -55,11 +62,11 @@ public:
        Block &get_block() const;
        virtual void set_position(const Vector &);
        virtual void set_rotation(const Angle &);
-       void set_slope(float);
+       virtual void set_tilt(const Angle &);
        void set_flex(bool);
-       float get_slope() const { return slope; }
        bool get_flex() const { return flex; }
 private:
+       void propagate_slope();
        void check_slope();
 
 public:
@@ -70,9 +77,10 @@ public:
        void set_active_path(unsigned);
        unsigned get_active_path() const { return active_path; }
        bool is_path_changing() const { return path_changing; }
+       float get_path_length(int = -1) const;
 
-       TrackPoint get_point(unsigned, unsigned, float) const;
-       TrackPoint get_point(unsigned, float) const;
+       OrientedPoint get_point(unsigned, unsigned, float) const;
+       OrientedPoint get_point(unsigned, float) const;
 
        virtual unsigned get_n_snap_nodes() const;
        virtual Snap get_snap_node(unsigned) const;
@@ -89,7 +97,10 @@ public:
        using Object::break_link;
        virtual bool break_link(unsigned);
 
-       virtual bool collide_ray(const Vector &, const Vector &) const;
+       void add_attachment(TrackAttachment &);
+       void remove_attachment(TrackAttachment &);
+       const AttachmentList &get_attachments() const { return attachments; }
+       AttachmentList get_attachments_ordered(unsigned) const;
 
        void save(std::list<Msp::DataFile::Statement> &) const;
 private: