X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrack.cpp;h=030d428f18068dd6f8b7e7d08773c1a2d7155f83;hb=f459a73d543b663afeb5a7b4796b04f76860e383;hp=4708db5d40de6c79d26de28ef61af696afe6f48d;hpb=a5e1363ceac1ab552849640c9021fcda362c4416;p=r2c2.git diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp index 4708db5..030d428 100644 --- a/source/libr2c2/track.cpp +++ b/source/libr2c2/track.cpp @@ -33,19 +33,26 @@ Track::Track(Layout &l, const TrackType &t): block(0), slope(0), flex(false), - turnout_id(0), - sensor_id(0), + turnout_addr(0), + sensor_addr(0), links(type.get_endpoints().size()), active_path(0), path_changing(false) { if(type.is_turnout()) - turnout_id = layout.allocate_turnout_id(); + { + turnout_addr = layout.allocate_turnout_address(); + + if(layout.has_driver()) + { + Driver &driver = layout.get_driver(); + turnout_id = driver.add_turnout(turnout_addr, type); + driver.signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event)); + } + } layout.add(*this); - if(layout.has_driver()) - layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event)); for(unsigned paths = type.get_paths(); !(paths&1); ++active_path, paths>>=1) ; } @@ -53,6 +60,8 @@ Track::Track(Layout &l, const TrackType &t): Track::~Track() { break_links(); + if(layout.has_driver() && turnout_id) + layout.get_driver().remove_turnout(turnout_id); layout.remove(*this); } @@ -148,36 +157,45 @@ void Track::check_slope() signal_moved.emit(); } -void Track::set_turnout_id(unsigned i) +void Track::set_turnout_address(unsigned a) { if(!type.is_turnout()) throw logic_error("not a turnout"); - if(!i) + if(!a) throw invalid_argument("Track::set_turnout_id"); - turnout_id = i; + Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0); + + if(driver && turnout_id) + driver->remove_turnout(turnout_id); + turnout_addr = a; layout.create_blocks(*this); layout.update_routes(); - if(layout.has_driver() && turnout_id) - layout.get_driver().add_turnout(turnout_id, type); + if(driver && turnout_addr) + turnout_id = driver->add_turnout(turnout_addr, type); + else + turnout_id = 0; } -void Track::set_sensor_id(unsigned i) +void Track::set_sensor_address(unsigned a) { if(type.is_turnout()) throw logic_error("is a turnout"); - sensor_id = i; + sensor_addr = a; layout.create_blocks(*this); } void Track::set_active_path(unsigned p) { - if(!turnout_id) + if(!type.is_turnout()) throw logic_error("not a turnout"); if(!(type.get_paths()&(1<
break_link(j);
links[i] = otrack;
otrack->links[j] = this;
check_slope();
@@ -344,9 +363,14 @@ bool Track::break_link(unsigned i)
return false;
links[i] = 0;
- other->break_link(*this);
- // XXX Creates the blocks twice, because the other track calls this too
- layout.create_blocks(*this);
+ if(!other->break_link(*this))
+ {
+ /* If the call doesn't succeed, it means that the other track already
+ broke the link and is calling us right now. Recreate blocks in the inner
+ call so it occurs before any signals are emitted. */
+ layout.create_blocks(*this);
+ }
+
signal_link_changed.emit(i, 0);
return true;
@@ -379,20 +403,17 @@ void Track::save(list