X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=6042515962436807ebaae6ba2be60ca3b50dee05;hb=3e3675f8d86b06cdea7df197dfe8866ffb285aec;hp=7fd0d4ddac4b112073374fc25f6d4f96284f29c1;hpb=4f2b6023dee412373a6a0b13ba4d617ffbb9bb38;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 7fd0d4d..6042515 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,4 +1,5 @@
 #include "layout.h"
+#include "signal.h"
 #include "track.h"
 #include "vehicle.h"
 
@@ -19,6 +20,8 @@ Layout3D::Layout3D(Layout &l):
 	layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
 	layout.signal_vehicle_added.connect(sigc::mem_fun(this, &Layout3D::vehicle_added));
 	layout.signal_vehicle_removed.connect(sigc::mem_fun(this, &Layout3D::vehicle_removed));
+	layout.signal_signal_added.connect(sigc::mem_fun(this, &Layout3D::signal_added));
+	layout.signal_signal_removed.connect(sigc::mem_fun(this, &Layout3D::signal_removed));
 
 	const set<Track *> &ltracks = layout.get_tracks();
 	for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
@@ -79,6 +82,21 @@ Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
 	return *get_item(vehicles, &v);
 }
 
+void Layout3D::add_signal(Signal3D &s)
+{
+	insert_unique(signals, &s.get_signal(), &s);
+}
+
+void Layout3D::remove_signal(Signal3D &s)
+{
+	signals.erase(&s.get_signal());
+}
+
+Signal3D &Layout3D::get_signal(Signal &s) const
+{
+	return *get_item(signals, &s);
+}
+
 void Layout3D::track_added(Track &t)
 {
 	new Track3D(*this, t);
@@ -103,4 +121,16 @@ void Layout3D::vehicle_removed(Vehicle &v)
 		delete i->second;
 }
 
+void Layout3D::signal_added(Signal &s)
+{
+	new Signal3D(*this, s);
+}
+
+void Layout3D::signal_removed(Signal &s)
+{
+	SignalMap::iterator i = signals.find(&s);
+	if(i!=signals.end())
+		delete i->second;
+}
+
 } // namespace R2C2