dt /= clock.get_rate();
train.ai_message(Message("set-departure-delay", dt));
}
+ else if(i->type==THROUGH)
+ train.ai_message(Message("add-waypoint", i->target));
}
}
if(msg.type=="arrived")
{
if(current_row->type==ARRIVE)
+ record_time();
+ update_pending = true;
+ }
+ else if(msg.type=="waypoint-reached")
+ {
+ const TrackChain *wp = msg.value.value<const TrackChain *>();
+ if(current_row->type==THROUGH && current_row->target==wp)
{
- current_row->time = train.get_layout().get_clock().get_current_time();
- unsigned i = distance(rows.begin(), current_row);
- signal_row_modified.emit(i, *current_row);
+ record_time();
+ ++current_row;
}
- update_pending = true;
}
}
+void Timetable::record_time()
+{
+ current_row->time = train.get_layout().get_clock().get_current_time();
+ unsigned i = distance(rows.begin(), current_row);
+ signal_row_modified.emit(i, *current_row);
+}
+
Timetable::Row::Row():
type(ARRIVE),
- zone(0)
+ target(0)
{ }
void Timetable::Row::save(list<DataFile::Statement> &st) const
{
st.push_back((DataFile::Statement("type"), type));
st.push_back((DataFile::Statement("time"), time.raw()));
- st.push_back((DataFile::Statement("zone"), zone->get_group(), zone->get_number()));
+ st.push_back(target->save_reference());
}
DataFile::ObjectLoader<Timetable::Row>(r),
layout(l)
{
- add("zone", &Loader::zone);
+ add("block", &Loader::block);
add("time", &Loader::time);
add("type", &Row::type);
+ add("zone", &Loader::zone);
}
-void Timetable::Row::Loader::zone(const string &name, unsigned number)
+void Timetable::Row::Loader::block(unsigned id)
{
- obj.zone = &layout.get_zone(name, number);
+ obj.target = &layout.get_block(id);
}
void Timetable::Row::Loader::time(Time::RawTime t)
obj.time = Time::TimeDelta(t);
}
+void Timetable::Row::Loader::zone(const string &name, unsigned number)
+{
+ obj.target = &layout.get_zone(name, number);
+}
+
void operator<<(LexicalConverter &conv, Timetable::RowType rt)
{
{
case Timetable::ARRIVE: conv.result("ARRIVE"); return;
case Timetable::DEPART: conv.result("DEPART"); return;
+ case Timetable::THROUGH: conv.result("THROUGH"); return;
default: throw lexical_error(format("conversion of RowType(%d) to string", rt));
}
}
rt = Timetable::ARRIVE;
else if(conv.get()=="DEPART")
rt = Timetable::DEPART;
+ else if(conv.get()=="THROUGH")
+ rt = Timetable::THROUGH;
else
throw lexical_error(format("conversion of '%s' to RowType", conv.get()));
}