X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=aeccaa697e4bc29a3e8b341737401200bd5bd82e;hb=9a2fd67cec715e371e293be638b126e0d1b2148d;hp=4708db5d40de6c79d26de28ef61af696afe6f48d;hpb=a5e1363ceac1ab552849640c9021fcda362c4416;p=r2c2.git diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp index 4708db5..aeccaa6 100644 --- a/source/libr2c2/track.cpp +++ b/source/libr2c2/track.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "block.h" #include "catalogue.h" #include "driver.h" @@ -33,19 +34,27 @@ 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) + path_changing(false), + preferred_exit(-1) { if(type.is_turnout()) - turnout_id = layout.allocate_turnout_id(); + { + turnout_addr = layout.allocate_turnout_address(); - layout.add(*this); + 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)); + driver.signal_turnout_failed.connect(sigc::mem_fun(this, &Track::turnout_failed)); + } + } - if(layout.has_driver()) - layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event)); + layout.add(*this); for(unsigned paths = type.get_paths(); !(paths&1); ++active_path, paths>>=1) ; } @@ -53,6 +62,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 +159,50 @@ 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_preferred_exit(int e) +{ + preferred_exit = e; +} + 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<get_type().get_gauge()/type.get_gauge(); + if(gauge_ratio<0.99 || gauge_ratio>1.01) + return false; + + float limit = type.get_gauge(); if(!flex && !otrack->get_flex()) limit /= 10; limit *= limit; @@ -319,6 +348,7 @@ bool Track::link_to(Object &other) if(dot(span, span)break_link(j); links[i] = otrack; otrack->links[j] = this; check_slope(); @@ -344,9 +374,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 +414,23 @@ void Track::save(list &st) const st.push_back((DataFile::Statement("position"), position.x, position.y, position.z)); st.push_back((DataFile::Statement("rotation"), rotation.radians())); st.push_back((DataFile::Statement("tilt"), tilt.radians())); - if(turnout_id) - st.push_back((DataFile::Statement("turnout_id"), turnout_id)); - if(sensor_id) - st.push_back((DataFile::Statement("sensor_id"), sensor_id)); + if(turnout_addr) + st.push_back((DataFile::Statement("turnout_address"), turnout_addr)); + if(sensor_addr) + st.push_back((DataFile::Statement("sensor_address"), sensor_addr)); if(flex) st.push_back((DataFile::Statement("flex"), true)); } -void Track::turnout_event(unsigned addr, unsigned state) +void Track::save_dynamic(list &st) const { - if(!turnout_id) - return; + if(turnout_addr) + st.push_back((DataFile::Statement("path"), active_path)); +} - if(addr==turnout_id) +void Track::turnout_event(unsigned id, unsigned state) +{ + if(id==turnout_id) { active_path = state; path_changing = false; @@ -400,21 +438,43 @@ void Track::turnout_event(unsigned addr, unsigned state) } } +void Track::turnout_failed(unsigned id) +{ + if(id==turnout_id) + { + path_changing = false; + layout.emergency(block, "Turnout failed"); + } +} + Track::Loader::Loader(Track &t): DataFile::ObjectLoader(t) { + add("path", &Loader::path); add("position", &Loader::position); add("rotation", &Loader::rotation); add("tilt", &Loader::tilt); - add("turnout_id", &Loader::turnout_id); - add("sensor_id", &Loader::sensor_id); + add("turnout_id", &Loader::turnout_address); + add("turnout_address", &Loader::turnout_address); + add("sensor_id", &Loader::sensor_address); + add("sensor_address", &Loader::sensor_address); add("flex", &Track::flex); // deprecated add("slope", &Loader::slope); } +void Track::Loader::path(unsigned p) +{ + obj.set_active_path(p); + if(obj.path_changing) + { + obj.active_path = p; + obj.signal_path_changed.emit(p); + } +} + void Track::Loader::position(float x, float y, float z) { obj.set_position(Vector(x, y, z)); @@ -425,9 +485,9 @@ void Track::Loader::rotation(float r) obj.set_rotation(Angle::from_radians(r)); } -void Track::Loader::sensor_id(unsigned id) +void Track::Loader::sensor_address(unsigned addr) { - obj.set_sensor_id(id); + obj.set_sensor_address(addr); } void Track::Loader::slope(float s) @@ -440,9 +500,9 @@ void Track::Loader::tilt(float t) obj.set_tilt(Angle::from_radians(t)); } -void Track::Loader::turnout_id(unsigned id) +void Track::Loader::turnout_address(unsigned addr) { - obj.set_turnout_id(id); + obj.set_turnout_address(addr); } } // namespace R2C2