-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <msp/gltk/button.h>
#include <msp/gltk/label.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include <msp/strings/lexicalcast.h>
-#include "libmarklin/locotype.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/trainrouter.h"
+#include "libr2c2/vehicle.h"
+#include "libr2c2/vehicletype.h"
#include "engineer.h"
#include "trainproperties.h"
using namespace std;
using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
-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, 120);
+ 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)));
- drp_type->set_geometry(GLtk::Geometry(60, geom.h-50, geom.w-70, 20));
+ add(*(drp_protocol = new GLtk::Dropdown));
+ drp_protocol->set_geometry(GLtk::Geometry(60, geom.h-50, 60, 20));
+ for(unsigned i=0;; ++i)
+ {
+ if(const char *proto = engineer.get_layout().get_driver().enumerate_protocols(i))
+ drp_protocol->append(proto);
+ else
+ break;
+ }
+ drp_protocol->set_selected_index(0);
+
+ add(*(drp_type = new GLtk::Dropdown));
+ drp_type->set_geometry(GLtk::Geometry(130, geom.h-50, geom.w-140, 20));
- const map<unsigned, LocoType *> &locos = engineer.get_catalogue().get_locomotives();
+ const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles();
unsigned n = 0;
- for(map<unsigned, LocoType *>::const_iterator i=locos.begin(); i!=locos.end(); ++i, ++n)
+ for(Catalogue::VehicleMap::const_iterator i=vehs.begin(); i!=vehs.end(); ++i)
{
+ 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));
+ drp_priority->set_geometry(GLtk::Geometry(10, geom.h-100, geom.w-20, 20));
+ drp_priority->append("Standard freight");
+ drp_priority->append("Express freight");
+ drp_priority->append("Unspecified");
+ 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_addr->set_text(lexical_cast<string>(train->get_address()));
ent_name->set_text(train->get_name());
+ if(TrainRouter *router = train->get_ai_of_type<TrainRouter>())
+ drp_priority->set_selected_index(router->get_priority()+2);
+
+ unsigned n_vehicles = train->get_n_vehicles();
+ for(unsigned i=1; i<n_vehicles; ++i)
+ {
+ const VehicleType &type = train->get_vehicle(i).get_type();
+ lst_vehicles->append(format("%d %s", type.get_article_number(), type.get_name()));
+ }
}
else
+ {
ent_name->set_text(format("Train %d", engineer.get_layout().get_trains().size()+1));
+ drp_priority->set_selected_index(2);
+ }
}
void TrainProperties::on_ok_clicked()
{
if(!train)
{
- const map<unsigned, LocoType *> &locos = engineer.get_catalogue().get_locomotives();
- map<unsigned, LocoType *>::const_iterator i = locos.begin();
- advance(i, drp_type->get_selected_index());
-
+ const VehicleType &type = get_vehicle_type(drp_type->get_selected_index(), true);
unsigned addr = lexical_cast<unsigned>(ent_addr->get_text());
- train = new Train(engineer.get_layout(), *i->second, addr);
- engineer.place_train(*train);
+ train = new Train(engineer.get_layout(), type, addr, drp_protocol->get_selected());
}
train->set_name(ent_name->get_text());
+ if(TrainRouter *router = train->get_ai_of_type<TrainRouter>())
+ router->set_priority(drp_priority->get_selected_index()-2);
+
+ // The locomotive is vehicle 0 so we need to add 1
+ for(set<unsigned>::const_iterator i=rem_vehicles.end(); i!=rem_vehicles.begin();)
+ train->remove_vehicle(*--i+1);
+ for(vector<const VehicleType *>::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 ? train->get_n_vehicles()-rem_vehicles.size() : 0);
+ if(static_cast<unsigned>(selected)>=n_vehicles)
+ add_vehicles.erase(add_vehicles.begin()+(selected-n_vehicles));
+ else
+ {
+ for(set<unsigned>::const_iterator i=rem_vehicles.begin(); i!=rem_vehicles.end(); ++i)
+ if(*i<=static_cast<unsigned>(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 out_of_range("TrainProperties::get_vehicle_type");
}
projects / r2c2.git / blobdiff