X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.h;h=0b036371e2cf29bb922249015e8dad9f6f265440;hb=8e3009751ee81e0e5312cae53ee844bdd9e49628;hp=14ac94ce9073f0dcba51d788ea140e64c8a9d811;hpb=d27edb207810f0b4e44be8c3632d421faa5fed80;p=r2c2.git

diff --git a/source/libmarklin/route.h b/source/libmarklin/route.h
index 14ac94c..0b03637 100644
--- a/source/libmarklin/route.h
+++ b/source/libmarklin/route.h
@@ -18,42 +18,61 @@ namespace Marklin {
 
 class Layout;
 class Track;
+class TrackIter;
 
 class Route: public sigc::trackable
 {
 public:
+	typedef std::map<unsigned, int> TurnoutMap;
+
 	class Loader: public Msp::DataFile::BasicLoader<Route>
 	{
+	private:
+		TurnoutMap turnouts;
+
 	public:
 		Loader(Route &);
 	private:
+		virtual void finish();
 		void turnout(unsigned, unsigned);
 	};
 
+	sigc::signal<void, const std::string &> signal_name_changed;
+
 private:
 	Layout &layout;
 	std::string name;
-	std::set<const Track *> tracks;
-	std::map<unsigned, int> turnouts;
+	bool temporary;
+	std::set<Track *> tracks;
+	TurnoutMap turnouts;
 
 public:
-	Route(Layout &, const std::string &);
+	Route(Layout &);
 	~Route();
 
+	void set_name(const std::string &);
 	const std::string &get_name() const { return name; }
+	void set_temporary(bool);
+	bool is_temporary() const { return temporary; }
+	void set_turnout(unsigned, unsigned);
+	void update_turnouts();
 	int get_turnout(unsigned) const;
+	unsigned get_path(Track &) 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 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;
 private:
-	void update_turnouts();
-	unsigned check_validity(const Track &) const;
+	unsigned check_validity(Track &) const;
 	void track_removed(Track &);
 
 public:
-	static Route *find(const Track &, unsigned, const Track &);
+	static Route *find(const TrackIter &, Track &);
+	static Route *find(const TrackIter &, const Route &);
+	static Route *find(const TrackIter &, const std::set<Track *> &);
 };
 
 } // namespace Marklin