Major architecture rework

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

diff --git a/source/libmarklin/block.cpp b/source/libmarklin/block.cpp
index 9a9164ea292770380548aea3a2c517ac4fbe327d..51f8ddb0dfe45dbd954f994ba75b1c82f759e290 100644 (file)
--- a/source/libmarklin/block.cpp
+++ b/source/libmarklin/block.cpp
@@ -1,27 +1,23 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#include <iostream>
-#include "control.h"
+#include <algorithm>
 #include "block.h"
+#include "layout.h"
 #include "tracktype.h"
-#include "trafficmanager.h"
-#include "turnout.h"
 
 using namespace std;
 using namespace Msp;
 
 namespace Marklin {
 
-unsigned Block::next_id = 1;
-
-Block::Block(TrafficManager &tm, Track &start):
-       trfc_mgr(tm),
-       id(next_id++),
+Block::Block(Layout &l, Track &start):
+       layout(l),
+       id(0),
        sensor_id(start.get_sensor_id()),
        turnout_id(start.get_turnout_id()),
        train(0)
@@ -50,6 +46,8 @@ Block::Block(TrafficManager &tm, Track &start):
                        }
        }
 
+       determine_id();
+
        for(unsigned i=0; i<endpoints.size(); ++i)
        {
                unsigned path = 1<<i;
@@ -57,6 +55,20 @@ Block::Block(TrafficManager &tm, Track &start):
                set<Track *> visited;
                find_paths(*endpoints[i].track, endpoints[i].track_ep, path, visited);
        }
+
+       layout.add_block(*this);
+}
+
+Block::~Block()
+{
+       for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
+               if(Block *blk = i->link)
+               {
+                       i->link = 0;
+                       blk->break_link(*this);
+               }
+
+       layout.remove_block(*this);
 }
 
 int Block::get_endpoint_by_link(const Block &other) const
@@ -68,7 +80,7 @@ int Block::get_endpoint_by_link(const Block &other) const
        return -1;
 }
 
-int Block::traverse(unsigned epi, float *len) const
+unsigned Block::traverse(unsigned epi, float *len) const
 {
        if(epi>=endpoints.size())
                throw InvalidParameterValue("Endpoint index out of range");
@@ -82,28 +94,19 @@ int Block::traverse(unsigned epi, float *len) const
 
        while(1)
        {
-               unsigned cur_path = 0;
-               unsigned tid = track->get_turnout_id();
-               if(tid)
-               {
-                       Turnout &turnout = trfc_mgr.get_control().get_turnout(tid);
-                       cur_path = turnout.get_path();
-               }
+               unsigned cur_path = track->get_active_path();
 
                if(len)
                        *len += track->get_type().get_path_length(cur_path);
 
-               int other_ep = track->traverse(track_ep, cur_path);
-               if(other_ep<0)
-                       return -1;
-
+               unsigned other_ep = track->traverse(track_ep, cur_path);
                for(unsigned i=0; i<endpoints.size(); ++i)
                        if(endpoints[i].track==track && endpoints[i].track_ep==static_cast<unsigned>(other_ep))
                                return i;
 
                Track *next = track->get_link(other_ep);
-               if(tracks.count(next)==0)
-                       return -1;
+               if(!tracks.count(next))
+                       throw LogicError("Block traversal strayed out of the block");
                track_ep = next->get_endpoint_by_link(*track);
                track = next;
        }
@@ -121,10 +124,24 @@ void Block::check_link(Block &other)
                        {
                                i->link = &other;
                                j->link = this;
+
+                               determine_id();
+                               other.determine_id();
                        }
        }
 }
 
+void Block::break_link(Block &other)
+{
+       for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
+               if(i->link==&other)
+               {
+                       i->link = 0;
+                       other.break_link(*this);
+                       determine_id();
+               }
+}
+
 Block *Block::get_link(unsigned epi) const
 {
        if(epi>=endpoints.size())
@@ -132,35 +149,18 @@ Block *Block::get_link(unsigned epi) const
        return endpoints[epi].link;
 }
 
-bool Block::reserve(const Train *t)
+bool Block::reserve(Train *t)
 {
        if(!t || !train)
        {
                train = t;
-               trfc_mgr.signal_block_reserved.emit(*this, train);
+               layout.signal_block_reserved.emit(*this, train);
                return true;
        }
        else
                return false;
 }
 
-void Block::print_debug()
-{
-       cout<<"Block "<<id;
-       if((*tracks.begin())->get_sensor_id())
-               cout<<", sensor="<<(*tracks.begin())->get_sensor_id();
-       cout<<'\n';
-       for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
-       {
-               cout<<"  Endpoint, link=";
-               if(i->link)
-                       cout<<i->link->id;
-               else
-                       cout<<"none";
-               cout<<", paths="<<i->paths<<'\n';
-       }
-}
-
 void Block::find_paths(Track &track, unsigned track_ep, unsigned path, set<Track *> &visited)
 {
        visited.insert(&track);
@@ -185,6 +185,22 @@ void Block::find_paths(Track &track, unsigned track_ep, unsigned path, set<Track
        }
 }
 
+void Block::determine_id()
+{
+       if(sensor_id)
+               id = 0x1000|sensor_id;
+       else if(turnout_id)
+               id = 0x2000|turnout_id;
+       else if(endpoints.size()==2)
+       {
+               unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
+               unsigned id2 = endpoints[1].link ? endpoints[1].link->get_id() : 1;
+               if(id2<id1)
+                       swap(id1, id2);
+               id = (id1<<16)|id2;
+       }
+}
+
 
 Block::Endpoint::Endpoint(Track *t, unsigned e):
        track(t),