X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Flayout.cpp;h=45b18e322fa6e8db5a065fb616e002b869b206a8;hb=8b7d4054b05002d82338775ac9b4ee764a8560e4;hp=821482ae1da813c76cfeb32e64b2747dcac548fa;hpb=4236c30c0a7a48854e9634e9ad7d8d6e0fd243a3;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 821482a..45b18e3 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -10,6 +10,8 @@
 #include "driver.h"
 #include "layout.h"
 #include "route.h"
+#include "signal.h"
+#include "signaltype.h"
 #include "track.h"
 #include "tracktype.h"
 #include "train.h"
@@ -57,7 +59,7 @@ Layout::~Layout()
 Driver &Layout::get_driver() const
 {
 	if(!driver)
-		throw InvalidState("No driver");
+		throw logic_error("!driver");
 	return *driver;
 }
 
@@ -70,6 +72,11 @@ void Layout::add_track(Track &t)
 	}
 }
 
+Track *Layout::pick_track(const Vector &start, const Vector &ray)
+{
+	return pick(tracks, start, ray);
+}
+
 void Layout::remove_track(Track &t)
 {
 	if(tracks.erase(&t))
@@ -79,15 +86,6 @@ void Layout::remove_track(Track &t)
 	}
 }
 
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
-{
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if((*i)->collide_ray(start, ray))
-			return *i;
-
-	return 0;
-}
-
 unsigned Layout::allocate_turnout_id()
 {
 	set<unsigned> used_ids;
@@ -103,6 +101,42 @@ unsigned Layout::allocate_turnout_id()
 	return result;
 }
 
+void Layout::add_signal(Signal &s)
+{
+	if(signals.insert(&s).second)
+		signal_signal_added.emit(s);
+}
+
+Signal *Layout::pick_signal(const Vector &start, const Vector &ray)
+{
+	return pick(signals, start, ray);
+}
+
+void Layout::remove_signal(Signal &s)
+{
+	if(signals.erase(&s))
+		signal_signal_removed.emit(s);
+}
+
+Object *Layout::pick_object(const Vector &start, const Vector &ray)
+{
+	if(Object *obj = pick_track(start, ray))
+		return obj;
+	else if((obj = pick_signal(start, ray)))
+		return obj;
+	return 0;
+}
+
+template<typename T>
+T *Layout::pick(const set<T *> &objs, const Vector &start, const Vector &ray)
+{
+	for(typename set<T *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+		if((*i)->collide_ray(start, ray))
+			return *i;
+
+	return 0;
+}
+
 void Layout::add_block(Block &b)
 {
 	blocks.insert(&b);
@@ -270,6 +304,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);
 }
@@ -298,6 +334,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())
@@ -344,11 +388,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);
@@ -360,12 +405,6 @@ Layout::Loader::Loader(Layout &l):
 	add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
 }
 
-void Layout::Loader::finish()
-{
-	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
-		(*i)->check_slope();
-}
-
 void Layout::Loader::route()
 {
 	Route *rte = new Route(obj);
@@ -379,6 +418,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));
@@ -391,7 +436,7 @@ void Layout::Loader::track(ArticleNumber art_nr)
 	new_tracks = true;
 	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
 		if(*i!=trk)
-			trk->snap_to(**i, true);
+			trk->link_to(**i);
 }
 
 void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)