#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):
delete trains.begin()->second;
while(!routes.empty())
delete *routes.begin();
+ while(!zones.empty())
+ delete *zones.begin();
while(!tracks.empty())
delete *tracks.begin();
while(!blocks.empty())
}
}
-unsigned Layout::allocate_turnout_id(bool dbl)
+unsigned Layout::allocate_turnout_id()
{
set<unsigned> used_ids;
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
used_ids.insert((*i)->get_turnout_id());
unsigned result = next_turnout_id;
- while(used_ids.count(result) || (dbl && used_ids.count(result+1)))
+ while(used_ids.count(result))
++result;
- next_turnout_id = result+1+dbl;
+ next_turnout_id = result+1;
return result;
}
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()))
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);
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());
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;
(*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_dynamic(const string &fn) const
{
IO::BufferedFile out(fn, IO::M_WRITE);
DataFile::Writer writer(out);
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ if(unsigned tid = (*i)->get_turnout_id())
+ writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path()));
+
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
DataFile::Statement st("train");
{
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("turnout", &Loader::turnout);
+ 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()
load_sub(*trn);
}
+void Layout::Loader::turnout(unsigned addr, unsigned path)
+{
+ if(obj.driver)
+ obj.driver->set_turnout(addr, path);
+}
+
+void Layout::Loader::zone()
+{
+ Zone *zne = new Zone(obj);
+ load_sub(*zne);
+}
+
} // namespace R2C2