X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftracktype.cpp;h=c6757cb221b12b9a206bdf6b0295f13fb835c789;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=0e84a3125ced9bea789757b3e0e92bd880e53a04;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/tracktype.cpp b/source/libmarklin/tracktype.cpp
index 0e84a31..c6757cb 100644
--- a/source/libmarklin/tracktype.cpp
+++ b/source/libmarklin/tracktype.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -18,29 +18,29 @@ TrackType::TrackType(unsigned a):
 
 float TrackType::get_total_length() const
 {
-	return get_route_length(-1);
+	return get_path_length(-1);
 }
 
-float TrackType::get_route_length(int r) const
+float TrackType::get_path_length(int p) const
 {
-	float len=0;
+	float len = 0;
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		if(r<0 || i->route==static_cast<unsigned>(r))
+		if(p<0 || i->path==static_cast<unsigned>(p))
 		{
-			float l=i->length;
+			float l = i->length;
 			if(i->radius)
-				l*=abs(i->radius);
-			len+=l;
+				l *= abs(i->radius);
+			len += l;
 		}
 	return len;
 }
 
-unsigned TrackType::get_n_routes() const
+unsigned TrackType::get_n_paths() const
 {
-	unsigned n=1;
+	unsigned n = 1;
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		if(i->route>=n)
-			n=i->route+1;
+		if(i->path>=n)
+			n = i->path+1;
 	return n;
 }
 
@@ -53,29 +53,29 @@ void TrackType::collect_endpoints()
 
 	for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end();)
 	{
-		bool rm=false;
+		bool rm = false;
 		for(vector<Endpoint>::iterator j=i+1; j!=endpoints.end();)
 		{
-			float dx=i->x-j->x;
-			float dy=i->y-j->y;
+			float dx = i->pos.x-j->pos.x;
+			float dy = i->pos.y-j->pos.y;
 			if(dx*dx+dy*dy<0.0001)
 			{
-				float da=i->dir-j->dir;
+				float da = i->dir-j->dir;
 				if(da<-M_PI)
-					da+=M_PI*2;
+					da += M_PI*2;
 				if(da>M_PI)
-					da-=M_PI*2;
+					da -= M_PI*2;
 				if(da<-3.1 || da>3.1)
-					rm=true;
-				i->routes|=j->routes;
-				j=endpoints.erase(j);
+					rm = true;
+				i->paths |= j->paths;
+				j = endpoints.erase(j);
 			}
 			else
 				++j;
 		}
 
 		if(rm)
-			i=endpoints.erase(i);
+			i = endpoints.erase(i);
 		else
 			++i;
 	}
@@ -83,7 +83,7 @@ void TrackType::collect_endpoints()
 
 
 TrackType::Loader::Loader(TrackType &t):
-	ttype(t)
+	Msp::DataFile::BasicLoader<TrackType>(t)
 {
 	add("description", &TrackType::description);
 	add("part",        &Loader::part);
@@ -91,14 +91,14 @@ TrackType::Loader::Loader(TrackType &t):
 
 void TrackType::Loader::finish()
 {
-	ttype.collect_endpoints();
+	obj.collect_endpoints();
 }
 
 void TrackType::Loader::part()
 {
 	TrackPart p;
 	load_sub(p);
-	ttype.parts.push_back(p);
+	obj.parts.push_back(p);
 }
 
 } // namespace Marklin