X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=fefa3e9b3fb4045e2d6ecf84280c0319fa2431ed;hb=dec294d40194a640e7b4bccf20dd1baa4a87038c;hp=df6989d3320cd3c7cbf4fb0f850915920f8ff431;hpb=b14059de03324aecde3efc649293d98ce5b7aaf2;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index df6989d..fefa3e9 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -1,11 +1,5 @@
-/* $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>
@@ -16,6 +10,8 @@ Distributed under the GPL
 #include "driver.h"
 #include "layout.h"
 #include "route.h"
+#include "signal.h"
+#include "signaltype.h"
 #include "track.h"
 #include "tracktype.h"
 #include "train.h"
@@ -63,7 +59,7 @@ Layout::~Layout()
 Driver &Layout::get_driver() const
 {
 	if(!driver)
-		throw InvalidState("No driver");
+		throw logic_error("!driver");
 	return *driver;
 }
 
@@ -85,6 +81,18 @@ void Layout::remove_track(Track &t)
 	}
 }
 
+void Layout::add_signal(Signal &s)
+{
+	if(signals.insert(&s).second)
+		signal_signal_added.emit(s);
+}
+
+void Layout::remove_signal(Signal &s)
+{
+	if(signals.erase(&s))
+		signal_signal_removed.emit(s);
+}
+
 Track *Layout::pick_track(const Vector &start, const Vector &ray)
 {
 	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
@@ -126,7 +134,7 @@ Block &Layout::get_block(unsigned id) const
 		if((*i)->get_id()==id)
 			return **i;
 
-	throw KeyError("Unknown block", lexical_cast(id));
+	throw key_error(id);
 }
 
 void Layout::create_blocks()
@@ -186,7 +194,7 @@ 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);
+	throw key_error(name);
 }
 
 void Layout::update_routes()
@@ -225,7 +233,7 @@ Zone &Layout::get_zone(const string &group, unsigned num) const
 		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)
@@ -236,19 +244,13 @@ 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)
@@ -282,6 +284,8 @@ void Layout::tick()
 
 	for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
 		(*i)->tick(dt);
+	for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
+		(*i)->tick(dt);
 	for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
 		i->second->tick(t, dt);
 }
@@ -310,6 +314,14 @@ void Layout::save(const string &fn) const
 		writer.write(st);
 	}
 
+	for(set<Signal *>::const_iterator i=signals.begin(); i!=signals.end(); ++i)
+	{
+		DataFile::Statement st("signal");
+		st.append((*i)->get_type().get_article_number());
+		(*i)->save(st.sub);
+		writer.write(st);
+	}
+
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 	{
 		if((*i)->is_temporary())
@@ -356,11 +368,12 @@ void Layout::block_state_changed(Block &block, Block::State state)
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::BasicLoader<Layout>(l),
+	DataFile::ObjectLoader<Layout>(l),
 	new_tracks(false)
 {
 	add("base",  &Layout::base);
 	add("route", static_cast<void (Loader::*)()>(&Loader::route));
+	add("signal", &Loader::signal);
 	add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
 	add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
 	add("turnout", &Loader::turnout);
@@ -391,6 +404,12 @@ void Layout::Loader::route(const string &n)
 	load_sub(*rte);
 }
 
+void Layout::Loader::signal(ArticleNumber art_nr)
+{
+	Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+	load_sub(*sig);
+}
+
 void Layout::Loader::track(unsigned art_nr)
 {
 	track(ArticleNumber(art_nr));