X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=8ecb9b9bac00833eaa70190982fcb1933b43e9ae;hb=d41f66805bc9fe0b33e3d46b47f52e67b5782028;hp=43bacc3d8bc10f6a4653716064cbffb331e2ed0c;hpb=f23c8d8cbc4e72b45e3a719b2cf974ce35d054e9;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 43bacc3..8ecb9b9 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -1,14 +1,30 @@
 #include <cmath>
+#include <msp/core/maputils.h>
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
 #include "track.h"
+#include "trackattachment.h"
 #include "tracktype.h"
 
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+struct AttachmentCompare
+{
+	unsigned entry;
+
+	AttachmentCompare(unsigned e): entry(e) { }
+
+	bool operator()(const R2C2::TrackAttachment *a1, const R2C2::TrackAttachment *a2) const
+	{ return a1->get_offset_from_endpoint(entry)<a2->get_offset_from_endpoint(entry); }
+};
+
+}
+
 namespace R2C2 {
 
 Track::Track(Layout &l, const TrackType &t):
@@ -153,8 +169,6 @@ void Track::set_sensor_id(unsigned i)
 
 	sensor_id = i;
 	layout.create_blocks(*this);
-	if(layout.has_driver() && sensor_id)
-		layout.get_driver().add_sensor(sensor_id);
 }
 
 void Track::set_active_path(unsigned p)
@@ -169,31 +183,31 @@ void Track::set_active_path(unsigned p)
 	layout.get_driver().set_turnout(turnout_id, p);
 }
 
-TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
+OrientedPoint Track::get_point(unsigned epi, unsigned path, float d) const
 {
-	TrackPoint p = type.get_point(epi, path, d);
+	OrientedPoint p = type.get_point(epi, path, d);
 
-	p.pos = position+rotated_vector(p.pos, rotation);
-	p.dir += rotation;
+	p.position = position+rotated_vector(p.position, rotation);
+	p.rotation += rotation;
 	if(type.get_endpoints().size()==2)
 	{
-		float grade = tan(tilt);
+		float dz = tan(tilt)*d;
 		if(epi==0)
 		{
-			p.pos.z += grade*d;
-			p.grade = grade;
+			p.position.z += dz;
+			p.tilt = tilt;
 		}
 		else
 		{
-			p.pos.z += slope-grade*d;
-			p.grade = -grade;
+			p.position.z += slope-dz;
+			p.tilt = -tilt;
 		}
 	}
 
 	return p;
 }
 
-TrackPoint Track::get_point(unsigned epi, float d) const
+OrientedPoint Track::get_point(unsigned epi, float d) const
 {
 	return get_point(epi, active_path, d);
 }
@@ -230,12 +244,12 @@ bool Track::snap(Snap &sn, float limit, SnapType what) const
 	{
 		Vector local = rotated_vector(sn.position-position, -rotation);
 
-		TrackPoint tp = type.get_nearest_point(local);
-		Vector span = local-tp.pos;
+		OrientedPoint np = type.get_nearest_point(local);
+		Vector span = local-np.position;
 		if(dot(span, span)<=limit*limit)
 		{
-			sn.position = position+rotated_vector(tp.pos, rotation);
-			sn.rotation = tp.dir+rotation;
+			sn.position = position+rotated_vector(np.position, rotation);
+			sn.rotation = np.rotation+rotation;
 			return true;
 		}
 	}
@@ -331,6 +345,28 @@ bool Track::break_link(unsigned i)
 	return true;
 }
 
+void Track::add_attachment(TrackAttachment &a)
+{
+	if(find(attachments.begin(), attachments.end(), &a)!=attachments.end())
+		throw key_error(&a);
+	attachments.push_back(&a);
+}
+
+void Track::remove_attachment(TrackAttachment &a)
+{
+	AttachmentList::iterator i = find(attachments.begin(), attachments.end(), &a);
+	if(i==attachments.end())
+		throw key_error(&a);
+	attachments.erase(i);
+}
+
+Track::AttachmentList Track::get_attachments_ordered(unsigned epi) const
+{
+	AttachmentList result = attachments;
+	result.sort(AttachmentCompare(epi));
+	return result;
+}
+
 void Track::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("position"), position.x, position.y, position.z));