Move block reservation signal serialization to Layout

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

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index 6103509f3647ce053d7c653f3eae28ab3a2b3ca9..289c4e54f6bd14de4107f1e4246144e8438c168b 100644 (file)
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -1,7 +1,8 @@
 #include <algorithm>
+#include <msp/core/raii.h>
+#include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include "block.h"
-#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackcircuit.h"
@@ -14,50 +15,45 @@ using namespace Msp;
 namespace R2C2 {
 
 Block::Block(Layout &l, Track &start):
-       layout(l),
+       TrackChain(l),
        id(0),
-       sensor_id(start.get_sensor_id()),
-       turnout_id(start.get_turnout_id()),
+       sensor_addr(start.get_sensor_address()),
+       turnout_addr(start.get_turnout_address()),
+       conflict(false),
+       sensor(0),
        train(0)
 {
-       tracks.insert(&start);
-       start.set_block(this);
+       add_track(start);
 
-       list<Track *> queue;
-       queue.push_back(&start);
-
-       while(!queue.empty())
+       if(start.get_type().is_turnout())
        {
-               Track *track = queue.front();
-               queue.erase(queue.begin());
-
-               const vector<Track *> &links = track->get_links();
-               for(unsigned i=0; i<links.size(); ++i)
-                       if(links[i] && !tracks.count(links[i]))
-                       {
-                               if(links[i]->get_sensor_id()==sensor_id && links[i]->get_turnout_id()==turnout_id)
-                               {
-                                       queue.push_back(links[i]);
-                                       tracks.insert(links[i]);
-                                       links[i]->set_block(this);
-                               }
-                               else
-                                       endpoints.push_back(Endpoint(track, i));
-                       }
+               unsigned nls = start.get_n_link_slots();
+               for(unsigned i=0; i<nls; ++i)
+                       endpoints.push_back(Endpoint(&start, i));
+       }
+       else
+       {
+               unsigned nls = start.get_n_link_slots();
+               for(unsigned i=0; i<nls; ++i)
+               {
+                       TrackIter iter = TrackIter(&start, i).flip();
+                       for(; (iter && check_validity(*iter)==VALID); iter=iter.next())
+                               add_track(*iter);
+                       if((iter = iter.flip()))
+                               endpoints.push_back(Endpoint(iter.track(), iter.entry()));
+               }
        }
 
        determine_id();
 
-       for(unsigned i=0; i<endpoints.size(); ++i)
-       {
-               unsigned path = 1<<i;
-               endpoints[i].paths |= path;
-               find_paths(endpoints[i].track_iter(), path);
-       }
+       const set<Block *> &blocks = layout.get_all<Block>();
+       for(set<Block *>::const_iterator i=blocks.begin(); (!conflict && i!=blocks.end()); ++i)
+               conflict = (id==(*i)->get_id());
 
-       sensor = new TrackCircuit(layout, *this);
+       if(!conflict && sensor_addr)
+               sensor = new TrackCircuit(layout, *this);
 
-       layout.add_block(*this);
+       layout.add(*this);
 }
 
 Block::~Block()
@@ -74,14 +70,27 @@ Block::~Block()
                        blk->break_link(*this);
                }
 
-       layout.remove_block(*this);
+       layout.remove(*this);
 
        delete sensor;
 }
 
-bool Block::has_track(Track &t) const
+void Block::set_name(const string &)
 {
-       return tracks.count(&t);
+       throw logic_error("Block names can't be set");
+}
+
+void Block::on_track_added(Track &track)
+{
+       track.set_block(this);
+}
+
+TrackChain::Validity Block::check_validity(Track &track) const
+{
+       if(track.get_sensor_address()!=sensor_addr || track.get_turnout_address()!=turnout_addr)
+               return INCOMPATIBLE;
+
+       return TrackChain::check_validity(track);
 }
 
 const Block::Endpoint &Block::get_endpoint(unsigned i) const
@@ -162,40 +171,26 @@ bool Block::reserve(Train *t)
        if(!t || !train)
        {
                train = t;
-               signal_reserved.emit(train);
+               signal_reserved.emit(t);
                return true;
        }
        else
                return false;
 }
 
-void Block::find_paths(const TrackIter &track, unsigned path)
-{
-       unsigned mask = track.endpoint().paths;
-       for(unsigned i=0; mask>>i; ++i)
-               if(mask&(1<<i))
-               {
-                       TrackIter next = track.next(i);
-                       if(!next)
-                               continue;
-                       else if(has_track(*next))
-                               find_paths(track.next(i), path);
-                       else
-                       {
-                               next = next.flip();
-                               for(vector<Endpoint>::iterator j=endpoints.begin(); j!=endpoints.end(); ++j)
-                                       if(j->track==next.track() && j->track_ep==next.entry())
-                                               j->paths |= path;
-                       }
-               }
-}
-
 void Block::determine_id()
 {
-       if(sensor_id)
-               id = 0x1000|sensor_id;
-       else if(turnout_id)
-               id = 0x2000|turnout_id;
+       string n;
+       if(sensor_addr)
+       {
+               id = 0x1000|sensor_addr;
+               n = format("Sensor %d", sensor_addr);
+       }
+       else if(turnout_addr)
+       {
+               id = 0x2000|turnout_addr;
+               n = format("Turnout %d", turnout_addr);
+       }
        else if(endpoints.size()==2)
        {
                unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
@@ -209,14 +204,24 @@ void Block::determine_id()
                unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
                id = 0x10000 | id1;
        }
+
+       if(n.empty())
+               n = format("Block %x", id);
+
+       name = n;
+       signal_name_changed.emit(name);
+}
+
+DataFile::Statement Block::save_reference() const
+{
+       return (DataFile::Statement("block"), id);
 }
 
 
 Block::Endpoint::Endpoint(Track *t, unsigned e):
        track(t),
        track_ep(e),
-       link(0),
-       paths(0)
+       link(0)
 { }
 
 TrackIter Block::Endpoint::track_iter() const