Make sure Block::signal_reserved is emitted consistently

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

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index 59ad3a3c990965ac67b9e0ccad5602aff5c35abb..25b3bc8b85163d0bfd2ece6a54718f02b840ec6d 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"
@@ -20,7 +21,9 @@ Block::Block(Layout &l, Track &start):
        turnout_addr(start.get_turnout_address()),
        conflict(false),
        sensor(0),
-       train(0)
+       train(0),
+       pending_train(0),
+       emitting_reserve(false)
 {
        add_track(start);
 
@@ -74,6 +77,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);
@@ -162,10 +170,19 @@ Block *Block::get_link(unsigned epi) const
 
 bool Block::reserve(Train *t)
 {
-       if(!t || !train)
+       if(!t || !(emitting_reserve ? pending_train : train))
        {
-               train = t;
-               signal_reserved.emit(train);
+               pending_train = t;
+               if(!emitting_reserve)
+               {
+                       while(pending_train!=train)
+                       {
+                               train = pending_train;
+                               SetFlag setf(emitting_reserve);
+                               signal_reserved.emit(train);
+                       }
+               }
+
                return true;
        }
        else
@@ -174,10 +191,17 @@ bool Block::reserve(Train *t)
 
 void Block::determine_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;
@@ -191,6 +215,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);
 }