Layout::Layout(Catalogue &c, Driver *d):
catalogue(c),
driver(d),
- next_turnout_id(0x800)
+ next_turnout_addr(0x800)
{
clock.set_rate(60);
}
remove(static_cast<Sensor &>(g));
}
-unsigned Layout::allocate_turnout_id()
+unsigned Layout::allocate_turnout_address()
{
- set<unsigned> used_ids;
+ set<unsigned> used_addrs;
const set<Track *> &tracks = objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if((*i)->get_turnout_id())
- used_ids.insert((*i)->get_turnout_id());
+ if((*i)->get_turnout_address())
+ used_addrs.insert((*i)->get_turnout_address());
- unsigned result = next_turnout_id;
- while(used_ids.count(result))
+ unsigned result = next_turnout_addr;
+ while(used_addrs.count(result))
++result;
- next_turnout_id = result+1;
+ next_turnout_addr = result+1;
return result;
}
const set<Track *> &tracks = objects.get<Track>();
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()));
+ if(unsigned taddr = (*i)->get_turnout_address())
+ writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
Layout::Loader::Loader(Layout &l):
- DataFile::ObjectLoader<Layout>(l),
- new_tracks(false)
+ DataFile::ObjectLoader<Layout>(l)
{
add("base", &Layout::base);
add("beamgate", &Loader::beamgate);
void Layout::Loader::signal(ArticleNumber art_nr)
{
- Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+ Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(art_nr));
load_sub(*sig);
}
void Layout::Loader::track(ArticleNumber art_nr)
{
- Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
+ Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
load_sub(*trk);
- new_tracks = true;
const set<Track *> &tracks = obj.objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if(*i!=trk)
void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
{
- Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);
+ Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(art_nr), addr, proto);
load_sub(*trn);
}