X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.h;h=9b440cb255bdb33bdf9f4981c1138be91ec466ca;hb=cb4e53ba1b8ea41b978190de6668e9862b9cfea8;hp=5ea86be167781d3f4ca4b400b5f20bb3207c5a3c;hpb=a20b8421d002629a9f4d97c0c378e9f9cb29e292;p=r2c2.git

diff --git a/source/libr2c2/route.h b/source/libr2c2/route.h
index 5ea86be..9b440cb 100644
--- a/source/libr2c2/route.h
+++ b/source/libr2c2/route.h
@@ -5,41 +5,24 @@
 #include <set>
 #include <string>
 #include <sigc++/trackable.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
+#include "trackchain.h"
 
 namespace R2C2 {
 
 class Layout;
+class Object;
 class Track;
 class TrackIter;
 class Zone;
 
-enum RouteValidityMask
-{
-	ROUTE_INVALID = 0,
-	ROUTE_LINKED = 1,
-	ROUTE_LINEAR = 2,
-	ROUTE_SMOOTH = 4,
-	ROUTE_VALID = 7
-};
-
-class bad_route: public std::logic_error
-{
-public:
-	bad_route(RouteValidityMask m): std::logic_error(get_message(m)) { }
-	virtual ~bad_route() throw() { }
-
-private:
-	static std::string get_message(RouteValidityMask);
-};
-
 
-class Route: public sigc::trackable
+class Route: public TrackChain
 {
 public:
 	typedef std::map<unsigned, int> TurnoutMap;
 
-	class Loader: public Msp::DataFile::BasicLoader<Route>
+	class Loader: public Msp::DataFile::ObjectLoader<Route>
 	{
 	private:
 		TurnoutMap turnouts;
@@ -54,10 +37,8 @@ public:
 	sigc::signal<void, const std::string &> signal_name_changed;
 
 private:
-	Layout &layout;
 	std::string name;
 	bool temporary;
-	std::set<Track *> tracks;
 	TurnoutMap turnouts;
 
 public:
@@ -73,17 +54,13 @@ public:
 	int get_turnout(unsigned) const;
 	unsigned get_path(Track &) const;
 	const std::map<unsigned, int> &get_turnouts() const { return turnouts; }
-	void add_track(Track &);
-	void add_tracks(const std::set<Track *> &);
-	void add_track_chain(Track &, unsigned, const TurnoutMap &);
-	const std::set<Track *> &get_tracks() const { return tracks; }
-	bool has_track(Track &) const;
-	void save(std::list<Msp::DataFile::Statement> &) const;
+	void add_track_chain(const TrackIter &, const TurnoutMap &);
 private:
-	RouteValidityMask check_validity(Track &) const;
-	void track_removed(Track &);
+	virtual void on_track_added(Track &);
 
 public:
+	void save(std::list<Msp::DataFile::Statement> &) const;
+
 	static Route *find(const TrackIter &, Track &);
 	static Route *find(const TrackIter &, const Route &);
 	static Route *find(const TrackIter &, const Zone &);