]> git.tdb.fi Git - r2c2.git/blobdiff - source/libr2c2/signal.cpp
Don't go past end of allocation when checking blocks for a signal
[r2c2.git] / source / libr2c2 / signal.cpp
index 6efc250256477a7115cae0cff3962da7667be158..02a07d76bc9585861b4c7df0a0954f3060772d7c 100644 (file)
@@ -1,4 +1,5 @@
 #include "blockiter.h"
+#include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
 #include "signal.h"
@@ -13,118 +14,109 @@ using namespace Msp;
 namespace R2C2 {
 
 Signal::Signal(Layout &l, const SignalType &t):
-       layout(l),
+       TrackAttachment(l),
        type(t),
        address(0),
-       track(0),
-       block(0),
-       entry(0),
        train(0),
-       check_train_direction(false),
        check_allocated_blocks(false),
        passing(false)
 {
-       layout.add_signal(*this);
+       layout.add(*this);
 
        layout.signal_block_reserved.connect(sigc::mem_fun(this, &Signal::block_reserved));
 }
 
 Signal::~Signal()
 {
-       layout.remove_signal(*this);
+       if(layout.has_driver() && address)
+               layout.get_driver().remove_sensor(address);
+       layout.remove(*this);
+}
+
+Signal *Signal::clone(Layout *to_layout) const
+{
+       Signal *sig = new Signal((to_layout ? *to_layout : layout), type);
+       sig->set_position(position);
+       sig->set_rotation(rotation);
+       return sig;
 }
 
 void Signal::set_address(unsigned a)
 {
+       Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
+
+       if(driver && address)
+               driver->remove_signal(address);
        address = a;
-       
-       if(layout.has_driver() && address)
-               layout.get_driver().add_signal(address, type);
+       if(driver && address)
+               driver->add_signal(address, type);
 }
 
 void Signal::set_position(const Vector &p)
 {
-       const set<Track *> &tracks = layout.get_tracks();
-       float dist = -1;
-       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(!(*i)->get_type().is_turnout())
-               {
-                       TrackPoint n = (*i)->get_nearest_point(p);
-                       float d = distance(p, n.pos);
-                       if(d<dist || dist<0)
-                       {
-                               position = n.pos;
-                               direction = n.dir;
-                               track = *i;
-                               dist = d;
-                       }
-               }
+       position = p;
 
-       normalize_location();
+       update_attachment();
+       signal_moved.emit();
 }
 
-void Signal::normalize_location()
+void Signal::set_rotation(const Angle &r)
 {
-       block = &track->get_block();
+       rotation = r;
 
-       unsigned n_endpoints = track->get_type().get_endpoints().size();
-       for(unsigned j=0; j<n_endpoints; ++j)
-       {
-               float a = track->get_endpoint_direction(j)-direction;
-               while(a<-M_PI/2)
-                       a += M_PI*2;
-               while(a>M_PI*3/2)
-                       a -= M_PI*2;
-               if(a>=M_PI/2)
-               {
-                       BlockIter biter = TrackIter(track, j).block_iter();
-                       entry = biter.entry();
-               }
-       }
+       update_attachment();
+       signal_moved.emit();
 }
 
-void Signal::set_direction(float d)
+void Signal::update_attachment()
 {
-       float a = direction-d;
-       while(a>M_PI*3/2)
-               a -= M_PI*2;
-       while(a<-M_PI/2)
-               a += M_PI*2;
-       if(a>=M_PI/2)
-       {
-               direction += M_PI;
-               if(direction>M_PI*2)
-                       direction -= M_PI*2;
-       }
+       attach_to_closest(2);
 
-       normalize_location();
+       if(track)
+               block = track.block_iter();
+       else
+               block = BlockIter();
 }
 
-void Signal::tick(const Time::TimeDelta &)
+unsigned Signal::get_n_snap_nodes() const
 {
-       if(check_train_direction)
-       {
-               int train_entry = train->get_entry_to_block(*block);
-               if(train_entry>=0 && static_cast<unsigned>(train_entry)==entry)
-               {
-                       if(train_conn)
-                               train_conn.disconnect();
-                       train_conn = train->signal_advanced.connect(sigc::mem_fun(this, &Signal::train_advanced));
-               }
-               check_train_direction = false;
-               check_allocated_blocks = true;
-       }
+       return 1;
+}
+
+Snap Signal::get_snap_node(unsigned i) const
+{
+       if(i>=1)
+               throw out_of_range("Signal::get_snap_node");
+
+       Snap sn;
+       sn.position = position;
+       sn.rotation = rotation;
+       return sn;
+}
+
+SnapType Signal::get_default_snap_type_to(const Object &other) const
+{
+       if(dynamic_cast<const Track *>(&other))
+               return SNAP_SEGMENT;
+
+       return NO_SNAP;
+}
 
+void Signal::tick(const Time::TimeDelta &)
+{
        if(check_allocated_blocks)
        {
                unsigned n_blocks = 0;
-               BlockIter iter(block, entry);
-               iter = iter.next();
-               while(iter && iter->get_train()==train)
+               const Block *last = train->get_block_allocator().last().block();
+               if(block.block()!=last)
                {
-                       if(iter->get_sensor_id())
-                               ++n_blocks;
-                       iter=iter.next();
+                       BlockIter iter = block.next();
+                       while(iter && iter->get_train()==train && iter.block()!=last)
+                       {
+                               if(iter->get_sensor_address())
+                                       ++n_blocks;
+                               iter = iter.next();
+                       }
                }
                check_allocated_blocks = false;
 
@@ -143,13 +135,20 @@ void Signal::tick(const Time::TimeDelta &)
 
 void Signal::block_reserved(const Block &b, Train *t)
 {
-       if(&b==block)
+       if(&b==block.block())
        {
                if(t)
                {
-                       train = t;
-                       passing = false;
-                       check_train_direction = true;
+                       const BlockIter &b_iter = t->get_block_allocator().iter_for(b);
+                       if(b_iter && b_iter.entry()==block.entry())
+                       {
+                               if(train_conn)
+                                       train_conn.disconnect();
+                               train = t;
+                               passing = false;
+                               train_conn = train->signal_advanced.connect(sigc::mem_fun(this, &Signal::train_advanced));
+                               check_allocated_blocks = true;
+                       }
                }
                else
                {
@@ -163,9 +162,9 @@ void Signal::block_reserved(const Block &b, Train *t)
 
 void Signal::train_advanced(Block &b)
 {
-       if(&b==block)
+       if(&b==block.block())
                passing = true;
-       else if(passing && b.get_sensor_id())
+       else if(passing && b.get_sensor_address())
        {
                layout.get_driver().set_signal(address, type.get_indications().back().aspect);
                reset();
@@ -177,14 +176,13 @@ void Signal::reset()
        train = 0;
        if(train_conn)
                train_conn.disconnect();
-       check_train_direction = false;
        check_allocated_blocks = false;
 }
 
 void Signal::save(list<DataFile::Statement> &st) const
 {
        st.push_back((DataFile::Statement("position"), position.x, position.y, position.z));
-       st.push_back((DataFile::Statement("direction"), direction));
+       st.push_back((DataFile::Statement("rotation"), rotation.radians()));
        if(address)
                st.push_back((DataFile::Statement("address"), address));
 }
@@ -193,9 +191,9 @@ void Signal::save(list<DataFile::Statement> &st) const
 Signal::Loader::Loader(Signal &s):
        DataFile::ObjectLoader<Signal>(s)
 {
-       add("address",   &Loader::address);
-       add("direction", &Loader::direction);
-       add("position",  &Loader::position);
+       add("address",  &Loader::address);
+       add("position", &Loader::position);
+       add("rotation", &Loader::rotation);
 }
 
 void Signal::Loader::address(unsigned a)
@@ -203,14 +201,14 @@ void Signal::Loader::address(unsigned a)
        obj.set_address(a);
 }
 
-void Signal::Loader::direction(float d)
+void Signal::Loader::position(float x, float y, float z)
 {
-       obj.set_direction(d);
+       obj.set_position(Vector(x, y, z));
 }
 
-void Signal::Loader::position(float x, float y, float z)
+void Signal::Loader::rotation(float d)
 {
-       obj.set_position(Vector(x, y, z));
+       obj.set_rotation(Angle::from_radians(d));
 }
 
 } // namespace R2C2