X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.h;h=89788e3b62b477fc945229a96f4e1ede0ecbfc7f;hb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;hp=a8e220d5de1c91997eda62fb4680d974bf73affa;hpb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;p=r2c2.git

diff --git a/source/libmarklin/route.h b/source/libmarklin/route.h
index a8e220d..89788e3 100644
--- a/source/libmarklin/route.h
+++ b/source/libmarklin/route.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2007-2008  Mikkosoft Productions, Mikko Rasa
+Copyright © 2007-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -11,25 +11,50 @@ Distributed under the GPL
 #include <map>
 #include <set>
 #include <string>
+#include <sigc++/trackable.h>
+#include <msp/datafile/loader.h>
 
 namespace Marklin {
 
+class Layout;
 class Track;
-class Turnout;
 
-class Route
+class Route: public sigc::trackable
 {
+public:
+	class Loader: public Msp::DataFile::BasicLoader<Route>
+	{
+	public:
+		Loader(Route &);
+	private:
+		void turnout(unsigned, unsigned);
+	};
+
 private:
+	Layout &layout;
 	std::string name;
-	std::set<Track *> tracks;
-	std::map<unsigned, Turnout *> turnouts;
+	std::set<const Track *> tracks;
+	std::map<unsigned, int> turnouts;
 
 public:
-	Route();
+	Route(Layout &, const std::string &);
 	~Route();
 
-	const std::map<unsigned, Turnout *> &get_turnouts() const { return turnouts; }
-	void add_track(Track *);
+	const std::string &get_name() const { return name; }
+	int get_turnout(unsigned) const;
+	const std::map<unsigned, int> &get_turnouts() const { return turnouts; }
+	void add_track(const Track &);
+	void add_tracks(const std::set<const Track *> &);
+	const std::set<const Track *> &get_tracks() const { return tracks; }
+	void save(std::list<Msp::DataFile::Statement> &) const;
+private:
+	void update_turnouts();
+	unsigned check_validity(const Track &) const;
+	void track_removed(Track &);
+
+public:
+	static Route *find(const Track &, unsigned, const Track &);
+	static Route *find(const Track &, unsigned, const Route &);
 };
 
 } // namespace Marklin