X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=73674ee8c39f340cf7665e153ff3908544a33b29;hb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;hp=e544081d04f6754f6c9074245df581e358c3b8f2;hpb=319f90fd59587efc1242c34f307abc29f323642b;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index e544081..73674ee 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -12,8 +12,6 @@ Distributed under the GPL
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
 namespace Marklin {
 
 Track::Track(const TrackType &t):
@@ -57,6 +55,34 @@ void Track::set_flex(bool f)
 	flex=f;
 }
 
+void Track::check_slope()
+{
+	if(links.size()!=2)
+		return;
+
+	if(links[0] && links[1])
+	{
+		Point epp0=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
+		Point epp1=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
+		pos.z=epp0.z;
+		slope=epp1.z-pos.z;
+	}
+	else
+	{
+		slope=0;
+		if(links[0])
+		{
+			Point epp=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
+			pos.z=epp.z;
+		}
+		else if(links[1])
+		{
+			Point epp=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
+			pos.z=epp.z;
+		}
+	}
+}
+
 void Track::set_turnout_id(unsigned i)
 {
 	turnout_id=i;
@@ -192,34 +218,6 @@ Track *Track::get_link(unsigned i) const
 	return links[i];
 }
 
-void Track::check_slope()
-{
-	if(links.size()!=2)
-		return;
-
-	if(links[0] && links[1])
-	{
-		Point epp0=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
-		Point epp1=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
-		pos.z=epp0.z;
-		slope=epp1.z-pos.z;
-	}
-	else
-	{
-		slope=0;
-		if(links[0])
-		{
-			Point epp=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
-			pos.z=epp.z;
-		}
-		else if(links[1])
-		{
-			Point epp=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
-			pos.z=epp.z;
-		}
-	}
-}
-
 int Track::traverse(unsigned i, unsigned route) const
 {
 	const vector<Endpoint> &eps=type.get_endpoints();
@@ -319,24 +317,34 @@ Track *Track::copy() const
 	return trk;
 }
 
-/*******************
-** Track::Loader
-*/
+void Track::save(list<DataFile::Statement> &st) const
+{
+	st.push_back((DataFile::Statement("position"), pos.x, pos.y, pos.z));
+	st.push_back((DataFile::Statement("rotation"), rot));
+	st.push_back((DataFile::Statement("slope"), slope));
+	if(turnout_id)
+		st.push_back((DataFile::Statement("turnout_id"), turnout_id));
+	if(sensor_id)
+		st.push_back((DataFile::Statement("sensor_id"), sensor_id));
+	if(flex)
+		st.push_back((DataFile::Statement("flex"), true));
+}
+
 
 Track::Loader::Loader(Track &t):
-	track(t)
+	DataFile::BasicLoader<Track>(t)
 {
-	add("position",    &Loader::position);
-	add("rotation",    &Track::rot);
-	add("slope",       &Track::slope);
-	add("turnout_id",  &Track::turnout_id);
-	add("sensor_id",   &Track::sensor_id);
-	add("flex",        &Track::flex);
+	add("position",   &Loader::position);
+	add("rotation",   &Track::rot);
+	add("slope",      &Track::slope);
+	add("turnout_id", &Track::turnout_id);
+	add("sensor_id",  &Track::sensor_id);
+	add("flex",       &Track::flex);
 }
 
 void Track::Loader::position(float x, float y, float z)
 {
-	track.pos=Point(x, y, z);
+	obj.pos=Point(x, y, z);
 }
 
 } // namespace Marklin