layout.remove(*this);
}
-void Route::set_name(const string &n)
-{
- name = n;
- signal_name_changed.emit(name);
-}
-
void Route::set_temporary(bool t)
{
temporary = t;
void Route::update_turnout(Track &track)
{
+ if(!track.get_type().is_turnout())
+ return;
+
// Build a combined path mask from linked endpoints
unsigned nls = track.get_n_link_slots();
unsigned mask = track.get_type().get_paths();
unsigned Route::get_path(Track &trk) const
{
- if(unsigned taddr = trk.get_turnout_address())
+ if(trk.get_type().is_turnout())
{
- map<unsigned, int>::const_iterator i = turnouts.find(taddr);
- if(i!=turnouts.end())
+ map<unsigned, int>::const_iterator i = turnouts.find(trk.get_turnout_address());
+ if(i!=turnouts.end() && i->second>=0)
return i->second;
}
return trk.get_active_path();
st.push_back((DataFile::Statement("turnout"), i->first, i->second));
}
+DataFile::Statement Route::save_reference() const
+{
+ return (DataFile::Statement("route"), name);
+}
+
Route *Route::find(const TrackIter &from, Track &to)
{
return create_route(from, TrackMatch(to));
Route::Loader::Loader(Route &r):
DataFile::ObjectLoader<Route>(r)
{
- add("name", &Route::name);
+ add("name", &Loader::name);
add("turnout", &Loader::turnout);
}
}
}
+void Route::Loader::name(const string &n)
+{
+ obj.name = n;
+}
+
void Route::Loader::turnout(unsigned id, unsigned path)
{
turnouts[id] = path;