#include "driver.h"
#include "layout.h"
#include "route.h"
+#include "signal.h"
+#include "signaltype.h"
#include "track.h"
#include "tracktype.h"
#include "train.h"
Driver &Layout::get_driver() const
{
if(!driver)
- throw InvalidState("No driver");
+ throw logic_error("!driver");
return *driver;
}
}
}
+void Layout::add_signal(Signal &s)
+{
+ if(signals.insert(&s).second)
+ signal_signal_added.emit(s);
+}
+
+void Layout::remove_signal(Signal &s)
+{
+ if(signals.erase(&s))
+ signal_signal_removed.emit(s);
+}
+
Track *Layout::pick_track(const Vector &start, const Vector &ray)
{
for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
(*i)->tick(dt);
+ for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
+ (*i)->tick(dt);
for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
i->second->tick(t, dt);
}
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());
+ (*i)->save(st.sub);
+ writer.write(st);
+ }
+
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
{
if((*i)->is_temporary())
Layout::Loader::Loader(Layout &l):
- DataFile::BasicLoader<Layout>(l),
+ DataFile::ObjectLoader<Layout>(l),
new_tracks(false)
{
add("base", &Layout::base);
add("route", static_cast<void (Loader::*)()>(&Loader::route));
+ add("signal", &Loader::signal);
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);
load_sub(*rte);
}
+void Layout::Loader::signal(ArticleNumber art_nr)
+{
+ Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+ load_sub(*sig);
+}
+
void Layout::Loader::track(unsigned art_nr)
{
track(ArticleNumber(art_nr));