X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsignal.cpp;h=38e11248793258641a6ef3557c247bb8406f3b09;hb=4529bf980cf3558d86c07266de7d890d3f5e06a6;hp=a858e0dc92b99293eb142f8172f7902d563acb22;hpb=dda1e6c8716b6ac70d63a3f6ff95474a8b8b7336;p=r2c2.git diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp index a858e0d..38e1124 100644 --- a/source/libr2c2/signal.cpp +++ b/source/libr2c2/signal.cpp @@ -24,14 +24,14 @@ Signal::Signal(Layout &l, const SignalType &t): 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); + layout.remove(*this); } Signal *Signal::clone(Layout *to_layout) const @@ -59,7 +59,7 @@ void Signal::set_position(const Vector &p) void Signal::update_location() { - const set &tracks = layout.get_tracks(); + const set &tracks = layout.get_all(); float limit = layout.get_catalogue().get_gauge()*2; float dist = -1; for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)