X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=d7ccf667673d16dc99b969a36f35798cfd6177cb;hb=66a30fdf63df6ae092fb3d335c30a37e4e6ef40d;hp=0411f1586c86fd89bc21f3be534905f363995dec;hpb=08dea8dfcf923e9296bcd3910455540895d0439b;p=r2c2.git diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp index 0411f15..d7ccf66 100644 --- a/source/libr2c2/track.cpp +++ b/source/libr2c2/track.cpp @@ -38,7 +38,8 @@ Track::Track(Layout &l, const TrackType &t): sensor_addr(0), links(type.get_endpoints().size()), active_path(0), - path_changing(false) + path_changing(false), + preferred_exit(-1) { if(type.is_turnout()) { @@ -55,7 +56,6 @@ Track::Track(Layout &l, const TrackType &t): layout.add(*this); - for(unsigned paths = type.get_paths(); !(paths&1); ++active_path, paths>>=1) ; } @@ -188,6 +188,11 @@ void Track::set_sensor_address(unsigned a) layout.create_blocks(*this); } +void Track::set_preferred_exit(int e) +{ + preferred_exit = e; +} + void Track::set_active_path(unsigned p) { if(!type.is_turnout()) @@ -198,7 +203,7 @@ void Track::set_active_path(unsigned p) if(active_path==p) return; - signal_path_changing(p); + signal_path_changing.emit(p); path_changing = true; layout.get_driver().set_turnout(turnout_id, p); }