X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=b847637fab797481a34225ccf88dea9a2d29ceb4;hb=c4daf1cc6b53cae34e46d4125a993ceed500de1a;hp=6cb0eb3634ae334cca8714b87f5d6fb7ae5251bd;hpb=218f194f537dfda55d32ce8d8739e322a3d0c07d;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 6cb0eb3..b847637 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -5,6 +5,7 @@
 #include <msp/datafile/writer.h>
 #include <msp/io/print.h>
 #include <msp/time/utils.h>
+#include "beamgate.h"
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
@@ -104,6 +105,12 @@ void Layout::add(Sensor &s)
 	}
 }
 
+void Layout::add(BeamGate &g)
+{
+	add(static_cast<Object &>(g));
+	add(static_cast<Sensor &>(g));
+}
+
 template<>
 const set<Object *> &Layout::get_all<Object>() const
 {
@@ -164,6 +171,12 @@ const set<TrackCircuit *> &Layout::get_all<TrackCircuit>() const
 	return sensors.get<TrackCircuit>();
 }
 
+template<>
+const set<BeamGate *> &Layout::get_all<BeamGate>() const
+{
+	return sensors.get<BeamGate>();
+}
+
 template<typename T>
 T *Layout::pick(const Ray &ray)
 {
@@ -208,6 +221,12 @@ void Layout::remove(Sensor &s)
 	sensors.erase(s);
 }
 
+void Layout::remove(BeamGate &g)
+{
+	remove(static_cast<Object &>(g));
+	remove(static_cast<Sensor &>(g));
+}
+
 unsigned Layout::allocate_turnout_id()
 {
 	set<unsigned> used_ids;
@@ -390,6 +409,14 @@ void Layout::save(const string &fn) const
 		writer.write(st);
 	}
 
+	const set<BeamGate *> &gates = objects.get<BeamGate>();
+	for(set<BeamGate *>::const_iterator i=gates.begin(); i!=gates.end(); ++i)
+	{
+		DataFile::Statement st("beamgate");
+		(*i)->save(st.sub);
+		writer.write(st);
+	}
+
 	const set<Route *> &routes = track_chains.get<Route>();
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 	{
@@ -500,6 +527,7 @@ Layout::Loader::Loader(Layout &l):
 	new_tracks(false)
 {
 	add("base",  &Layout::base);
+	add("beamgate", &Loader::beamgate);
 	add("route", &Loader::route);
 	add("signal", &Loader::signal);
 	add("track", &Loader::track);
@@ -508,6 +536,12 @@ Layout::Loader::Loader(Layout &l):
 	add("zone",  &Loader::zone);
 }
 
+void Layout::Loader::beamgate()
+{
+	BeamGate *gate = new BeamGate(obj);
+	load_sub(*gate);
+}
+
 void Layout::Loader::route()
 {
 	Route *rte = new Route(obj);