X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftracktype.cpp;h=9f2979bebff80ca4112eb2c3013d6a4209da1ddf;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=5bbd40a411e07632e161dbb9d1a44a099dfeb41e;hpb=651698847d5293cfb15b6fb23a394701388c0151;p=r2c2.git

diff --git a/source/libmarklin/tracktype.cpp b/source/libmarklin/tracktype.cpp
index 5bbd40a..9f2979b 100644
--- a/source/libmarklin/tracktype.cpp
+++ b/source/libmarklin/tracktype.cpp
@@ -9,11 +9,14 @@ Distributed under the GPL
 #include "tracktype.h"
 
 using namespace std;
+using namespace Msp;
 
 namespace Marklin {
 
-TrackType::TrackType(unsigned a):
-	art_nr(a)
+TrackType::TrackType(const ArticleNumber &an):
+	art_nr(an),
+	double_address(false),
+	autofit_preference(1)
 { }
 
 float TrackType::get_total_length() const
@@ -25,13 +28,8 @@ float TrackType::get_path_length(int p) const
 {
 	float len = 0;
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		if(p<0 || i->path==static_cast<unsigned>(p))
-		{
-			float l = i->length;
-			if(i->radius)
-				l *= abs(i->radius);
-			len += l;
-		}
+		if(p<0 || i->get_path()==static_cast<unsigned>(p))
+			len += i->get_length();
 	return len;
 }
 
@@ -39,7 +37,7 @@ unsigned TrackType::get_paths() const
 {
 	unsigned mask = 0;
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		mask |= 1<<i->path;
+		mask |= 1<<i->get_path();
 	return mask;
 }
 
@@ -56,53 +54,128 @@ bool TrackType::is_turnout() const
 	return endpoints.size()>2;
 }
 
-bool TrackType::is_double_address() const
+bool TrackType::is_dead_end() const
 {
-	return get_n_paths()>2;
+	return endpoints.size()<2;
 }
 
-void TrackType::collect_endpoints()
+const TrackType::Endpoint &TrackType::get_endpoint(unsigned i) const
 {
-	endpoints.clear();
+	if(i>=endpoints.size())
+		throw InvalidParameterValue("Endpoint index out of range");
 
-	for(vector<TrackPart>::iterator i=parts.begin(); i!=parts.end(); ++i)
-		i->collect_endpoints(endpoints);
+	return endpoints[i];
+}
+
+TrackPoint TrackType::get_point(unsigned epi, unsigned path, float d) const
+{
+	if(epi>=endpoints.size())
+		throw InvalidParameterValue("Endpoint index out of range");
 
-	for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end();)
+	const TrackPart *part = 0;
+	unsigned part_ep = 0;
+	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
-		bool rm = false;
-		for(vector<Endpoint>::iterator j=i+1; j!=endpoints.end();)
+		if((endpoints[epi].paths&(1<<path)) && i->get_path()!=path)
+			continue;
+
+		unsigned n_part_eps = (i->is_dead_end() ? 1 : 2);
+		for(unsigned j=0; j<n_part_eps; ++j)
 		{
-			float dx = i->pos.x-j->pos.x;
-			float dy = i->pos.y-j->pos.y;
-			if(dx*dx+dy*dy<0.0001)
+			TrackPoint p = i->get_point(j ? i->get_length() : 0);
+			float dx = p.pos.x-endpoints[epi].pos.x;
+			float dy = p.pos.y-endpoints[epi].pos.y;
+			if(dx*dx+dy*dy<1e-6)
 			{
-				float da = i->dir-j->dir;
-				if(da<-M_PI)
-					da += M_PI*2;
-				if(da>M_PI)
-					da -= M_PI*2;
-				if(da<-3.1 || da>3.1)
-					rm = true;
-				i->paths |= j->paths;
-				j = endpoints.erase(j);
+				part = &*i;
+				part_ep = j;
 			}
-			else
-				++j;
 		}
+	}
+
+	if(!part)
+		throw Exception("Internal error (endpoint does not match any part)");
 
-		if(rm)
-			i = endpoints.erase(i);
+	while(1)
+	{
+		float plen = part->get_length();
+		if(d<=plen)
+		{
+			if(part_ep==1)
+				d = plen-d;
+			TrackPoint p = part->get_point(d);
+			if(part_ep==1)
+				p.dir += M_PI;
+			return p;
+		}
 		else
-			++i;
+		{
+			d -= plen;
+			TrackPart *next = part->get_link(1-part_ep);
+			if(!next)
+				throw InvalidParameterValue("Distance out of range");
+			part_ep = (next->get_link(0)==part ? 0 : 1);
+			part = next;
+		}
 	}
 }
 
+void TrackType::collect_endpoints()
+{
+	endpoints.clear();
+
+	for(vector<TrackPart>::iterator i=parts.begin(); i!=parts.end(); ++i)
+	{
+		for(vector<TrackPart>::iterator j=i; ++j!=parts.end();)
+			i->check_link(*j);
+
+		unsigned n_part_eps = (i->is_dead_end() ? 1 : 2);
+		for(unsigned j=0; j<n_part_eps; ++j)
+			if(!i->get_link(j))
+			{
+				TrackPoint p = i->get_point(j ? i->get_length() : 0);
+				if(j==0)
+					p.dir += M_PI;
+
+				bool found = false;
+				for(vector<Endpoint>::iterator k=endpoints.begin(); k!=endpoints.end(); ++k)
+				{
+					float dx = k->pos.x-p.pos.x;
+					float dy = k->pos.y-p.pos.y;
+
+					float da = k->dir-p.dir;
+					while(da>M_PI)
+						da -= M_PI*2;
+					while(da<-M_PI)
+						da += M_PI*2;
+
+					if(dx*dx+dy*dy<1e-6 && da>-0.01 && da<0.01)
+					{
+						k->paths |= 1<<i->get_path();
+						found = true;
+						break;
+					}
+				}
+
+				if(!found)
+					endpoints.push_back(Endpoint(p.pos.x, p.pos.y, p.dir, 1<<i->get_path()));
+			}
+	}
+}
+
+TrackType::Endpoint::Endpoint(float x, float y, float d, unsigned p):
+	pos(x, y),
+	dir(d),
+	paths(p)
+{ }
+
 
 TrackType::Loader::Loader(TrackType &t):
 	Msp::DataFile::BasicLoader<TrackType>(t)
 {
+	add("autofit_preference", &TrackType::autofit_preference);
 	add("description", &TrackType::description);
+	add("double_address", &TrackType::double_address);
 	add("part",        &Loader::part);
 }