Fix remaining exception class names

[r2c2.git] / source / engineer / trainproperties.cpp

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index bf0b270ca3de41556e3219fd81ea3ee73f70dc71..67e096a8ea84b6e1cce858e97fcc831eb24289b8 100644 (file)
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,21 +1,15 @@
-/* $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/label.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "libmarklin/vehicle.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/driver.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, Train *t):
        engineer(e),
@@ -30,8 +24,19 @@ TrainProperties::TrainProperties(Engineer &e, Train *t):
        add(*(ent_addr = new GLtk::Entry));
        ent_addr->set_geometry(GLtk::Geometry(10, geom.h-50, 40, 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(60, geom.h-50, geom.w-70, 20));
+       drp_type->set_geometry(GLtk::Geometry(130, geom.h-50, geom.w-140, 20));
 
        const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles();
        unsigned n = 0;
@@ -106,7 +111,7 @@ void TrainProperties::on_ok_clicked()
        {
                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(), type, addr);
+               train = new Train(engineer.get_layout(), type, addr, drp_protocol->get_selected());
        }
 
        train->set_name(ent_name->get_text());
@@ -139,7 +144,7 @@ void TrainProperties::remove_vehicle_clicked()
 
        lst_vehicles->remove(selected);
 
-       unsigned n_vehicles = train->get_n_vehicles()-rem_vehicles.size();
+       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
@@ -166,5 +171,5 @@ const VehicleType &TrainProperties::get_vehicle_type(unsigned n, bool loco)
                ++i;
        }
 
-       throw InvalidParameterValue("Vehicle type index out of range");
+       throw out_of_range("TrainProperties::get_vehicle_type");
 }