X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=5960c27d16b78164da022a40e0c79e7529647244;hb=a9180bc4bb7ff4c403e206cc2c785ff32544a0d6;hp=b579d7f37deba40ba47d607baabf0e42817e7de7;hpb=306cf0a8709a781b3031aa05a7b353a9b3a308e5;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index b579d7f..5960c27 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -15,8 +15,11 @@ Distributed under the GPL
 
 namespace Marklin {
 
+class ControlModel;
 class LocoType;
 class Route;
+class Timetable;
+class Vehicle;
 
 class Train: public sigc::trackable
 {
@@ -34,14 +37,14 @@ public:
 		void name(const std::string &);
 		void real_speed(unsigned, float, float);
 		void route(const std::string &);
+		void timetable();
 	};
 
 	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:
@@ -67,11 +70,15 @@ private:
 	const LocoType &loco_type;
 	unsigned address;
 	std::string name;
+	std::vector<Vehicle *> vehicles;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
 	Block *pending_block;
-	unsigned target_speed;
+	ControlModel *control;
+	Timetable *timetable;
+	bool active;
 	unsigned current_speed;
+	bool speed_changing;
 	bool reverse;
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
@@ -82,30 +89,28 @@ private:
 
 	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;
-
 public:
 	Train(Layout &, const LocoType &, unsigned);
 	~Train();
 
+	Layout &get_layout() const { return layout; }
 	const LocoType &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; }
+	ControlModel &get_control() const { return *control; }
+
+	Vehicle &get_vehicle(unsigned);
+	const Vehicle &get_vehicle(unsigned) const;
 
-	void set_speed(unsigned);
-	void set_reverse(bool);
+	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;
+	bool is_active() const { return active; }
 	bool get_function(unsigned) const;
 	unsigned get_functions() const { return functions; }
 
@@ -116,9 +121,9 @@ public:
 	bool is_placed() const { return !cur_blocks.empty(); }
 	bool free_block(Block &);
 	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 &);
 
@@ -130,11 +135,10 @@ private:
 	void turnout_event(unsigned, bool);
 	void block_reserved(const Block &, const Train *);
 	unsigned reserve_more();
-	void update_speed();
 	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;