designer.get_layout()->add_route(*route);
designer.edit_route(*route);
- const set<Route *> &routes = designer.get_layout()->get_routes();
+ const map<string, Route *> &routes = designer.get_layout()->get_routes();
int selected = -1;
unsigned n = 0;
- for(set<Route *>::const_iterator i=routes.begin(); (selected<0 && i!=routes.end()); ++i, ++n)
- if(*i==route)
+ for(map<string, Route *>::const_iterator i=routes.begin(); (selected<0 && i!=routes.end()); ++i, ++n)
+ if(i->second==route)
selected = n;
drp_routes->set_selected_index(selected);
}
else
{
- const set<Route *> &routes = designer.get_layout()->get_routes();
- set<Route *>::const_iterator i = routes.begin();
+ const map<string, Route *> &routes = designer.get_layout()->get_routes();
+ map<string, Route *>::const_iterator i = routes.begin();
advance(i, index);
- designer.edit_route(**i);
+ designer.edit_route(*i->second);
}
}
void Toolbar::update_routes()
{
drp_routes->clear();
- const set<Route *> &routes = designer.get_layout()->get_routes();
+ const map<string, Route *> &routes = designer.get_layout()->get_routes();
int selected = -1;
unsigned n = 0;
- for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
+ for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
{
- drp_routes->append((*i)->get_name());
- if(*i==designer.get_current_route())
+ drp_routes->append(i->second->get_name());
+ if(i->second==designer.get_current_route())
selected = n;
}
drp_routes->append("(new route)");
drp_route->set_geometry(GLtk::Geometry(10, geom.h-50, geom.w-20, 20));
drp_route->append("(none)");
drp_route->set_selected_index(0);
- const set<Route *> &routes = engineer.get_layout().get_routes();
+ const map<string, Route *> &routes = engineer.get_layout().get_routes();
unsigned n = 1;
- for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
+ for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
{
- drp_route->append((*i)->get_name());
- if(*i==train.get_route())
+ drp_route->append(i->second->get_name());
+ if(i->second==train.get_route())
drp_route->set_selected_index(n);
}
}
{
if(drp_route->get_selected_index()>0)
{
- const set<Route *> &routes = engineer.get_layout().get_routes();
- set<Route *>::const_iterator i = routes.begin();
+ const map<string, Route *> &routes = engineer.get_layout().get_routes();
+ map<string, Route *>::const_iterator i = routes.begin();
advance(i, drp_route->get_selected_index()-1);
- train.set_route(*i);
+ train.set_route(i->second);
}
else
train.set_route(0);
void Layout::add_route(Route &r)
{
- if(routes.insert(&r).second)
- signal_route_added.emit(r);
+ if(routes.count(r.get_name()))
+ throw KeyError("Duplicate route name");
+ routes[r.get_name()] = &r;
+ signal_route_added.emit(r);
}
Route &Layout::get_route(const string &name) const
{
- for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
- if((*i)->get_name()==name)
- return **i;
- throw KeyError("Unknown route", name);
+ map<string, Route *>::const_iterator i = routes.find(name);
+ if(i==routes.end())
+ throw KeyError("Unknown route", name);
+ return *i->second;
}
void Layout::remove_route(Route &r)
{
- if(routes.erase(&r))
+ if(routes.erase(r.get_name()))
signal_route_removed.emit(r);
}
writer.write(st);
}
- for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+ for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
{
DataFile::Statement st("route");
- st.append((*i)->get_name());
- (*i)->save(st.sub);
+ st.append(i->first);
+ i->second->save(st.sub);
writer.write(st);
}
}
void Layout::check_routes()
{
- for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+ for(map<string, Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
{
// We must copy the turnout map, since adding tracks to the route will (temporarily) mess it up
- const map<unsigned, int> turnouts = (*i)->get_turnouts();
+ const map<unsigned, int> turnouts = i->second->get_turnouts();
Track *track = 0;
unsigned trk_path = 0;
if(!track)
continue;
- (*i)->add_track(*track);
+ i->second->add_track(*track);
const vector<Endpoint> &eps = track->get_type().get_endpoints();
unsigned ep = 0;
}
else
trk_path = 0;
- (*i)->add_track(*next);
+ i->second->add_track(*next);
track = next;
}
}
const Catalogue &catalogue;
std::string base;
std::set<Track *> tracks;
- std::set<Route *> routes;
+ std::map<std::string, Route *> routes;
public:
Layout(const Catalogue &);
void add_track(Track &);
void remove_track(Track &);
void add_route(Route &);
- const std::set<Route *> &get_routes() const { return routes; }
+ const std::map<std::string, Route *> &get_routes() const { return routes; }
Route &get_route(const std::string &) const;
void remove_route(Route &);
void save(const std::string &);
void Server::Connection::handshake_done()
{
- const set<Route *> &routes = server.trfc_mgr.get_layout().get_routes();
- for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+ const map<string, Route *> &routes = server.trfc_mgr.get_layout().get_routes();
+ for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
{
RouteInfoPacket pkt;
- pkt.name = (*i)->get_name();
+ pkt.name = i->first;
comm.send(pkt);
}