X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=de61b1bca4d5eb7e7ed5593af108ee34a2709abb;hb=e75f12451201fb6540ad2155e8796c2b5aee8d4c;hp=5c4cf9e1d82d26f604fbb4f5a20736cf944937d6;hpb=277e8e7e4230aa8867f507ace62476afe575cff1;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 5c4cf9e..de61b1b 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>
@@ -41,14 +35,13 @@ Layout::Layout(Catalogue &c, Driver *d):
 	catalogue(c),
 	driver(d),
 	next_turnout_id(0x800)
-{
-	if(driver)
-		driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event));
-}
+{ }
 
 Layout::~Layout()
 {
 	delete driver;
+	driver = 0;
+
 	while(!trains.empty())
 		delete trains.begin()->second;
 	while(!routes.empty())
@@ -64,7 +57,7 @@ Layout::~Layout()
 Driver &Layout::get_driver() const
 {
 	if(!driver)
-		throw InvalidState("No driver");
+		throw logic_error("!driver");
 	return *driver;
 }
 
@@ -113,6 +106,12 @@ unsigned Layout::allocate_turnout_id()
 void Layout::add_block(Block &b)
 {
 	blocks.insert(&b);
+	b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
+	if(b.get_sensor_id())
+	{
+		b.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_state_changed), sigc::ref(b)));
+		b.signal_state_changed.connect(sigc::bind<0>(signal_block_state_changed, sigc::ref(b)));
+	}
 }
 
 Block &Layout::get_block(unsigned id) const
@@ -121,7 +120,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()
@@ -181,7 +180,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()
@@ -220,7 +219,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)
@@ -231,19 +230,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)
@@ -275,6 +268,8 @@ void Layout::tick()
 		dt = t-last_tick;
 	last_tick = t;
 
+	for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		(*i)->tick(dt);
 	for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
 		i->second->tick(t, dt);
 }
@@ -341,23 +336,15 @@ void Layout::save_dynamic(const string &fn) const
 	}
 }
 
-void Layout::sensor_event(unsigned addr, bool state)
+void Layout::block_state_changed(Block &block, Block::State state)
 {
-	if(state)
-	{
-		for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-			if((*i)->get_sensor_id()==addr)
-			{
-				if(!(*i)->get_train())
-					emergency(format("Unreserved sensor %d triggered", addr));
-				break;
-			}
-	}
+	if(state==Block::ACTIVE && !block.get_train())
+		emergency(format("Unreserved sensor %d triggered", block.get_sensor_id()));
 }
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::BasicLoader<Layout>(l),
+	DataFile::ObjectLoader<Layout>(l),
 	new_tracks(false)
 {
 	add("base",  &Layout::base);