Store routes in a map by name rather than a set

[r2c2.git] / source / libmarklin / layout.h

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index c292af6ed29167d47e2c7068cf3c939757d48187..4ec4277fcd60d909851f3937b457e40e40c27a01 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -1,8 +1,15 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_LAYOUT_H_
 #define LIBMARKLIN_LAYOUT_H_
 
 #include <sigc++/sigc++.h>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "route.h"
 #include "track.h"
 
@@ -13,34 +20,45 @@ class Catalogue;
 class Layout
 {
 public:
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::BasicLoader<Layout>
        {
        public:
                Loader(Layout &);
-               Layout &get_object() { return layout; }
        private:
-               Layout &layout;
-
+               virtual void finish();
+               void route(const std::string &);
                void track(unsigned);
        };
 
-       sigc::signal<void, Track *> signal_track_added;
-       sigc::signal<void, Track *> signal_track_removed;
+public:
+       sigc::signal<void, Track &> signal_track_added;
+       sigc::signal<void, Track &> signal_track_removed;
+       sigc::signal<void, Route &> signal_route_added;
+       sigc::signal<void, Route &> signal_route_removed;
 
-       Layout(Catalogue &);
-       const TrackSeq &get_tracks() const { return tracks; }
-       void  add_track(Track *);
-       void  remove_track(Track *);
-       void  check_links();
-       void  load(const std::string &);
-       int   save(const std::string &);
-       ~Layout();
 private:
-       Catalogue   &catalogue;
-       std::string filename;
+       const Catalogue &catalogue;
        std::string base;
-       TrackSeq    tracks;
-       RouteSeq    routes;
+       std::set<Track *> tracks;
+       std::map<std::string, Route *> routes;
+
+public:
+       Layout(const Catalogue &);
+       ~Layout();
+
+       const Catalogue &get_catalogue() const { return catalogue; }
+       const std::string &get_base() const { return base; }
+       const std::set<Track *> &get_tracks() const { return tracks; }
+       void add_track(Track &);
+       void remove_track(Track &);
+       void add_route(Route &);
+       const std::map<std::string, Route *> &get_routes() const { return routes; }
+       Route &get_route(const std::string &) const;
+       void remove_route(Route &);
+       void save(const std::string &);
+private:
+       void check_links();
+       void check_routes();
 };
 
 } // namespace Marklin