X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftimetable.h;h=3abbf83149e87e256bb9852a1c146a49c833c629;hb=59e4c75da550e96ae74162a5ed70e8b1999721d8;hp=39cff5ee6b2b14a077445521783ac2039630acd9;hpb=a9180bc4bb7ff4c403e206cc2c785ff32544a0d6;p=r2c2.git

diff --git a/source/libmarklin/timetable.h b/source/libmarklin/timetable.h
index 39cff5e..3abbf83 100644
--- a/source/libmarklin/timetable.h
+++ b/source/libmarklin/timetable.h
@@ -10,6 +10,7 @@ Distributed under the GPL
 
 #include <string>
 #include <vector>
+#include <sigc++/trackable.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 
@@ -18,7 +19,7 @@ namespace Marklin {
 class Block;
 class Train;
 
-class Timetable
+class Timetable: public sigc::trackable
 {
 public:
 	class Loader: public Msp::DataFile::ObjectLoader<Timetable>
@@ -26,6 +27,7 @@ public:
 	public:
 		Loader(Timetable &);
 	private:
+		void arrive();
 		void go_to(const std::string &);
 		void route(const std::string &);
 		void speed(int);
@@ -38,6 +40,7 @@ public:
 		GOTO,
 		TRAVEL,
 		WAIT,
+		ARRIVE,
 		SPEED,
 		ROUTE
 	};
@@ -50,10 +53,15 @@ public:
 
 		Row(RowType, int);
 		Row(RowType, const std::string &);
+
+		std::string str() const;
+
+		static Row parse(const std::string &);
 	};
 
 private:
 	Train &train;
+	bool enabled;
 	std::vector<Row> rows;
 	unsigned current_row;
 	bool executing;
@@ -63,6 +71,16 @@ private:
 public:
 	Timetable(Train &);
 
+	void set_enabled(bool);
+	bool is_enabled() const { return enabled; }
+	void reset();
+
+	void clear();
+	void append(const Row &);
+	void insert(unsigned, const Row &);
+	unsigned get_n_rows() const { return rows.size(); }
+	const Row &get_row(unsigned) const;
+
 	void tick(const Msp::Time::TimeStamp &);
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private: