-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <algorithm>
+#include <msp/core/maputils.h>
#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include <msp/datafile/writer.h>
Driver &Layout::get_driver() const
{
if(!driver)
- throw InvalidState("No driver");
+ throw logic_error("!driver");
return *driver;
}
if((*i)->get_id()==id)
return **i;
- throw KeyError("Unknown block", lexical_cast(id));
+ throw key_error(id);
}
void Layout::create_blocks()
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
if((*i)->get_name()==name)
return **i;
- throw KeyError("Unknown route", name);
+ throw key_error(name);
}
void Layout::update_routes()
if((*i)->get_group()==group && (*i)->get_number()==num)
return **i;
- throw KeyError("Unknown zone", format("%s %d", group, num));
+ throw key_error(format("%s %d", group, num));
}
void Layout::remove_zone(Zone &z)
void Layout::add_train(Train &t)
{
- if(trains.count(t.get_address()))
- throw KeyError("Duplicate train address", lexical_cast(t.get_address()));
-
- trains[t.get_address()] = &t;
+ insert_unique(trains, t.get_address(), &t);
signal_train_added.emit(t);
}
Train &Layout::get_train(unsigned addr) const
{
- map<unsigned, Train *>::const_iterator i = trains.find(addr);
- if(i==trains.end())
- throw KeyError("Unknown train", lexical_cast(addr));
- return *i->second;
+ return *get_item(trains, addr);
}
void Layout::remove_train(Train &t)
Layout::Loader::Loader(Layout &l):
- DataFile::BasicLoader<Layout>(l),
+ DataFile::ObjectLoader<Layout>(l),
new_tracks(false)
{
add("base", &Layout::base);