X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=bf0b270ca3de41556e3219fd81ea3ee73f70dc71;hb=62ce775d9af8f3321dbdebd6243b551fbbb0b976;hp=4596000724a204bff97b9c53a685d973318cf511;hpb=4d33c389881ebdf0b3926343d53e7d1ece654e20;p=r2c2.git diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp index 4596000..bf0b270 100644 --- a/source/engineer/trainproperties.cpp +++ b/source/engineer/trainproperties.cpp @@ -5,11 +5,11 @@ Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#include #include #include #include -#include "libmarklin/locotype.h" +#include "libmarklin/vehicle.h" +#include "libmarklin/vehicletype.h" #include "engineer.h" #include "trainproperties.h" @@ -17,40 +17,40 @@ using namespace std; using namespace Msp; using namespace Marklin; -TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t): - Widget(r), - Dialog(r), +TrainProperties::TrainProperties(Engineer &e, Train *t): engineer(e), train(t) { - set_size(200, 145); + set_size(250, 305); GLtk::Label *label; - add(*(label=new GLtk::Label(res, "Train properties"))); + add(*(label = new GLtk::Label("Train properties"))); label->set_geometry(GLtk::Geometry(10, geom.h-25, geom.w-20, 20)); - add(*(ent_addr=new GLtk::Entry(res))); + add(*(ent_addr = new GLtk::Entry)); ent_addr->set_geometry(GLtk::Geometry(10, geom.h-50, 40, 20)); - add(*(drp_type=new GLtk::Dropdown(res))); + add(*(drp_type = new GLtk::Dropdown)); drp_type->set_geometry(GLtk::Geometry(60, geom.h-50, geom.w-70, 20)); - const map &vehs = engineer.get_catalogue().get_vehicles(); + const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles(); unsigned n = 0; - for(map::const_iterator i=vehs.begin(); i!=vehs.end(); ++i, ++n) + for(Catalogue::VehicleMap::const_iterator i=vehs.begin(); i!=vehs.end(); ++i) { - if(!dynamic_cast(i->second)) + if(!i->second->is_locomotive()) continue; drp_type->append(format("%d %s", i->second->get_article_number(), i->second->get_name())); if(train && i->second==&train->get_locomotive_type()) drp_type->set_selected_index(n); + + ++n; } - add(*(ent_name=new GLtk::Entry(res))); + add(*(ent_name = new GLtk::Entry)); ent_name->set_geometry(GLtk::Geometry(10, geom.h-75, geom.w-20, 20)); - add(*(drp_priority=new GLtk::Dropdown(res))); + add(*(drp_priority = new GLtk::Dropdown)); drp_priority->set_geometry(GLtk::Geometry(10, geom.h-100, geom.w-20, 20)); drp_priority->append("Standard freight"); drp_priority->append("Express freight"); @@ -58,11 +58,40 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t drp_priority->append("Standard passenger"); drp_priority->append("Express passenger"); + add(*(lst_vehicles = new GLtk::List)); + lst_vehicles->set_geometry(GLtk::Geometry(10, 100, geom.w-20, geom.h-205)); + + GLtk::Button *btn; + + add(*(btn = new GLtk::Button("Rem"))); + btn->set_geometry(GLtk::Geometry(10, 70, 40, 25)); + btn->signal_clicked.connect(sigc::mem_fun(this, &TrainProperties::remove_vehicle_clicked)); + + add(*(drp_new_vehicle = new GLtk::Dropdown)); + drp_new_vehicle->set_geometry(GLtk::Geometry(10, 45, geom.w-20, 20)); + drp_new_vehicle->append("(new vehicle)"); + drp_new_vehicle->set_selected_index(0); + for(Catalogue::VehicleMap::const_iterator i=vehs.begin(); i!=vehs.end(); ++i) + { + if(i->second->is_locomotive()) + continue; + + drp_new_vehicle->append(format("%d %s", i->second->get_article_number(), i->second->get_name())); + } + drp_new_vehicle->signal_item_selected.connect(sigc::mem_fun(this, &TrainProperties::new_vehicle_selected)); + if(train) { ent_addr->set_text(lexical_cast(train->get_address())); ent_name->set_text(train->get_name()); drp_priority->set_selected_index(train->get_priority()+2); + + unsigned n_vehicles = train->get_n_vehicles(); + for(unsigned i=1; iget_vehicle(i).get_type(); + lst_vehicles->append(format("%d %s", type.get_article_number(), type.get_name())); + } } else { @@ -75,22 +104,67 @@ void TrainProperties::on_ok_clicked() { if(!train) { - const map &vehs = engineer.get_catalogue().get_vehicles(); - map::const_iterator i = vehs.begin(); - unsigned n = drp_type->get_selected_index(); - while(!dynamic_cast(i->second)) - ++i; - while(n) - { - if(dynamic_cast(i->second)) - --n; - ++i; - } - + const VehicleType &type = get_vehicle_type(drp_type->get_selected_index(), true); unsigned addr = lexical_cast(ent_addr->get_text()); - train = new Train(engineer.get_layout(), *dynamic_cast(i->second), addr); + train = new Train(engineer.get_layout(), type, addr); } train->set_name(ent_name->get_text()); train->set_priority(drp_priority->get_selected_index()-2); + + // The locomotive is vehicle 0 so we need to add 1 + for(set::const_iterator i=rem_vehicles.end(); i!=rem_vehicles.begin();) + train->remove_vehicle(*--i+1); + for(vector::const_iterator i=add_vehicles.begin(); i!=add_vehicles.end(); ++i) + train->add_vehicle(**i); +} + +void TrainProperties::new_vehicle_selected(unsigned n, const string &) +{ + if(n==0) + return; + + const VehicleType &type = get_vehicle_type(n-1, false); + add_vehicles.push_back(&type); + lst_vehicles->append(format("%d %s", type.get_article_number(), type.get_name())); + + drp_new_vehicle->set_selected_index(0); +} + +void TrainProperties::remove_vehicle_clicked() +{ + int selected = lst_vehicles->get_selected_index(); + if(selected<0) + return; + + lst_vehicles->remove(selected); + + unsigned n_vehicles = train->get_n_vehicles()-rem_vehicles.size(); + if(static_cast(selected)>=n_vehicles) + add_vehicles.erase(add_vehicles.begin()+(selected-n_vehicles)); + else + { + for(set::const_iterator i=rem_vehicles.begin(); i!=rem_vehicles.end(); ++i) + if(*i<=static_cast(selected)) + ++selected; + rem_vehicles.insert(selected); + } +} + +const VehicleType &TrainProperties::get_vehicle_type(unsigned n, bool loco) +{ + const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles(); + Catalogue::VehicleMap::const_iterator i = vehs.begin(); + while(i!=vehs.end()) + { + if(i->second->is_locomotive()==loco) + { + if(!n) + return *i->second; + --n; + } + ++i; + } + + throw InvalidParameterValue("Vehicle type index out of range"); }