X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=f267263cb9efbfa22cc804c4eb47c50ea5c972d9;hb=2bb6ce8ada216c0b2caa48f4639d03f2c581098e;hp=a89dc93c6addca56ff07ab23b0bd3b10cca6e404;hpb=d27edb207810f0b4e44be8c3632d421faa5fed80;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index a89dc93..f267263 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -12,11 +12,15 @@ Distributed under the GPL
 #include <sigc++/trackable.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
+#include "blockiter.h"
+#include "controller.h"
 
 namespace Marklin {
 
-class LocoType;
 class Route;
+class Timetable;
+class Vehicle;
+class VehicleType;
 
 class Train: public sigc::trackable
 {
@@ -25,32 +29,35 @@ public:
 	{
 	private:
 		Block *prev_block;
+		bool blocks_valid;
 
 	public:
 		Loader(Train &);
 	private:
+		virtual void finish();
 		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, unsigned> signal_speed_changed;
-	sigc::signal<void, bool> signal_reverse_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:
-	struct BlockRef
+	struct RouteRef
 	{
-		Block *block;
-		unsigned entry;
+		const Route *route;
+		unsigned diversion;
 
-		BlockRef(Block *s, unsigned e): block(s), entry(e) { }
+		RouteRef(const Route *, unsigned = 0);
 	};
 
 	struct RealSpeed
@@ -62,80 +69,108 @@ private:
 		void add(float, float);
 	};
 
+	typedef std::list<BlockIter> BlockList;
+
 	Layout &layout;
-	const LocoType &loco_type;
+	const VehicleType &loco_type;
 	unsigned address;
 	std::string name;
-	std::list<BlockRef> cur_blocks;
-	std::list<BlockRef> rsv_blocks;
+	int priority;
+	const Train *yielding_to;
+	std::vector<Vehicle *> vehicles;
+	BlockList cur_blocks;
+	BlockList rsv_blocks;
 	Block *pending_block;
-	unsigned target_speed;
+	bool reserving;
+	bool advancing;
+	Controller *controller;
+	Timetable *timetable;
+	bool active;
 	unsigned current_speed;
+	bool speed_changing;
 	bool reverse;
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
-	const Route *route;
+	std::list<RouteRef> routes;
 	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(Layout &, const LocoType &, unsigned);
+	Train(Layout &, const VehicleType &, unsigned);
 	~Train();
 
-	const LocoType &get_locomotive_type() const { return loco_type; }
+	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 &);
 	const std::string &get_name() const { return name; }
-
-	void set_speed(unsigned);
-	void set_reverse(bool);
+	void set_priority(int);
+	void yield_to(const Train &);
+	int get_priority() const { return priority; }
+	Controller &get_controller() const { return *controller; }
+
+	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);
-	unsigned get_target_speed() const { return target_speed; }
-	unsigned get_speed() const { return current_speed; }
-	bool get_reverse() const { return reverse; }
+	float get_control(const std::string &) const;
+	float get_speed() 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; }
+	void go_to(Track &);
+	bool divert(Track &);
+	const Route *get_route() const;
 	void place(Block &, unsigned);
+	void unplace();
 	bool is_placed() const { return !cur_blocks.empty(); }
 	bool free_block(Block &);
+	void free_noncritical_blocks();
 	int get_entry_to_block(Block &) const;
+	float get_reserved_distance() const;
 
 	const std::string &get_status() const { return status; }
-	const Point &get_position() const { return pos; }
 
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
+	void control_changed(const Controller::Control &);
 	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_reserved_distance_until(const Block *, bool) const;
 	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;
+	void release_blocks(BlockList &);
+	void release_blocks(BlockList &, BlockList::iterator, BlockList::iterator);
+	void reverse_blocks(BlockList &) const;
+	bool advance_route(std::list<RouteRef>::iterator &, Track &);
+	Route *create_lead_route(Route *, const Route *);
+	bool is_valid_diversion(const Route &, Track &, unsigned);
 };
 
 } // namespace Marklin