X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsignal.cpp;h=6efc250256477a7115cae0cff3962da7667be158;hb=581267f875f4ad32abd44dab6cd813bc871f55c5;hp=986d727d5a95b9e4f8f8ffc41b35ef3592e6f308;hpb=3e3675f8d86b06cdea7df197dfe8866ffb285aec;p=r2c2.git diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp index 986d727..6efc250 100644 --- a/source/libr2c2/signal.cpp +++ b/source/libr2c2/signal.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace Msp; -#include - namespace R2C2 { Signal::Signal(Layout &l, const SignalType &t): @@ -109,13 +107,10 @@ void Signal::tick(const Time::TimeDelta &) int train_entry = train->get_entry_to_block(*block); if(train_entry>=0 && static_cast(train_entry)==entry) { - IO::print("Train passing in the proper direction\n"); if(train_conn) train_conn.disconnect(); train_conn = train->signal_advanced.connect(sigc::mem_fun(this, &Signal::train_advanced)); } - else - IO::print("Train passing in the wrong direction (entry=%d, train_entry=%d)\n", entry, train_entry); check_train_direction = false; check_allocated_blocks = true; } @@ -131,7 +126,6 @@ void Signal::tick(const Time::TimeDelta &) ++n_blocks; iter=iter.next(); } - IO::print("%d sensor blocks allocated\n", n_blocks); check_allocated_blocks = false; const list &indications = type.get_indications(); @@ -143,7 +137,6 @@ void Signal::tick(const Time::TimeDelta &) break; } - IO::print("Setting signal %d to aspect %d\n", address, aspect); layout.get_driver().set_signal(address, aspect); } } @@ -171,13 +164,9 @@ void Signal::block_reserved(const Block &b, Train *t) void Signal::train_advanced(Block &b) { if(&b==block) - { - IO::print("Train is passing the signal now\n"); passing = true; - } else if(passing && b.get_sensor_id()) { - IO::print("Train has passed the signal\n"); layout.get_driver().set_signal(address, type.get_indications().back().aspect); reset(); }