void Layout::add(Object &o)
{
if(objects.insert(o))
- signal_object_added.emit(o);
+ {
+ try
+ {
+ signal_object_added.emit(o);
+ }
+ catch(...)
+ {
+ objects.erase(o);
+ throw;
+ }
+ }
}
void Layout::add(Track &t)
{
if(objects.insert(t))
{
- // Blocks must be recreated first
- create_blocks();
- signal_object_added.emit(t);
+ try
+ {
+ // Blocks must be recreated first
+ create_blocks();
+ signal_object_added.emit(t);
+ }
+ catch(...)
+ {
+ objects.erase(t);
+ create_blocks();
+ throw;
+ }
}
}
void Layout::add(TrackChain &g)
{
if(track_chains.insert(g))
- signal_track_chain_added.emit(g);
+ {
+ try
+ {
+ signal_track_chain_added.emit(g);
+ }
+ catch(...)
+ {
+ track_chains.erase(g);
+ throw;
+ }
+ }
}
void Layout::add(Block &b)
{
if(track_chains.insert(b))
{
- b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
- signal_track_chain_added.emit(b);
+ sigc::connection conn = b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
+ try
+ {
+ signal_track_chain_added.emit(b);
+ }
+ catch(...)
+ {
+ track_chains.erase(b);
+ conn.disconnect();
+ throw;
+ }
}
}
T *Layout::pick(const Ray &ray)
{
const set<Object *> &objs = objects.get();
+ T *closest = 0;
+ float distance = -1;
for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
if(T *t = dynamic_cast<T *>(*i))
- if(t->collide_ray(ray))
- return t;
+ {
+ float d = -1;
+ if(t->collide_ray(ray, &d))
+ if(!closest || d<distance)
+ {
+ closest = t;
+ distance = d;
+ }
+ }
- return 0;
+ return closest;
}
template Object *Layout::pick<Object>(const Ray &);
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_address())
+ if((*i)->get_type().is_turnout())
used_addrs.insert((*i)->get_turnout_address());
unsigned result = next_turnout_addr;
dt = t-last_tick;
last_tick = t;
- clock.tick(dt);
+ if(!driver || !driver->is_halted())
+ clock.tick(dt);
for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
(*i)->tick(dt);
i->second->tick(dt);
}
-void Layout::emergency(const string &msg)
+void Layout::emergency(Block *block, const string &msg)
{
if(driver)
driver->halt(true);
- IO::print("Emergency: %s\n", msg);
- signal_emergency.emit(msg);
+ if(block)
+ IO::print("Emergency at %s: %s\n", block->get_name(), msg);
+ else
+ IO::print("Emergency: %s\n", msg);
+ signal_emergency.emit(block, msg);
}
void Layout::save(const string &fn) const
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
DataFile::Statement st("track");
- st.append((*i)->get_type().get_article_number());
+ st.append(catalogue.get_name(&(*i)->get_type()));
(*i)->save(st.sub);
writer.write(st);
}
for(set<Signal *>::const_iterator i=signals.begin(); i!=signals.end(); ++i)
{
DataFile::Statement st("signal");
- st.append((*i)->get_type().get_article_number());
+ st.append(catalogue.get_name(&(*i)->get_type()));
(*i)->save(st.sub);
writer.write(st);
}
for(set<Terrain *>::const_iterator i=terrains.begin(); i!=terrains.end(); ++i)
{
DataFile::Statement st("terrain");
- st.append((*i)->get_type().get_article_number());
+ st.append(catalogue.get_name(&(*i)->get_type()));
(*i)->save(st.sub);
writer.write(st);
}
const set<Track *> &tracks = objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if(unsigned taddr = (*i)->get_turnout_address())
- writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
+ if((*i)->get_type().is_turnout())
+ writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
DataFile::Statement st("train");
- st.append(i->second->get_locomotive_type().get_article_number());
+ st.append(catalogue.get_name(&i->second->get_locomotive_type()));
st.append(i->second->get_address());
st.append(i->second->get_protocol());
i->second->save(st.sub);
{
Block *block = sensor.get_block();
if(block && !block->get_train())
- emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+ emergency(block, "Unreserved sensor triggered");
}
}
load_sub(*rte);
}
-void Layout::Loader::signal(ArticleNumber art_nr)
+void Layout::Loader::signal(const string &n)
{
- Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(art_nr));
+ Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(n));
load_sub(*sig);
}
-void Layout::Loader::terrain(ArticleNumber art_nr)
+void Layout::Loader::terrain(const string &n)
{
- Terrain *ter = new Terrain(obj, obj.catalogue.get<TerrainType>(art_nr));
+ Terrain *ter = new Terrain(obj, obj.catalogue.get<TerrainType>(n));
load_sub(*ter);
}
-void Layout::Loader::track(ArticleNumber art_nr)
+void Layout::Loader::track(const string &n)
{
- Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
+ Track *trk = new Track(obj, obj.catalogue.get<TrackType>(n));
load_sub(*trk);
const set<Track *> &tracks = obj.objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
trk->link_to(**i);
}
-void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
+void Layout::Loader::train(const string &n, unsigned addr, const std::string &proto)
{
- Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(art_nr), addr, proto);
+ Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(n), addr, proto);
load_sub(*trn);
}