X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=d5b2b226721c961fb88b96753434d665f1f0180d;hb=f06c2b89a2601981aae84d0f971c07816dc1bab4;hp=e992f418ed4cc324a4ff84d900ded8ac37700a0d;hpb=80dcfa55c913037066e43fa115ae56fa51b974f2;p=r2c2.git diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp index e992f41..d5b2b22 100644 --- a/source/libmarklin/train.cpp +++ b/source/libmarklin/train.cpp @@ -1,7 +1,7 @@ /* $Id$ This file is part of the MSP Märklin suite -Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa +Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -9,46 +9,59 @@ Distributed under the GPL #include #include #include -#include "control.h" -#include "except.h" +#include "aicontrol.h" +#include "catalogue.h" +#include "driver.h" #include "layout.h" +#include "locotype.h" #include "route.h" +#include "simplephysics.h" #include "tracktype.h" -#include "trafficmanager.h" #include "train.h" +#include "vehicle.h" using namespace std; using namespace Msp; namespace Marklin { -Train::Train(TrafficManager &tm, Locomotive &l): - trfc_mgr(tm), - loco(l), +Train::Train(Layout &l, const LocoType &t, unsigned a): + layout(l), + loco_type(t), + address(a), pending_block(0), - target_speed(0), + control(new AIControl(*this, new SimplePhysics)), + active(false), + current_speed(0), + speed_changing(false), + reverse(false), + functions(0), route(0), + next_route(0), + end_of_route(false), status("Unplaced"), travel_dist(0), - travel_speed(0), pure_speed(false), - real_speed(15), - cur_track(0) + real_speed(15) { - trfc_mgr.add_train(this); + vehicles.push_back(new Vehicle(layout, loco_type)); - loco.signal_reverse_changed.connect(sigc::mem_fun(this, &Train::locomotive_reverse_changed)); + layout.add_train(*this); - const map &sensors = trfc_mgr.get_control().get_sensors(); - for(map::const_iterator i=sensors.begin(); i!=sensors.end(); ++i) - i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::sensor_event), i->second)); + layout.get_driver().add_loco(address); + layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event)); + layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event)); - const map &turnouts = trfc_mgr.get_control().get_turnouts(); - for(map::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i) - { - i->second->signal_path_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changing), i->second)); - i->second->signal_path_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), i->second)); - } + layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved)); + layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event)); + layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Train::turnout_event)); +} + +Train::~Train() +{ + for(vector::iterator i=vehicles.begin(); i!=vehicles.end(); ++i) + delete *i; + layout.remove_train(*this); } void Train::set_name(const string &n) @@ -58,46 +71,131 @@ void Train::set_name(const string &n) signal_name_changed.emit(name); } -void Train::set_speed(unsigned speed) +Vehicle &Train::get_vehicle(unsigned i) { - if(speed==target_speed) + if(i>=vehicles.size()) + throw InvalidParameterValue("Vehicle index out of range"); + return *vehicles[i]; +} + +const Vehicle &Train::get_vehicle(unsigned i) const +{ + if(i>=vehicles.size()) + throw InvalidParameterValue("Vehicle index out of range"); + return *vehicles[i]; +} + +void Train::set_control(const string &n, float v) +{ + control->set_control(n, v); + signal_control_changed.emit(n, control->get_control(n).value); +} + +void Train::set_active(bool a) +{ + if(a==active) return; - travel_speed = static_cast(round(get_real_speed(speed)*87*3.6/5))*5; + if(!a && control->get_speed()) + throw InvalidState("Can't deactivate while moving"); - target_speed = speed; - if(!target_speed) + active = a; + if(active) { - trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect( - sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Train::release_blocks), sigc::ref(rsv_blocks)), false)); + stop_timeout = Time::TimeStamp(); + reserve_more(); } else - reserve_more(); - - signal_target_speed_changed.emit(target_speed); + { + stop_timeout = Time::now()+2*Time::sec; + set_status("Stopped"); + } +} - update_speed(); - pure_speed = false; +void Train::set_function(unsigned func, bool state) +{ + if(!loco_type.get_functions().count(func)) + throw InvalidParameterValue("Invalid function"); + if(func<5) + layout.get_driver().set_loco_function(address, func, state); + else + layout.get_driver().set_loco_function(address+1, func-4, state); } -void Train::set_reverse(bool rev) +bool Train::get_function(unsigned func) const { - loco.set_reverse(rev); + return (functions>>func)&1; } void Train::set_route(const Route *r) { + if(!rsv_blocks.empty()) + { + for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) + if(i->block->get_sensor_id()) + { + release_blocks(rsv_blocks, ++i, rsv_blocks.end()); + break; + } + } + route = r; + next_route = 0; + end_of_route = false; + + if(route) + { + BlockRef &last = (rsv_blocks.empty() ? cur_blocks.back() : rsv_blocks.back()); + BlockRef next = last.next(); + const Block::Endpoint &ep = next.block->get_endpoints()[next.entry]; + if(!route->get_tracks().count(ep.track)) + { + next_route = route; + route = Route::find(*ep.track, ep.track_ep, *next_route); + } + } + + if(active) + reserve_more(); + signal_route_changed.emit(route); } +void Train::go_to(const Track &to) +{ + for(list::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) + if(i->block->get_tracks().count(const_cast(&to))) + { + signal_arrived.emit(); + set_route(0); + return; + } + + BlockRef *last = 0; + if(rsv_blocks.empty()) + last = &cur_blocks.back(); + else + { + for(list::iterator i=rsv_blocks.begin(); (i!=rsv_blocks.end() && !last); ++i) + if(i->block->get_sensor_id()) + last = &*i; + } + + BlockRef next = last->next(); + const Block::Endpoint &ep = next.block->get_endpoints()[next.entry]; + + set_route(Route::find(*ep.track, ep.track_ep, to)); +} + void Train::place(Block &block, unsigned entry) { - if(target_speed) - set_speed(0); + if(control->get_speed()) + throw InvalidState("Must be stopped before placing"); release_blocks(rsv_blocks); release_blocks(cur_blocks); + set_active(false); + if(!block.reserve(this)) { set_status("Unplaced"); @@ -105,9 +203,19 @@ void Train::place(Block &block, unsigned entry) } cur_blocks.push_back(BlockRef(&block, entry)); - set_position(block.get_endpoints()[entry]); - - set_status("Stopped"); + if(reverse) + { + unsigned exit = block.traverse(entry); + const Block::Endpoint &bep = block.get_endpoints()[exit]; + Track *track = bep.track->get_link(bep.track_ep); + unsigned ep = track->get_endpoint_by_link(*bep.track); + vehicles.front()->place(track, ep, 0, Vehicle::FRONT_BUFFER); + } + else + { + const Block::Endpoint &bep = block.get_endpoints()[entry]; + vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER); + } } bool Train::free_block(Block &block) @@ -119,10 +227,7 @@ bool Train::free_block(Block &block) { if(nsens<1) return false; - for(list::iterator j=i; j!=rsv_blocks.end(); ++j) - j->block->reserve(0); - rsv_blocks.erase(i, rsv_blocks.end()); - update_speed(); + release_blocks(rsv_blocks, i, rsv_blocks.end()); return true; } else if(i->block->get_sensor_id()) @@ -143,42 +248,103 @@ int Train::get_entry_to_block(Block &block) const return -1; } +float Train::get_reserved_distance() const +{ + Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front()); + const VehicleType &vtype = veh.get_type(); + + Track *track = veh.get_track(); + unsigned entry = veh.get_entry(); + + float result = -vtype.get_length()/2; + if(reverse) + { + entry = track->traverse(entry); + result += veh.get_offset(); + } + else + result -= veh.get_offset(); + + bool first = true; + list::const_iterator block = cur_blocks.begin(); + while(1) + { + if(!first || !reverse) + result += track->get_type().get_path_length(track->get_active_path()); + first = false; + + unsigned exit = track->traverse(entry); + Track *next = track->get_link(exit); + + while(!block->block->get_tracks().count(next)) + { + ++block; + if(block==cur_blocks.end()) + block = rsv_blocks.begin(); + if(block==rsv_blocks.end()) + return result; + } + + entry = next->get_endpoint_by_link(*track); + track = next; + } +} + void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) { - if(try_reserve && t>try_reserve) + if(!active && stop_timeout && t>=stop_timeout) + { + release_blocks(rsv_blocks); + end_of_route = false; + stop_timeout = Time::TimeStamp(); + } + + control->tick(dt); + float speed = control->get_speed(); + unsigned speed_notch = find_speed(abs(speed)); + + if(speed && (speed<0)!=reverse) + { + layout.get_driver().set_loco_reverse(address, speed<0); + reverse = speed<0; + + release_blocks(rsv_blocks); + reverse_blocks(cur_blocks); + reserve_more(); + } + if(speed_notch!=current_speed && !speed_changing) + { + speed_changing = true; + layout.get_driver().set_loco_speed(address, speed_notch); + + pure_speed = false; + + if(speed_notch) + set_status(format("Traveling %d kmh", get_travel_speed())); + else + set_status("Waiting"); + } - if(cur_track) + if(speed) { - unsigned path = 0; - if(cur_track->get_turnout_id()) - path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path(); + if(!active) + set_active(true); - offset += get_real_speed(loco.get_speed())*(dt/Time::sec); - float path_len = cur_track->get_type().get_path_length(path); - if(offset>path_len) - { - unsigned out = cur_track->traverse(cur_track_ep, path); - Track *next = cur_track->get_link(out); + Track *track = vehicles[0]->get_track(); - bool ok = false; - for(list::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i) - ok = i->block->get_tracks().count(next); + bool ok = false; + for(list::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i) + ok = i->block->get_tracks().count(track); - if(ok) - { - if(next) - cur_track_ep = next->get_endpoint_by_link(*cur_track); - cur_track = next; - offset = 0; - } - else - offset = path_len-0.001; + if(ok) + { + float d = get_real_speed(current_speed)*(dt/Time::sec); + vehicles[0]->advance(reverse ? -d : d); } - - if(cur_track) - pos = cur_track->get_point(cur_track_ep, path, offset); } + else if(end_of_route) + set_route(0); } void Train::save(list &st) const @@ -187,13 +353,11 @@ void Train::save(list &st) const for(unsigned i=0; i<=14; ++i) if(real_speed[i].weight) st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight)); - if(route) - st.push_back((DataFile::Statement("route"), route->get_name())); if(!cur_blocks.empty()) { list blocks = cur_blocks; - if(loco.get_reverse()) + if(reverse) reverse_blocks(blocks); Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link; @@ -202,30 +366,37 @@ void Train::save(list &st) const for(list::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) st.push_back((DataFile::Statement("block"), i->block->get_id())); } + + if(route) + st.push_back((DataFile::Statement("route"), route->get_name())); } -void Train::locomotive_reverse_changed(bool) +void Train::loco_speed_event(unsigned addr, unsigned speed, bool) { - for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - i->block->reserve(0); - rsv_blocks.clear(); - reverse_blocks(cur_blocks); - reserve_more(); - - if(cur_track) + if(addr==address) { - unsigned path = 0; - if(unsigned turnout = cur_track->get_turnout_id()) - path = trfc_mgr.get_control().get_turnout(turnout).get_path(); - cur_track_ep = cur_track->traverse(cur_track_ep, path); - offset = cur_track->get_type().get_path_length(path)-offset; + current_speed = speed; + speed_changing = false; } } -void Train::sensor_event(bool state, Sensor *sensor) +void Train::loco_func_event(unsigned addr, unsigned func, bool state) { - unsigned addr = sensor->get_address(); + if(addr==address || (addr==address+1 && loco_type.get_max_function()>4)) + { + if(addr==address+1) + func += 4; + if(state) + functions |= 1<(round(travel_dist/travel_time_secs*87*3.6/5))*5; if(pure_speed) { - RealSpeed &rs = real_speed[loco.get_speed()]; + RealSpeed &rs = real_speed[current_speed]; rs.add(travel_dist/travel_time_secs, travel_time_secs); + set_status(format("Traveling %d kmh", get_travel_speed())); } travel_dist = 0; @@ -254,17 +425,46 @@ void Train::sensor_event(bool state, Sensor *sensor) travel_dist += block_len; if(j->block->get_sensor_id()==addr) - set_position(j->block->get_endpoints()[j->entry]); + { + const Block::Endpoint &bep = j->block->get_endpoints()[j->entry]; + if(reverse) + { + Track *track = bep.track->get_link(bep.track_ep); + unsigned ep = track->get_endpoint_by_link(*bep.track); + vehicles.back()->place(track, ep, 0, Vehicle::BACK_AXLE); + } + else + vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::FRONT_AXLE); + } } last_entry_time = Time::now(); pure_speed = true; + // Check if we've reached the next route + if(next_route) + { + const set &rtracks = next_route->get_tracks(); + for(list::iterator j=rsv_blocks.begin(); j!=i; ++j) + if(rtracks.count(j->block->get_endpoints()[j->entry].track)) + { + route = next_route; + next_route = 0; + // XXX Exceptions? + signal_route_changed.emit(route); + break; + } + } + // Move blocks up to the next sensor to our current blocks cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i); // Try to get more blocks if we're moving - if(target_speed && reserve_more()<2) - update_speed(); + if(active) + { + unsigned nsens = reserve_more(); + if(!nsens && end_of_route) + signal_arrived.emit(); + } } } else @@ -274,7 +474,7 @@ void Train::sensor_event(bool state, Sensor *sensor) for(list::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) if(i->block->get_sensor_id()) { - if(trfc_mgr.get_control().get_sensor(i->block->get_sensor_id()).get_state()) + if(layout.get_driver().get_sensor(i->block->get_sensor_id())) break; else end = i; @@ -284,54 +484,25 @@ void Train::sensor_event(bool state, Sensor *sensor) { // Free blocks up to the last inactive sensor ++end; - for(list::iterator i=cur_blocks.begin(); i!=end; ++i) - i->block->reserve(0); - cur_blocks.erase(cur_blocks.begin(), end); + release_blocks(cur_blocks, cur_blocks.begin(), end); } - - // XXX Should watch for trfc_mgr.signal_block_reserved rather than sensors - if(target_speed && pending_block && addr==pending_block->get_sensor_id()) - reserve_more(); } } -void Train::turnout_path_changing(unsigned, Turnout *turnout) +void Train::turnout_event(unsigned addr, bool) { - unsigned tid = turnout->get_address(); - for(list::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) - if(i->block->get_turnout_id()==tid) - throw TurnoutBusy(this); - - unsigned nsens = 0; - for(list::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) + if(pending_block) { - if(i->block->get_turnout_id()==tid) - { - if(nsens<1) - throw TurnoutBusy(this); - break; - } - else if(i->block->get_sensor_id()) - ++nsens; + unsigned pending_addr = pending_block->get_turnout_id(); + bool double_addr = (*pending_block->get_tracks().begin())->get_type().is_double_address(); + if(addr==pending_addr || (double_addr && addr==pending_addr+1)) + reserve_more(); } } -void Train::turnout_path_changed(unsigned, Turnout *turnout) +void Train::block_reserved(const Block &block, const Train *train) { - unsigned tid = turnout->get_address(); - for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - if(i->block->get_turnout_id()==tid) - { - while(i!=rsv_blocks.end()) - { - i->block->reserve(0); - i = rsv_blocks.erase(i); - } - reserve_more(); - return; - } - - if(pending_block && tid==pending_block->get_turnout_id()) + if(&block==pending_block && !train) reserve_more(); } @@ -347,11 +518,27 @@ unsigned Train::reserve_more() pending_block = 0; - // See how many blocks we already have + // See how many sensor blocks we already have unsigned nsens = 0; for(list::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) if(i->block->get_sensor_id()) ++nsens; + + if(end_of_route) + return nsens; + + const Route *cur_route = 0; + if(route) + { + const set &tracks = last->block->get_tracks(); + for(set::const_iterator i=tracks.begin(); (cur_route!=route && i!=tracks.end()); ++i) + { + if(route->get_tracks().count(*i)) + cur_route = route; + else if(next_route && next_route->get_tracks().count(*i)) + cur_route = next_route; + } + } bool got_more = false; BlockRef *good = last; @@ -365,11 +552,34 @@ unsigned Train::reserve_more() break; int entry = link->get_endpoint_by_link(*last->block); + if(entry<0) + throw LogicError("Block links are inconsistent!"); + + const Block::Endpoint &entry_ep = link->get_endpoints()[entry]; + + if(cur_route) + { + if(cur_route!=next_route && next_route && next_route->get_tracks().count(entry_ep.track)) + cur_route = next_route; + else if(!cur_route->get_tracks().count(entry_ep.track)) + { + // Keep the blocks if we arrived at the end of the route + good = last; + good_sens = nsens; + end_of_route = true; + break; + } + } + else if(route && route->get_tracks().count(entry_ep.track)) + cur_route = route; + if(!link->reserve(this)) { - // If we found another train going in the same direction as us, we can keep the blocks we got + // If we found another train and it's not headed straight for us, we can keep the blocks we got int other_entry = link->get_train()->get_entry_to_block(*link); - if(other_entry==entry || link->traverse(entry)==link->traverse(other_entry)) + if(other_entry<0) + throw LogicError("Block reservation inconsistency"); + if(static_cast(entry)!=link->traverse(other_entry)) { good = last; good_sens = nsens; @@ -380,24 +590,18 @@ unsigned Train::reserve_more() if(link->get_turnout_id()) { - const Block::Endpoint &ep = link->get_endpoints()[entry]; - const Endpoint &track_ep = ep.track->get_type().get_endpoints()[ep.track_ep]; + const Endpoint &track_ep = entry_ep.track->get_type().get_endpoints()[entry_ep.track_ep]; - if(track_ep.paths&(track_ep.paths-1)) - { - // We're facing the points - keep the blocks reserved so far - good = last; - good_sens = nsens; - } - - Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id()); + // Keep the blocks reserved so far, as either us or the other train can diverge + good = last; + good_sens = nsens; // Figure out what path we'd like to take on the turnout int path = -1; - if(route) - path = route->get_turnout(link->get_turnout_id()); + if(cur_route) + path = cur_route->get_turnout(link->get_turnout_id()); if(path<0) - path = turnout.get_path(); + path = entry_ep.track->get_active_path(); if(!((track_ep.paths>>path)&1)) { for(unsigned i=0; track_ep.paths>>i; ++i) @@ -405,12 +609,12 @@ unsigned Train::reserve_more() path = i; } - if(path!=turnout.get_path()) + if(path!=static_cast(entry_ep.track->get_active_path())) { // The turnout is set to wrong path - switch and wait for it link->reserve(0); pending_block = link; - turnout.set_path(path); + entry_ep.track->set_active_path(path); break; } } @@ -433,49 +637,7 @@ unsigned Train::reserve_more() last = &rsv_blocks.back(); } - if(got_more) - update_speed(); - - return nsens; -} - -void Train::update_speed() -{ - if(!target_speed) - { - loco.set_speed(0); - try_reserve = Time::TimeStamp(); - set_status("Stopped"); - } - else - { - unsigned nsens = 0; - for(list::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - if(i->block->get_sensor_id()) - ++nsens; - - unsigned slow_speed = find_speed(0.1); // 31.3 km/h - if(nsens==0) - { - loco.set_speed(0); - pure_speed = false; - try_reserve = Time::now()+2*Time::sec; - set_status("Blocked"); - } - else if(nsens==1 && target_speed>slow_speed) - { - loco.set_speed(slow_speed); - pure_speed = false; - try_reserve = Time::now()+2*Time::sec; - set_status("Slow"); - } - else - { - loco.set_speed(target_speed); - try_reserve = Time::TimeStamp(); - set_status(format("Traveling %d kmh", travel_speed)); - } - } + return good_sens; } float Train::get_real_speed(unsigned i) const @@ -534,25 +696,32 @@ unsigned Train::find_speed(float real) const return static_cast(low*(1-f)+high*f+0.5); } +float Train::get_travel_speed() const +{ + float speed = get_real_speed(current_speed); + float scale = layout.get_catalogue().get_scale(); + return static_cast(round(speed/scale*3.6/5))*5; +} + void Train::set_status(const string &s) { status = s; signal_status_changed.emit(s); } -void Train::set_position(const Block::Endpoint &bep) +void Train::release_blocks(list &blocks) { - cur_track = bep.track; - cur_track_ep = bep.track_ep; - offset = 0; - pos = cur_track->get_endpoint_position(cur_track_ep); + release_blocks(blocks, blocks.begin(), blocks.end()); } -void Train::release_blocks(list &blocks) +void Train::release_blocks(list &blocks, list::iterator begin, list::iterator end) { - for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) - i->block->reserve(0); - blocks.clear(); + while(begin!=end) + { + Block *block = begin->block; + blocks.erase(begin++); + block->reserve(0); + } } void Train::reverse_blocks(list &blocks) const @@ -563,6 +732,25 @@ void Train::reverse_blocks(list &blocks) const } +Train::BlockRef::BlockRef(Block *b, unsigned e): + block(b), + entry(e) +{ } + +Train::BlockRef Train::BlockRef::next() const +{ + Block *blk = block->get_endpoints()[block->traverse(entry)].link; + if(!blk) + throw InvalidState("At end of line"); + + int ep = blk->get_endpoint_by_link(*block); + if(ep<0) + throw LogicError("Block links are inconsistent"); + + return BlockRef(blk, ep); +} + + Train::RealSpeed::RealSpeed(): speed(0), weight(0) @@ -581,14 +769,14 @@ Train::Loader::Loader(Train &t): { add("block", &Loader::block); add("block_hint", &Loader::block_hint); - add("name", &Train::name); + add("name", &Loader::name); add("real_speed", &Loader::real_speed); add("route", &Loader::route); } void Train::Loader::block(unsigned id) { - Block &blk = obj.trfc_mgr.get_block(id); + Block &blk = obj.layout.get_block(id); int entry = -1; if(prev_block) entry = blk.get_endpoint_by_link(*prev_block); @@ -597,15 +785,24 @@ void Train::Loader::block(unsigned id) blk.reserve(&obj); obj.cur_blocks.push_back(BlockRef(&blk, entry)); - obj.status = "Stopped"; - obj.set_position(blk.get_endpoints()[entry]); + obj.set_status("Stopped"); + const Block::Endpoint &bep = blk.get_endpoints()[entry]; + obj.vehicles.back()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER); + + if(blk.get_sensor_id()) + obj.layout.get_driver().set_sensor(blk.get_sensor_id(), true); prev_block = &blk; } void Train::Loader::block_hint(unsigned id) { - prev_block = &obj.trfc_mgr.get_block(id); + prev_block = &obj.layout.get_block(id); +} + +void Train::Loader::name(const string &n) +{ + obj.set_name(n); } void Train::Loader::real_speed(unsigned i, float speed, float weight) @@ -616,7 +813,7 @@ void Train::Loader::real_speed(unsigned i, float speed, float weight) void Train::Loader::route(const string &n) { - obj.route = &obj.trfc_mgr.get_layout().get_route(n); + obj.set_route(&obj.layout.get_route(n)); } } // namespace Marklin