X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Flibr2c2%2Ftrack.cpp;h=030d428f18068dd6f8b7e7d08773c1a2d7155f83;hb=0be77238bcd33baf23594f3b54464205d2d51b31;hp=23f1b9e2b6da280d7179276de2d8e1d1afa1a112;hpb=695f7651bf45b3991ddbab5efe4c2213dbd76f07;p=r2c2.git diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp index 23f1b9e..030d428 100644 --- a/source/libr2c2/track.cpp +++ b/source/libr2c2/track.cpp @@ -33,20 +33,20 @@ 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(); - driver.add_turnout(turnout_id, type); + turnout_id = driver.add_turnout(turnout_addr, type); driver.signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event)); } } @@ -157,40 +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"); Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0); if(driver && turnout_id) driver->remove_turnout(turnout_id); - turnout_id = i; + turnout_addr = a; layout.create_blocks(*this); layout.update_routes(); - if(driver && turnout_id) - 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();
@@ -397,17 +403,17 @@ void Track::save(list