Create another track iterator class that holds an offset as well

[r2c2.git] / source / libr2c2 / track.cpp

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 43bacc3d8bc10f6a4653716064cbffb331e2ed0c..2a7cc6adc4b8ccc4c7c66ab8e8c5a9e037db9073 100644 (file)
--- 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)
@@ -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));