X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=530d0209015a6217165d5fe4217637a239aae024;hb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;hp=4c19caf01a9625a9921b4a345bd4baada65a177e;hpb=f9254f57b736927a57a2fd793ee18f6c9766dd43;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 4c19caf..530d020 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -16,19 +16,32 @@ Distributed under the GPL
 namespace Marklin {
 
 class Locomotive;
+class Route;
 class Sensor;
 class TrafficManager;
+class Turnout;
 
 class Train: public sigc::trackable
 {
 public:
 	class Loader: public Msp::DataFile::BasicLoader<Train>
 	{
+	private:
+		Block *prev_block;
+
 	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 &);
 	};
 
 	sigc::signal<void, const std::string &> signal_name_changed;
+	sigc::signal<void, unsigned> signal_target_speed_changed;
+	sigc::signal<void, const Route *> signal_route_changed;
 	sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
@@ -40,21 +53,30 @@ private:
 		BlockRef(Block *s, unsigned e): block(s), entry(e) { }
 	};
 
+	struct RealSpeed
+	{
+		float speed;
+		float weight;
+
+		RealSpeed();
+		void add(float, float);
+	};
+
 	TrafficManager &trfc_mgr;
 	std::string name;
 	Locomotive &loco;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
+	Block *pending_block;
 	unsigned target_speed;
-	Msp::Time::TimeStamp try_reserve;
+	const Route *route;
 	std::string status;
 
 	Msp::Time::TimeStamp last_entry_time;
 	float travel_dist;
 	unsigned travel_speed;
 	bool pure_speed;
-	float speed_scale;
-	float speed_scale_weight;
+	std::vector<RealSpeed> real_speed;
 
 	Track *cur_track;
 	unsigned cur_track_ep;
@@ -67,23 +89,34 @@ public:
 	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; }
+	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 free_block(Block *);
+	void place(Block &, unsigned);
+	bool is_placed() const { return !cur_blocks.empty(); }
+	bool free_block(Block &);
+	int get_entry_to_block(Block &) const;
 	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_route_changing(unsigned, Turnout *);
-	void turnout_route_changed(unsigned, Turnout *);
+	void turnout_path_changing(unsigned, Turnout *);
+	void turnout_path_changed(unsigned, Turnout *);
+	void block_reserved(const Block &, const Train *);
 	unsigned reserve_more();
 	void update_speed();
+	float get_real_speed(unsigned) const;
+	unsigned find_speed(float) 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;
 };
 
 } // namespace Marklin