X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=ccfcbec1058f0dd6c12ab5409ad66415e4c27298;hb=cf52013784607dc4d307bd1244c5346ee88336a4;hp=5a20bd01a4855fce7a330606838817b5caba6ba8;hpb=e94014530a6e28a42bc5678e579ee07e0ee5329b;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 5a20bd0..ccfcbec 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -15,8 +15,10 @@ Distributed under the GPL
 
 namespace Marklin {
 
+class ControlModel;
 class LocoType;
 class Route;
+class Timetable;
 class Vehicle;
 
 class Train: public sigc::trackable
@@ -35,14 +37,15 @@ public:
 		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:
@@ -68,12 +71,16 @@ private:
 	const LocoType &loco_type;
 	unsigned address;
 	std::string name;
+	int priority;
 	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;
@@ -84,31 +91,38 @@ private:
 
 	Msp::Time::TimeStamp last_entry_time;
 	float travel_dist;
-	unsigned travel_speed;
 	bool pure_speed;
 	std::vector<RealSpeed> real_speed;
+	bool accurate_position;
+	float overshoot_dist;
 
 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; }
+	void set_priority(int);
+	int get_priority() const { return priority; }
+	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; }
 
+	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; }
@@ -116,6 +130,7 @@ 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; }
 
@@ -127,11 +142,12 @@ private:
 	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_real_speed(unsigned) const;
 	unsigned find_speed(float) const;
+	float get_travel_speed() const;
 	void set_status(const std::string &);
 	void release_blocks(std::list<BlockRef> &);
 	void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);