Add support for named zones

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 1c0d4cff76e125b2b8bb9525162e41f55f4d9c2b..3e49f19b836fa56351f4b42439e9be6b00e588be 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -20,10 +20,21 @@ Distributed under the GPL
 #include "tracktype.h"
 #include "train.h"
 #include "vehicletype.h"
+#include "zone.h"
 
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+bool zone_order(const R2C2::Zone *z1, const R2C2::Zone *z2)
+{
+       return z1->get_number()<z2->get_number();
+}
+
+}
+
+
 namespace R2C2 {
 
 Layout::Layout(Catalogue &c, Driver *d):
@@ -174,6 +185,39 @@ void Layout::remove_route(Route &r)
                signal_route_removed.emit(r);
 }
 
+void Layout::add_zone(Zone &z)
+{
+       if(zones.insert(&z).second)
+               signal_zone_added.emit(z);
+}
+
+Layout::ZoneArray Layout::get_zones(const string &group) const
+{
+       ZoneArray result;
+       for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+               if((*i)->get_group()==group)
+                       result.push_back(*i);
+
+       sort(result.begin(), result.end(), zone_order);
+
+       return result;
+}
+
+Zone &Layout::get_zone(const string &group, unsigned num) const
+{
+       for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+               if((*i)->get_group()==group && (*i)->get_number()==num)
+                       return **i;
+
+       throw KeyError("Unknown zone", format("%s %d", group, num));
+}
+
+void Layout::remove_zone(Zone &z)
+{
+       if(zones.erase(&z))
+               signal_zone_removed.emit(z);
+}
+
 void Layout::add_train(Train &t)
 {
        if(trains.count(t.get_address()))
@@ -232,7 +276,7 @@ void Layout::emergency(const string &msg)
        signal_emergency.emit(msg);
 }
 
-void Layout::save(const string &fn)
+void Layout::save(const string &fn) const
 {
        IO::BufferedFile out(fn, IO::M_WRITE);
        DataFile::Writer writer(out);
@@ -240,7 +284,7 @@ void Layout::save(const string &fn)
        if(!base.empty())
                writer.write((DataFile::Statement("base"), base));
 
-       for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
                DataFile::Statement st("track");
                st.append((*i)->get_type().get_article_number());
@@ -248,7 +292,7 @@ void Layout::save(const string &fn)
                writer.write(st);
        }
 
-       for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+       for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
        {
                if((*i)->is_temporary())
                        continue;
@@ -257,9 +301,16 @@ void Layout::save(const string &fn)
                (*i)->save(st.sub);
                writer.write(st);
        }
+
+       for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+       {
+               DataFile::Statement st("zone");
+               (*i)->save(st.sub);
+               writer.write(st);
+       }
 }
 
-void Layout::save_trains(const string &fn)
+void Layout::save_trains(const string &fn) const
 {
        IO::BufferedFile out(fn, IO::M_WRITE);
        DataFile::Writer writer(out);
@@ -296,11 +347,14 @@ Layout::Loader::Loader(Layout &l):
 {
        add("base",  &Layout::base);
        add("route", static_cast<void (Loader::*)()>(&Loader::route));
+       add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+       add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
+       add("zone",  &Loader::zone);
+
+       // Deprecated aliases
        add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
        add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
-       add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
        add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
-       add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
 }
 
 void Layout::Loader::finish()
@@ -348,4 +402,10 @@ void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::strin
        load_sub(*trn);
 }
 
+void Layout::Loader::zone()
+{
+       Zone *zne = new Zone(obj);
+       load_sub(*zne);
+}
+
 } // namespace R2C2