if(!r)
{
destination = 0;
+ waypoints.clear();
}
train.refresh_blocks_from(*fncb);
return false;
}
+void TrainRouter::add_waypoint(const TrackChain &wp)
+{
+ waypoints.push_back(&wp);
+ update_pending = true;
+}
+
+bool TrainRouter::is_waypoint(unsigned index, Track &track) const
+{
+ if(index>=waypoints.size())
+ throw out_of_range("TrainRouter::is_waypoint");
+
+ return waypoints[index]->has_track(track);
+}
+
void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
{
delay = d;
else
set_destination(*msg.value.value<const TrackChain *>());
}
+ else if(msg.type=="add-waypoint")
+ {
+ if(msg.value.check_type<TrackChain *>())
+ add_waypoint(*msg.value.value<TrackChain *>());
+ else
+ add_waypoint(*msg.value.value<const TrackChain *>());
+ }
else if(msg.type=="set-departure-delay")
set_departure_delay(msg.value.value<Time::TimeDelta>());
}
if(arriving==1 && !train.get_speed())
{
- signal_arrived.emit();
- signal_event.emit(Message("arrived"));
+ signal_arrived.emit(destination);
+ signal_event.emit(Message("arrived", destination));
arriving = 2;
}
else if(arriving==2 && !train.get_block_allocator().is_active())
if(route.has_track(*b_iter.endpoint().track))
{
routes.pop_front();
+ const Route *r = get_route();
// XXX Exceptions?
- signal_event.emit(Message("route-changed", get_route()));
+ signal_route_changed.emit(r);
+ signal_event.emit(Message("route-changed", r));
+ }
+ }
+
+ if(!waypoints.empty())
+ {
+ const TrackChain &wp = *waypoints.front();
+ TrackIter t_iter = b_iter.track_iter();
+ if(wp.has_track(*t_iter))
+ {
+ for(; t_iter; t_iter=t_iter.next())
+ {
+ if(!wp.has_track(*t_iter))
+ {
+ waypoints.erase(waypoints.begin());
+ break;
+ }
+ else if(!block.has_track(*t_iter))
+ break;
+ }
}
}