X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=93470997133a6e534736f6f6d71b256e0533bc13;hb=77f8c0e033b9b5e7085de5d22a62128a996a5b2a;hp=a6fd46d1e40519381c9723058b7252736a5f3b98;hpb=cf52013784607dc4d307bd1244c5346ee88336a4;p=r2c2.git diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp index a6fd46d..9347099 100644 --- a/source/libmarklin/train.cpp +++ b/source/libmarklin/train.cpp @@ -13,20 +13,20 @@ Distributed under the GPL #include "catalogue.h" #include "driver.h" #include "layout.h" -#include "locotype.h" #include "route.h" #include "simplephysics.h" #include "timetable.h" #include "tracktype.h" #include "train.h" #include "vehicle.h" +#include "vehicletype.h" using namespace std; using namespace Msp; namespace Marklin { -Train::Train(Layout &l, const LocoType &t, unsigned a): +Train::Train(Layout &l, const VehicleType &t, unsigned a): layout(l), loco_type(t), address(a), @@ -49,6 +49,9 @@ Train::Train(Layout &l, const LocoType &t, unsigned a): accurate_position(false), overshoot_dist(false) { + if(!loco_type.is_locomotive()) + throw InvalidParameterValue("Initial vehicle must be a locomotive"); + vehicles.push_back(new Vehicle(layout, loco_type)); layout.add_train(*this); @@ -63,7 +66,7 @@ Train::Train(Layout &l, const LocoType &t, unsigned a): layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event)); - control->signal_control_changed.connect(signal_control_changed); + control->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed)); } Train::~Train() @@ -87,6 +90,30 @@ void Train::set_priority(int p) priority = p; } +void Train::add_vehicle(const VehicleType &vt) +{ + Vehicle *veh = new Vehicle(layout, vt); + vehicles.back()->attach_back(*veh); + vehicles.push_back(veh); +} + +void Train::remove_vehicle(unsigned i) +{ + if(i>=vehicles.size()) + throw InvalidParameterValue("Vehicle index out of range"); + if(i==0) + throw InvalidParameterValue("Can't remove the locomotive"); + delete vehicles[i]; + vehicles.erase(vehicles.begin()+i); + if(iattach_back(*vehicles[i]); +} + +unsigned Train::get_n_vehicles() const +{ + return vehicles.size(); +} + Vehicle &Train::get_vehicle(unsigned i) { if(i>=vehicles.size()) @@ -136,6 +163,16 @@ void Train::set_function(unsigned func, bool state) layout.get_driver().set_loco_function(address+1, func-4, state); } +float Train::get_control(const string &ctrl) const +{ + return control->get_control(ctrl).value; +} + +float Train::get_speed() const +{ + return control->get_speed(); +} + bool Train::get_function(unsigned func) const { return (functions>>func)&1; @@ -331,7 +368,7 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) timetable->tick(t); control->tick(dt); float speed = control->get_speed(); - unsigned speed_notch = find_speed(abs(speed)); + unsigned speed_notch = find_speed(speed); if(control->get_reverse()!=reverse) { @@ -381,8 +418,11 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) } } } - else if(end_of_route) + else if(end_of_route && rsv_blocks.empty()) + { + signal_arrived.emit(); set_route(0); + } if(!cur_blocks.empty() && !cur_blocks.front().block->get_sensor_id()) { @@ -474,6 +514,11 @@ void Train::save(list &st) const } } +void Train::control_changed(const TrainControl &ctrl) +{ + signal_control_changed.emit(ctrl.name, ctrl.value); +} + void Train::loco_speed_event(unsigned addr, unsigned speed, bool) { if(addr==address) @@ -582,11 +627,7 @@ void Train::sensor_event(unsigned addr, bool state) // Try to get more blocks if we're moving if(active) - { - unsigned nsens = reserve_more(); - if(!nsens && end_of_route) - signal_arrived.emit(); - } + reserve_more(); } else if(result==3) layout.emergency("Sensor for "+name+" triggered out of order"); @@ -678,13 +719,6 @@ unsigned Train::reserve_more() unsigned good_sens = nsens; while(good_sens<3) { - if(last->block->get_endpoints().size()<2) - { - good = last; - good_sens = nsens; - break; - } - // Traverse to the next block unsigned exit = last->block->traverse(last->entry); Block *link = last->block->get_link(exit); @@ -713,6 +747,13 @@ unsigned Train::reserve_more() else if(route && route->get_tracks().count(entry_ep.track)) cur_route = route; + if(link->get_endpoints().size()<2) + { + good = last; + good_sens = nsens; + break; + } + bool reserved = link->reserve(this); if(!reserved) { @@ -925,7 +966,8 @@ void Train::RealSpeed::add(float s, float w) Train::Loader::Loader(Train &t): DataFile::BasicLoader(t), - prev_block(0) + prev_block(0), + blocks_valid(true) { add("block", &Loader::block); add("block_hint", &Loader::block_hint); @@ -937,30 +979,59 @@ Train::Loader::Loader(Train &t): add("vehicle", &Loader::vehicle); } +void Train::Loader::finish() +{ + if(!obj.cur_blocks.empty()) + { + const BlockRef &blkref = obj.cur_blocks.front(); + const Block::Endpoint &bep = blkref.block->get_endpoints()[blkref.entry]; + obj.vehicles.back()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER); + + obj.set_status("Stopped"); + } +} + void Train::Loader::block(unsigned id) { - Block &blk = obj.layout.get_block(id); + if(!blocks_valid) + return; + + Block *blk; + try + { + blk = &obj.layout.get_block(id); + } + catch(const KeyError &) + { + blocks_valid = false; + return; + } + int entry = -1; if(prev_block) - entry = blk.get_endpoint_by_link(*prev_block); + entry = blk->get_endpoint_by_link(*prev_block); if(entry<0) entry = 0; - blk.reserve(&obj); - obj.cur_blocks.push_back(BlockRef(&blk, entry)); - obj.set_status("Stopped"); - const Block::Endpoint &bep = blk.get_endpoints()[entry]; - obj.vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER); + blk->reserve(&obj); + obj.cur_blocks.push_back(BlockRef(blk, entry)); - if(blk.get_sensor_id()) - obj.layout.get_driver().set_sensor(blk.get_sensor_id(), true); + if(blk->get_sensor_id()) + obj.layout.get_driver().set_sensor(blk->get_sensor_id(), true); - prev_block = &blk; + prev_block = blk; } void Train::Loader::block_hint(unsigned id) { - prev_block = &obj.layout.get_block(id); + try + { + prev_block = &obj.layout.get_block(id); + } + catch(const KeyError &) + { + blocks_valid = false; + } } void Train::Loader::name(const string &n)