Get rid of some obsolete #includes

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

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index 2df313e27c1f8c53104c4314908be2391eec7b52..a0d90f3a3ea153586342cc202707fe88ee313f3a 100644 (file)
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
+#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"
@@ -16,8 +16,10 @@ namespace R2C2 {
 Block::Block(Layout &l, Track &start):
        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)
 {
        add_track(start);
@@ -43,7 +45,12 @@ Block::Block(Layout &l, Track &start):
 
        determine_id();
 
-       sensor = new TrackCircuit(layout, *this);
+       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());
+
+       if(!conflict && sensor_addr)
+               sensor = new TrackCircuit(layout, *this);
 
        layout.add(*this);
 }
@@ -67,6 +74,11 @@ Block::~Block()
        delete sensor;
 }
 
+void Block::set_name(const string &)
+{
+       throw logic_error("Block names can't be set");
+}
+
 void Block::on_track_added(Track &track)
 {
        track.set_block(this);
@@ -74,7 +86,7 @@ void Block::on_track_added(Track &track)
 
 TrackChain::Validity Block::check_validity(Track &track) const
 {
-       if(track.get_sensor_id()!=sensor_id || track.get_turnout_id()!=turnout_id)
+       if(track.get_sensor_address()!=sensor_addr || track.get_turnout_address()!=turnout_addr)
                return INCOMPATIBLE;
 
        return TrackChain::check_validity(track);
@@ -167,10 +179,17 @@ bool Block::reserve(Train *t)
 
 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;
@@ -184,6 +203,17 @@ 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);
 }