Display the total length of selected tracks in status bar

[r2c2.git] / source / libmarklin / block.cpp

diff --git a/source/libmarklin/block.cpp b/source/libmarklin/block.cpp
index db1942bb5b613fde7ff1b71272383455740bc875..ec07947d7e1cbffa500f05b29661ba7178b99fa8 100644 (file)
--- a/source/libmarklin/block.cpp
+++ b/source/libmarklin/block.cpp
@@ -24,6 +24,7 @@ Block::Block(Layout &l, Track &start):
        train(0)
 {
        tracks.insert(&start);
+       start.set_block(this);
 
        list<Track *> queue;
        queue.push_back(&start);
@@ -41,6 +42,7 @@ Block::Block(Layout &l, Track &start):
                                {
                                        queue.push_back(links[i]);
                                        tracks.insert(links[i]);
+                                       links[i]->set_block(this);
                                }
                                else
                                        endpoints.push_back(Endpoint(track, i));
@@ -62,6 +64,11 @@ Block::Block(Layout &l, Track &start):
 
 Block::~Block()
 {
+       set<Track *> trks = tracks;
+       tracks.clear();
+       for(set<Track *>::iterator i=trks.begin(); i!=trks.end(); ++i)
+               (*i)->set_block(0);
+
        for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
                if(Block *blk = i->link)
                {
@@ -72,7 +79,12 @@ Block::~Block()
        layout.remove_block(*this);
 }
 
-int Block::get_endpoint_by_link(const Block &other) const
+bool Block::has_track(Track &t) const
+{
+       return tracks.count(&t);
+}
+
+int Block::get_endpoint_by_link(Block &other) const
 {
        for(unsigned i=0; i<endpoints.size(); ++i)
                if(endpoints[i].link==&other)