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 dd139250cbc8b9b18feb9f7b872fad53f7559510..4ec4277fcd60d909851f3937b457e40e40c27a01 100644 (file)
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -26,18 +26,21 @@ public:
                Loader(Layout &);
        private:
                virtual void finish();
+               void route(const std::string &);
                void track(unsigned);
        };
 
 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;
 
 private:
        const Catalogue &catalogue;
        std::string base;
        std::set<Track *> tracks;
-       //std::set<Route *> routes;
+       std::map<std::string, Route *> routes;
 
 public:
        Layout(const Catalogue &);
@@ -48,8 +51,14 @@ public:
        const std::set<Track *> &get_tracks() const { return tracks; }
        void add_track(Track &);
        void remove_track(Track &);
-       void check_links();
+       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