X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.h;h=e49fe67b5f0e83deebabb378812ef7e19dd59d32;hb=283542ae424b94786652fbf0c67b883b63a8e7a0;hp=c1c95810f1d4d3dac8f0ab666cb41cc2b323775d;hpb=47bff0c8939de3ae20b5ced1ee2f6a264397dcee;p=r2c2.git diff --git a/source/libmarklin/track.h b/source/libmarklin/track.h index c1c9581..e49fe67 100644 --- a/source/libmarklin/track.h +++ b/source/libmarklin/track.h @@ -16,6 +16,7 @@ Distributed under the GPL namespace Marklin { +class Block; class Layout; class TrackType; @@ -32,9 +33,12 @@ public: void turnout_id(unsigned); }; + sigc::signal signal_path_changed; + private: Layout &layout; const TrackType &type; + Block *block; Point pos; float rot; float slope; @@ -50,8 +54,11 @@ public: Track(Layout &, const TrackType &); ~Track(); + Layout &get_layout() const { return layout; } const TrackType &get_type() const { return type; } + void set_block(Block *); + Block &get_block() const; void set_position(const Point &); void set_rotation(float); void set_slope(float); @@ -69,7 +76,7 @@ public: void set_active_path(unsigned); unsigned get_active_path() const { return active_path; } - int get_endpoint_by_link(const Track &) const; + int get_endpoint_by_link(Track &) const; Point get_endpoint_position(unsigned) const; float get_endpoint_direction(unsigned) const; bool snap_to(Track &, bool); @@ -78,8 +85,8 @@ public: void break_links(); const std::vector &get_links() const { return links; } Track *get_link(unsigned) const; - unsigned traverse(unsigned, unsigned) const; TrackPoint get_point(unsigned, unsigned, float) const; + TrackPoint get_point(unsigned, float) const; void save(std::list &) const; private: